annotate netinstall/concat.cc @ 5253:b6a398dbb403

Fewer algorithmic complexity surprises, nicer errors, mapcarX(), maplist() src/ChangeLog addition: 2010-09-01 Aidan Kehoe <kehoea@parhasard.net> * fns.c (list_merge, list_array_merge_into_list) (list_array_merge_into_array): Avoid algorithmic complexity surprises when checking for circularity in these functions. (Freduce): Fix some formatting, in passing. (mapcarX): Drop the SOME_OR_EVERY argument to this function; instead, take CALLER, a symbol reflecting the Lisp-visible function that called mapcarX(). Use CALLER with mapping_interaction_error() when sequences are modified illegally. Don't cons with #'some, #'every, not even a little. (Fmapconcat, FmapcarX, Fmapvector, Fmapcan, Fmapc, Fmap) (Fmap_into, Fsome, Fevery): Call mapcarX() with its new arguments. (Fmapcan): Don't unnecessarily complicate the nconc call. (maplist): Take CALLER, a symbol reflecting the Lisp-visible function that called maplist(), rather than having separate arguments to indicate mapl vs. mapcon. Avoid algorithmic complexity surprises when checking for circularity. In #'mapcon, check a given stretch of result for well-formedness once, which was not previously the case, despite what the comments said. (Fmaplist, Fmapl, Fmapcon): Call maplist() with its new arguments.
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 01 Sep 2010 12:51:32 +0100
parents 3078fd1074e8
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* See concat.h. Note that we canonicalize the result, this avoids
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 multiple slashes being interpreted as UNCs. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20 #include <stdarg.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <string.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 char * CDECL
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 concat (char *s, ...)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27 int len;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 char *rv, *arg;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 va_list v;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 if (!s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 return 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 len = strlen (s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36 va_start (v, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 while (1)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 arg = va_arg (v, char *);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40 if (arg == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 len += strlen (arg);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 va_end (v);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 rv = (char *) malloc (len+1);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 strcpy (rv, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48 va_start (v, s);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 while (1)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 arg = va_arg (v, char *);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 if (arg == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 strcat (rv, arg);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 va_end (v);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58 /* concat is only used for urls and files, so we can safely
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 canonicalize the results */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 char *d;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 for (s=rv; *s; s++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62 if (*s == '\\')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 *s = '/';
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 for (s=d=rv; *s; s++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 *d++ = *s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 /* special case for URLs */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 *d++ = *++s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 *d++ = *++s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 else if (*s == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 while (s[1] == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 s++;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 *d = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 return rv;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 char *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 backslash (char *s)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85 for (char *t = s; *t; t++)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 if (*t == '/')
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 *t = '\\';
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 return s;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89 }