Mercurial > hg > xemacs-beta
annotate netinstall/postinstall.cc @ 4995:8431b52e43b1
Move the various map* functions to C; add #'map-into.
src/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
Move #'mapcar*, #'mapcan, #'mapc, #'map, #'mapl, #'mapcon to C;
extend #'mapvector, #'mapconcat, #'mapcar to support more
SEQUENCES; have them all error with circular lists.
* fns.c (Fsubseq): Call CHECK_SEQUENCE here; Flength can return
from the debugger if it errors with a non-sequence, leading to a
crash in Fsubseq if sequence really is *not* a sequence.
(mapcarX): Rename mapcar1 to mapcarX; rework it comprehensively to
take an optional lisp output argument, and a varying number of
sequences.
Special-case a single list argument, as we used to, saving its
elements in the stack space for the results before calling
FUNCTION, so FUNCTION can corrupt the list all it
wants. dead_wrong_type_argument() in the other cases if we
encounter a non-cons where we expected a cons.
(Fmapconcat):
Accept further SEQUENCES after separator here. Special-case
the idiom (mapconcat 'identity SEQUENCE), don't even funcall.
(FmapcarX): Rename this from Fmapcar. Accept optional SEQUENCES.
(Fmapvector): Accept optional SEQUENCES.
(Fmapcan, Fmapc, Fmap): Move these here from cl-extra.el.
(Fmap_into): New function, as specified by Common Lisp.
(maplist): New function, the guts of the implementation of
Fmaplist and Fmapl.
(Fmaplist, Fmapl, Fmapcon): Move these from cl-extra.el.
(syms_of_fns):
Add a few needed symbols here, for the type tests
used by #'map. Add the new subrs, with aliases for #'mapc-internal
and #'mapcar.
* general-slots.h: Declare Qcoerce here, now it's used in both
indent.c and fns.c
* indent.c (syms_of_indent): Qcoerce is gone from here.
* lisp.h: Add ARRAYP(), SEQUENCEP(), and the corresponding CHECK_*
macros. Declare Fbit_vector, Fstring, FmapcarX, now other files
need to use them.
* data.c (Farrayp, Fsequencep): Use ARRAYP and SEQUENCEP, just
added to lisp.h
* buffer.c (Fbuffer_list): Now Fmapcar has been renamed FmapcarX
and takes MANY arguments, update this function to reflect that.
lisp/ChangeLog addition:
2010-01-31 Aidan Kehoe <kehoea@parhasard.net>
* cl.el (mapcar*): Delete; this is now in fns.c.
Use #'mapc, not #'mapc-internal in a couple of places.
* cl-macs.el (mapc, mapcar*, map): Delete these compiler macros
now the corresponding functions are in fns.c; there's no run-time
advantage to the macros.
* cl-extra.el (coerce): Extend the possible conversions here a
little; it's not remotely comprehensive yet, though it does allow
running slightly more Common Lisp code than previously.
(cl-mapcar-many): Delete.
(map, maplist, mapc, mapl, mapcan, mapcon): Move these to fns.c.
* bytecomp.el (byte-compile-maybe-mapc):
Use #'mapc itself, not #'mapc-internal, now the former is in C.
(mapcar*): Use #'byte-compile-maybe-mapc as this function's
byte-compile method, now a #'mapc that can take more than one
sequence is in C.
* obsolete.el (cl-mapc): Move this compatibility alias to this file.
* update-elc.el (do-autoload-commands): Use #'mapc, not
#'mapc-internal here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sun, 31 Jan 2010 18:29:48 +0000 |
parents | 3d3049ae1304 |
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 /* The purpose of this file is to run all the post-install scripts | |
17 in their various forms. */ | |
18 | |
19 #include "win32.h" | |
20 | |
21 #include <io.h> | |
22 #include <stdio.h> | |
23 #include <stdlib.h> | |
24 #ifndef WIN32_NATIVE | |
25 #include <unistd.h> | |
26 #endif | |
27 | |
28 #include "state.h" | |
29 #include "dialog.h" | |
30 #include "find.h" | |
31 #include "concat.h" | |
32 #include "regedit.h" | |
33 #include "reginfo.h" | |
34 #include "resource.h" | |
35 #include "port.h" | |
36 | |
37 static char *sh = 0; | |
38 static char *cmd = 0; | |
39 static OSVERSIONINFO verinfo; | |
40 | |
41 static void | |
42 run (char *shscript, char *args, char *file) | |
43 { | |
44 BOOL b; | |
45 char cmdline [_MAX_PATH]; | |
46 STARTUPINFO si; | |
47 PROCESS_INFORMATION pi; | |
48 | |
49 sprintf (cmdline, "%s %s %s", shscript, args, file); | |
50 memset (&pi, 0, sizeof (pi)); | |
51 memset (&si, 0, sizeof (si)); | |
52 si.cb = sizeof (si); | |
53 si.lpTitle = "XEmacs Setup Post-Install Script"; | |
54 si.dwFlags = STARTF_USEPOSITION; | |
55 | |
56 b = CreateProcess (0, cmdline, 0, 0, 0, | |
57 CREATE_NEW_CONSOLE, 0, root_dir, &si, &pi); | |
58 | |
59 if (b) | |
60 WaitForSingleObject (pi.hProcess, INFINITE); | |
61 } | |
62 | |
63 static void | |
64 each (char *fname, unsigned int size) | |
65 { | |
66 char *ext = strrchr (fname, '.'); | |
67 if (!ext) | |
68 return; | |
69 | |
70 if (sh && strcmp (ext, ".sh") == 0) | |
71 { | |
72 char *f2 = concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0); | |
73 run (sh, "-c", f2); | |
74 free (f2); | |
75 } | |
76 else if (cmd && strcmp (ext, ".bat") == 0) | |
77 { | |
78 char *f2 = backslash (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", | |
79 fname, 0)); | |
80 run (cmd, "/c", f2); | |
81 free (f2); | |
82 } | |
83 else | |
84 return; | |
85 | |
86 rename (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0), | |
87 concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, ".done", 0)); | |
88 } | |
89 | |
90 static char *shells [] = { | |
91 "/bin/sh.exe", | |
92 "/usr/bin/sh.exe", | |
93 "/bin/bash.exe", | |
94 "/usr/bin/bash.exe", | |
95 0 | |
96 }; | |
97 | |
98 void | |
99 do_postinstall (HINSTANCE h) | |
100 { | |
101 int issystem; | |
102 next_dialog = 0; | |
103 char* cygroot = find_cygwin_root (&issystem); | |
104 int i; | |
452 | 105 |
106 sh = 0; | |
107 | |
108 if (cygroot) | |
448 | 109 { |
452 | 110 for (i=0; shells[i]; i++) |
111 { | |
112 sh = backslash (concat (cygroot, shells[i], 0)); | |
113 if (_access (sh, 0) == 0) | |
114 break; | |
115 free (sh); | |
116 sh = 0; | |
117 } | |
448 | 118 } |
119 | |
120 char old_path[_MAX_PATH]; | |
121 GetEnvironmentVariable ("PATH", old_path, sizeof (old_path)); | |
122 #if 0 | |
123 SetEnvironmentVariable ("PATH", | |
124 backslash (concat (root_dir, "/bin;", | |
125 root_dir, "/usr/bin;", | |
126 old_path, 0))); | |
127 | |
128 SetEnvironmentVariable ("CYGWINROOT", root_dir); | |
129 #endif | |
130 SetCurrentDirectory (root_dir); | |
131 | |
132 verinfo.dwOSVersionInfoSize = sizeof (verinfo); | |
133 GetVersionEx (&verinfo); | |
134 | |
135 switch (verinfo.dwPlatformId) | |
136 { | |
137 case VER_PLATFORM_WIN32_NT: | |
138 cmd = "cmd.exe"; | |
139 break; | |
140 case VER_PLATFORM_WIN32_WINDOWS: | |
141 cmd = "command.com"; | |
142 break; | |
143 default: | |
144 cmd = "command.com"; | |
145 break; | |
146 } | |
147 | |
148 find (concat (root_dir, XEMACS_SETUP_DIR, "postinstall", 0), each); | |
149 } |