Mercurial > hg > xemacs-beta
view netinstall/concat.cc @ 5241:d579d76f3dcc
Be more careful about side-effects from Lisp code, #'reduce
src/ChangeLog addition:
2010-07-24 Aidan Kehoe <kehoea@parhasard.net>
* lisp.h (PARSE_KEYWORDS):
Always accept a nil :allow-other-keys keyword argument, as
described in the ALLOW-OTHER-KEYS-NIL Common Lisp issue writeup,
and as necessary for Paul Dietz' tests for #'reduce.
* fns.c (mapping_interaction_error): New.
(Freduce): Call mapping_interaction_error when KEY or FUNCTION
have modified a string SEQUENCE such that the byte length of the
string has changed, or such that the current cursor pointer
doesn't point to the beginning of a character.
Cf. the MAPPING-DESTRUCTIVE-INTERACTION Common Lisp issue
writeup.
When traversing a list, GCPRO the part of it we still have to
traverse, to avoid any crashes if FUNCTION or KEY amputate it
behind us and force a garbage collection.
tests/ChangeLog addition:
2010-07-24 Aidan Kehoe <kehoea@parhasard.net>
* automated/lisp-tests.el:
Test a couple of things #'reduce was just made more careful
about.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 24 Jul 2010 15:56:57 +0100 |
parents | 3078fd1074e8 |
children |
line wrap: on
line source
/* * Copyright (c) 2000, Red Hat, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * A copy of the GNU General Public License can be found at * http://www.gnu.org/ * * Written by DJ Delorie <dj@cygnus.com> * */ /* See concat.h. Note that we canonicalize the result, this avoids multiple slashes being interpreted as UNCs. */ #include "win32.h" #include <stdarg.h> #include <stdlib.h> #include <string.h> char * CDECL concat (char *s, ...) { int len; char *rv, *arg; va_list v; if (!s) return 0; len = strlen (s); va_start (v, s); while (1) { arg = va_arg (v, char *); if (arg == 0) break; len += strlen (arg); } va_end (v); rv = (char *) malloc (len+1); strcpy (rv, s); va_start (v, s); while (1) { arg = va_arg (v, char *); if (arg == 0) break; strcat (rv, arg); } va_end (v); /* concat is only used for urls and files, so we can safely canonicalize the results */ char *d; for (s=rv; *s; s++) if (*s == '\\') *s = '/'; for (s=d=rv; *s; s++) { *d++ = *s; /* special case for URLs */ if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1) { *d++ = *++s; *d++ = *++s; } else if (*s == '/') while (s[1] == '/') s++; } *d = 0; return rv; } char * backslash (char *s) { for (char *t = s; *t; t++) if (*t == '/') *t = '\\'; return s; }