Mercurial > hg > xemacs-beta
annotate netinstall/concat.cc @ 1346:01c57eb70ae9
[xemacs-hg @ 2003-03-09 02:27:27 by ben]
To: xemacs-patches@xemacs.org
i.c: Sleep between calls to check for I/O, since these calls are non-blocking.
behavior.el: Allow other keywords for forward compatibility.
cl-macs.el: Rewrite to eliminate byte-compiler warning when `return' is used
without `finally'.
cmdloop.el: Avoid truncated error messages for `end-of-file' and the like.
cmdloop.el: Avoid char-int error after syncing.
files.el: Eliminate byte-compile warnings.
printer.el: Fix line-width calculations.
#### This used to work. Someone's changes (perhaps by
Michael Sperber?) seem to have messed something up.
simple.el: Use new clear-left-side functions to avoid messages ending up on
the same line as other output.
xemacs.mak: Add override for info/ as well when separate source/build dirs.
xemacs.mak: Order sections in main build process and add comments. Add
additional dependencies to try and prevent later steps from
happening when failures in earlier steps have occurred.
Makefile.in.in: Order sections in main build process and add comments. Add
additional dependencies to try and prevent later steps from
happening when failures in earlier steps have occurred.
alloc.c: Don't arbitrarily clear Vconfigure_info_directory since it
messes up separate build/source dirs.
console.c, console.h, device-msw.c, device.c: Add accidentally omitted msprinter console and data descriptions.
print.c, console-msw.c: Add clear-left-side functionality to help keep stdio/stderr
output from separate sources on separate lines. Generalize
the different kinds of debugging output. Add dpa().
profile.c: Add better docs on Unix/Windows differences.
regex.c: Fix problems with rel-alloc compilation caused by previous patch.
emacs.c: Seg fault rather than abort on Cygwin, since gdb doesn't trap
aborts properly.
console-gtk-impl.h, console-gtk.h, console-msw.h, console-x-impl.h, console-x.h, dialog-gtk.c, dialog-x.c, event-msw.c, frame-gtk.c, frame-x.c, frameslots.h, glyphs-gtk.c, glyphs-x.c, gui-gtk.c, gui-x.c, inline.c, menubar-gtk.c, menubar-msw.c, menubar-x.c, scrollbar-gtk.c, scrollbar-x.c, ui-gtk.c: Delete popup-data object. Delete menubar_data field from frames,
since its usage is frame-specific. Delete menubar-msw.h,
gui-x.h, gui-gtk.h. Clean up handling of lwlib callback data
GCPRO'ing and add missing GCPRO recomputation in widget code.
| author | ben |
|---|---|
| date | Sun, 09 Mar 2003 02:27:46 +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 } |