Mercurial > hg > xemacs-beta
view 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 |
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; }