Mercurial > hg > xemacs-beta
annotate netinstall/concat.cc @ 593:5fd7ba8b56e7
[xemacs-hg @ 2001-05-31 12:45:27 by ben]
xemacs-faq.texi: Major rewrite.
Update all MS Windows info to current.
Redo section 6.1 almost completely.
Incorporate sections 1 and 2 of Hrvoje's FAQ.
etags.el: Fix infloop when going up to the root.
s\cygwin32.h: Don't unilaterally include ntplay, but only when we're compiling
with native sound (look in configure now).
event-msw.c: Fix yet more problems with C-g handling.
Implement debug-mswindows-events.
event-stream.c, events.h, signal.c, sysdep.h:
Rearrange the signal-handling code to eliminate the former
spaghetti logic paths in it. Document clearly what
"low-level" and "high-level" timeouts are. Rename some
functions with unclear names (e.g. "...alarm...") to names
that reflect what they actually do (e.g. "...async_timeout...").
Fix numerous bugs discovered in the process.
console-x.h, event-Xt.c, event-msw.c, frame-x.c:
Hopefully make XEmacs properly maintain the "iconified"
state on frames at all times. This should fix the "can't
delete a frame with C-x 5 0 when there's another iconified
frame out there" bug.
Put a notice in of further changes that should probably
be made to clean up the frame-visibility support.
(especially directed at Jan Vroonhof)
lisp.h, miscplay.c:
Rename SBufbyte to CBufbyte to avoid a misleading name.
Eliminate UChar, which is not used anywhere and contributes
no semantic info. Add a comment about the documentation-only
properties of the char/unsigned char typedefs. Add
SChar_Binary as an explicitly `signed' version of Char_Binary
and put back the `signed' declarations in miscplay.c.
alloc.c:
Use char typedefs.
console-msw.c, device-msw.c, dialog-msw.c, editfns.c, fileio.c, glyphs-eimage.c, menubar-msw.c, ntplay.c, objects-msw.c, realpath.c, redisplay-msw.c, select-msw.c, syswindows.h, win32.c:
Eliminate numerous C++ errors.
frame-msw.c:
Eliminate numerous C++ errors and Mule-ize.
glyphs-msw.c:
Eliminate numerous C++ errors and use char typedefs.
configure.in:
Fix problems detecting both native and Linux sound on Cygwin
when compiled with --with-msw=no.
Rearrange file-coding handling a bit to avoid warning when
compiling with Mule.
configure.in, configure.usage, INSTALL:
Document XEMACS_CC and corresponding compiler option --xemacs-compiler.
Explain how to build xemacs using a C++ compiler.
| author | ben |
|---|---|
| date | Thu, 31 May 2001 12:45:41 +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 } |