annotate netinstall/postinstall.cc @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 3d3049ae1304
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
1 /*
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
2 * Copyright (c) 2000, Red Hat, Inc.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
3 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
4 * This program is free software; you can redistribute it and/or modify
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
5 * it under the terms of the GNU General Public License as published by
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
7 * (at your option) any later version.
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
8 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
9 * A copy of the GNU General Public License can be found at
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
10 * http://www.gnu.org/
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
11 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
12 * Written by DJ Delorie <dj@cygnus.com>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
13 *
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
14 */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
15
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
16 /* The purpose of this file is to run all the post-install scripts
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
17 in their various forms. */
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
18
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
19 #include "win32.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
20
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
21 #include <io.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
22 #include <stdio.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
23 #include <stdlib.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
24 #ifndef WIN32_NATIVE
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
25 #include <unistd.h>
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
26 #endif
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
27
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
28 #include "state.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
29 #include "dialog.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
30 #include "find.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
31 #include "concat.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
32 #include "regedit.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
33 #include "reginfo.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
34 #include "resource.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
35 #include "port.h"
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
36
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
37 static char *sh = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
38 static char *cmd = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
39 static OSVERSIONINFO verinfo;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
40
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
41 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
42 run (char *shscript, char *args, char *file)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
43 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
44 BOOL b;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
45 char cmdline [_MAX_PATH];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
46 STARTUPINFO si;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
47 PROCESS_INFORMATION pi;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
48
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
49 sprintf (cmdline, "%s %s %s", shscript, args, file);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
50 memset (&pi, 0, sizeof (pi));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
51 memset (&si, 0, sizeof (si));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
52 si.cb = sizeof (si);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
53 si.lpTitle = "XEmacs Setup Post-Install Script";
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
54 si.dwFlags = STARTF_USEPOSITION;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
55
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
56 b = CreateProcess (0, cmdline, 0, 0, 0,
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
57 CREATE_NEW_CONSOLE, 0, root_dir, &si, &pi);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
58
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
59 if (b)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
60 WaitForSingleObject (pi.hProcess, INFINITE);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
61 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
62
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
63 static void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
64 each (char *fname, unsigned int size)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
65 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
66 char *ext = strrchr (fname, '.');
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
67 if (!ext)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
68 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
69
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
70 if (sh && strcmp (ext, ".sh") == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
71 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
72 char *f2 = concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
73 run (sh, "-c", f2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
74 free (f2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
75 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
76 else if (cmd && strcmp (ext, ".bat") == 0)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
77 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
78 char *f2 = backslash (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
79 fname, 0));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
80 run (cmd, "/c", f2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
81 free (f2);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
82 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
83 else
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
84 return;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
85
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
86 rename (concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, 0),
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
87 concat (root_dir, XEMACS_SETUP_DIR, "postinstall/", fname, ".done", 0));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
88 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
89
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
90 static char *shells [] = {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
91 "/bin/sh.exe",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
92 "/usr/bin/sh.exe",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
93 "/bin/bash.exe",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
94 "/usr/bin/bash.exe",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
95 0
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
96 };
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
97
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
98 void
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
99 do_postinstall (HINSTANCE h)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
100 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
101 int issystem;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
102 next_dialog = 0;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
103 char* cygroot = find_cygwin_root (&issystem);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
104 int i;
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
105
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
106 sh = 0;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
107
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
108 if (cygroot)
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
109 {
452
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
110 for (i=0; shells[i]; i++)
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
111 {
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
112 sh = backslash (concat (cygroot, shells[i], 0));
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
113 if (_access (sh, 0) == 0)
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
114 break;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
115 free (sh);
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
116 sh = 0;
3d3049ae1304 Import from CVS: tag r21-2-41
cvs
parents: 448
diff changeset
117 }
448
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
118 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
119
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
120 char old_path[_MAX_PATH];
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
121 GetEnvironmentVariable ("PATH", old_path, sizeof (old_path));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
122 #if 0
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
123 SetEnvironmentVariable ("PATH",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
124 backslash (concat (root_dir, "/bin;",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
125 root_dir, "/usr/bin;",
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
126 old_path, 0)));
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
127
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
128 SetEnvironmentVariable ("CYGWINROOT", root_dir);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
129 #endif
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
130 SetCurrentDirectory (root_dir);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
131
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
132 verinfo.dwOSVersionInfoSize = sizeof (verinfo);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
133 GetVersionEx (&verinfo);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
134
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
135 switch (verinfo.dwPlatformId)
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
136 {
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
137 case VER_PLATFORM_WIN32_NT:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
138 cmd = "cmd.exe";
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
139 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
140 case VER_PLATFORM_WIN32_WINDOWS:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
141 cmd = "command.com";
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
142 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
143 default:
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
144 cmd = "command.com";
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
145 break;
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
146 }
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
147
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
148 find (concat (root_dir, XEMACS_SETUP_DIR, "postinstall", 0), each);
3078fd1074e8 Import from CVS: tag r21-2-39
cvs
parents:
diff changeset
149 }