Mercurial > hg > xemacs-beta
annotate netinstall/concat.cc @ 1410:44de306310b8
[xemacs-hg @ 2003-04-14 03:40:26 by youngs]
2003-04-14 Steve Youngs <youngs@xemacs.org>
* package-admin.el (package-admin-find-top-directory): Use
'directory-sep-char'.
(package-admin-get-install-dir): Ditto.
This is so PUI won't break on platforms that don't use '/' as the
directory separator.
* package-get.el (package-get-pgp-available-p): New.
(package-get-require-signed-base-updates): Use it.
(package-get-update-base-from-buffer): Move the code that finds
the gpg stuff into `package-get-pgp-available-p'.
Now if you have Mailcrypt and a PGP binary installed and set up on
your system, PUI will automatically default to doing PGP
verification, otherwise it'll default to off.
(package-get-require-base): Use the DATUM arg to `error'.
(package-get-locate-index-file): Ditto.
(package-get-update-base): Ditto.
(package-get-update-base-entries): Ditto.
(package-get-all): Ditto.
(package-get-dependencies): Ditto.
(package-get-info): Ditto.
(package-get): Ditto.
* package-info.el (batch-update-package-info): Use the DATUM arg
to `error'.
* package-net.el (package-net-batch-generate-bin-ini): Use the
DATUM arg to `error'.
* package-ui.el (pui-toggle-package-key): Use the DATUM arg to
`error'.
(pui-toggle-package-delete-key): Ditto.
(pui-install-selected-packages): Ditto.
(pui-add-required-packages): Ditto.
(pui-display-info): Ditto.
(list-packages-mode): Ditto.
* packages.el (package-require): Use the DATUM arg to `error'.
author | youngs |
---|---|
date | Mon, 14 Apr 2003 03:40:27 +0000 |
parents | 3078fd1074e8 |
children |
rev | line source |
---|---|
448 | 1 /* |
2 * Copyright (c) 2000, Red Hat, Inc. | |
3 * | |
4 * This program is free software; you can redistribute it and/or modify | |
5 * it under the terms of the GNU General Public License as published by | |
6 * the Free Software Foundation; either version 2 of the License, or | |
7 * (at your option) any later version. | |
8 * | |
9 * A copy of the GNU General Public License can be found at | |
10 * http://www.gnu.org/ | |
11 * | |
12 * Written by DJ Delorie <dj@cygnus.com> | |
13 * | |
14 */ | |
15 | |
16 /* See concat.h. Note that we canonicalize the result, this avoids | |
17 multiple slashes being interpreted as UNCs. */ | |
18 | |
19 #include "win32.h" | |
20 #include <stdarg.h> | |
21 #include <stdlib.h> | |
22 #include <string.h> | |
23 | |
24 char * CDECL | |
25 concat (char *s, ...) | |
26 { | |
27 int len; | |
28 char *rv, *arg; | |
29 va_list v; | |
30 | |
31 if (!s) | |
32 return 0; | |
33 | |
34 len = strlen (s); | |
35 | |
36 va_start (v, s); | |
37 while (1) | |
38 { | |
39 arg = va_arg (v, char *); | |
40 if (arg == 0) | |
41 break; | |
42 len += strlen (arg); | |
43 } | |
44 va_end (v); | |
45 | |
46 rv = (char *) malloc (len+1); | |
47 strcpy (rv, s); | |
48 va_start (v, s); | |
49 while (1) | |
50 { | |
51 arg = va_arg (v, char *); | |
52 if (arg == 0) | |
53 break; | |
54 strcat (rv, arg); | |
55 } | |
56 va_end (v); | |
57 | |
58 /* concat is only used for urls and files, so we can safely | |
59 canonicalize the results */ | |
60 char *d; | |
61 for (s=rv; *s; s++) | |
62 if (*s == '\\') | |
63 *s = '/'; | |
64 for (s=d=rv; *s; s++) | |
65 { | |
66 *d++ = *s; | |
67 /* special case for URLs */ | |
68 if (*s == ':' && s[1] == '/' && s[2] == '/' && s > rv+1) | |
69 { | |
70 *d++ = *++s; | |
71 *d++ = *++s; | |
72 } | |
73 else if (*s == '/') | |
74 while (s[1] == '/') | |
75 s++; | |
76 } | |
77 *d = 0; | |
78 | |
79 return rv; | |
80 } | |
81 | |
82 char * | |
83 backslash (char *s) | |
84 { | |
85 for (char *t = s; *t; t++) | |
86 if (*t == '/') | |
87 *t = '\\'; | |
88 return s; | |
89 } |