Mercurial > emacs
annotate src/w32proc.c @ 112353:71904feb29f6
Improve performance on non-GCC hosts with __aligned__.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 17 Jan 2011 20:55:12 -0800 |
parents | 417b1e4d63cd |
children | 42e22c4f06b7 |
rev | line source |
---|---|
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16826
diff
changeset
|
1 /* Process support for GNU Emacs on the Microsoft W32 API. |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
2 Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005, |
112218
376148b31b5e
Add 2011 to FSF/AIST copyright years.
Glenn Morris <rgm@gnu.org>
parents:
110994
diff
changeset
|
3 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
9907 | 4 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
5 This file is part of GNU Emacs. |
9907 | 6 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
10 (at your option) any later version. |
9907 | 11 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
12 GNU Emacs is distributed in the hope that it will be useful, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
15 GNU General Public License for more details. |
9907 | 16 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
14036
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
9907 | 19 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94839
diff
changeset
|
20 /* |
9907 | 21 Drew Bliss Oct 14, 1993 |
22 Adapted from alarm.c by Tim Fleehart | |
23 */ | |
24 | |
25 #include <stdio.h> | |
26 #include <stdlib.h> | |
27 #include <errno.h> | |
28 #include <io.h> | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
29 #include <fcntl.h> |
9907 | 30 #include <signal.h> |
45089 | 31 #include <sys/file.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103813
diff
changeset
|
32 #include <setjmp.h> |
9907 | 33 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
34 /* must include CRT headers *before* config.h */ |
42469 | 35 #include <config.h> |
36 | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
37 #undef signal |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
38 #undef wait |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
39 #undef spawnve |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
40 #undef select |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
41 #undef kill |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
42 |
9907 | 43 #include <windows.h> |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
44 #ifdef __GNUC__ |
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
45 /* This definition is missing from mingw32 headers. */ |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
46 extern BOOL WINAPI IsValidLocale (LCID, DWORD); |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
47 #endif |
9907 | 48 |
73091
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
49 #ifdef HAVE_LANGINFO_CODESET |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
50 #include <nl_types.h> |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
51 #include <langinfo.h> |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
52 #endif |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
53 |
9907 | 54 #include "lisp.h" |
90929 | 55 #include "character.h" |
16593
4ed80eda6fac
Use new names for w32 files
Geoff Voelker <voelker@cs.washington.edu>
parents:
16588
diff
changeset
|
56 #include "w32.h" |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
57 #include "w32heap.h" |
9907 | 58 #include "systime.h" |
13931
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
59 #include "syswait.h" |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
60 #include "process.h" |
37703
d0b43907dca5
Include syssignal.h, to avoid compiler warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
37290
diff
changeset
|
61 #include "syssignal.h" |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
62 #include "w32term.h" |
95277 | 63 #include "dispextern.h" /* for xstrcasecmp */ |
100045
3ec2cc2d35c1
* w32proc.c: Include "coding.h".
Juanma Barranquero <lekktu@gmail.com>
parents:
96893
diff
changeset
|
64 #include "coding.h" |
13931
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
65 |
63087 | 66 #define RVA_TO_PTR(var,section,filedata) \ |
67 ((void *)((section)->PointerToRawData \ | |
68 + ((DWORD)(var) - (section)->VirtualAddress) \ | |
69 + (filedata).file_base)) | |
70 | |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
71 /* Control whether spawnve quotes arguments as necessary to ensure |
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
72 correct parsing by child process. Because not all uses of spawnve |
96376
c3309dba6542
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96361
diff
changeset
|
73 are careful about constructing argv arrays, we make this behavior |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
74 conditional (off by default). */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
75 Lisp_Object Vw32_quote_process_args; |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
76 |
16000
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
77 /* Control whether create_child causes the process' window to be |
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
78 hidden. The default is nil. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
79 Lisp_Object Vw32_start_process_show_window; |
16000
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
80 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
81 /* Control whether create_child causes the process to inherit Emacs' |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
82 console window, or be given a new one of its own. The default is |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
83 nil, to allow multiple DOS programs to run on Win95. Having separate |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
84 consoles also allows Emacs to cleanly terminate process groups. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
85 Lisp_Object Vw32_start_process_share_console; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
86 |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
87 /* Control whether create_child cause the process to inherit Emacs' |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
88 error mode setting. The default is t, to minimize the possibility of |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
89 subprocesses blocking when accessing unmounted drives. */ |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
90 Lisp_Object Vw32_start_process_inherit_error_mode; |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
91 |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
92 /* Time to sleep before reading from a subprocess output pipe - this |
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
93 avoids the inefficiency of frequently reading small amounts of data. |
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
94 This is primarily necessary for handling DOS processes on Windows 95, |
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16826
diff
changeset
|
95 but is useful for W32 processes on both Windows 95 and NT as well. */ |
55642
d69e0fb91340
* w32proc.c (w32_pipe_read_delay): Rename from Vw32_pipe_read_delay
Jason Rumney <jasonr@gnu.org>
parents:
52401
diff
changeset
|
96 int w32_pipe_read_delay; |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
97 |
15325
5c8e4ef3137c
(Vwin32_downcase_file_names): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15247
diff
changeset
|
98 /* Control conversion of upper case file names to lower case. |
5c8e4ef3137c
(Vwin32_downcase_file_names): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15247
diff
changeset
|
99 nil means no, t means yes. */ |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
100 Lisp_Object Vw32_downcase_file_names; |
15325
5c8e4ef3137c
(Vwin32_downcase_file_names): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15247
diff
changeset
|
101 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
102 /* Control whether stat() attempts to generate fake but hopefully |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
103 "accurate" inode values, by hashing the absolute truenames of files. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
104 This should detect aliasing between long and short names, but still |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
105 allows the possibility of hash collisions. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
106 Lisp_Object Vw32_generate_fake_inodes; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
107 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
108 /* Control whether stat() attempts to determine file type and link count |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
109 exactly, at the expense of slower operation. Since true hard links |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
110 are supported on NTFS volumes, this is only relevant on NT. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
111 Lisp_Object Vw32_get_true_file_attributes; |
80485
f1f27e9c15d7
(syms_of_ntproc): Change Vw32_get_true_file attributes
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
112 extern Lisp_Object Qlocal; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
113 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
114 Lisp_Object Qhigh, Qlow; |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
115 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
116 #ifdef EMACSDEBUG |
109152
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
117 void |
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
118 _DebPrint (const char *fmt, ...) |
9907 | 119 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
120 char buf[1024]; |
9907 | 121 va_list args; |
122 | |
123 va_start (args, fmt); | |
124 vsprintf (buf, fmt, args); | |
125 va_end (args); | |
126 OutputDebugString (buf); | |
127 } | |
128 #endif | |
129 | |
109160
f8660b83cdbf
Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents:
109152
diff
changeset
|
130 typedef void (_CALLBACK_ *signal_handler) (int); |
9907 | 131 |
132 /* Signal handlers...SIG_DFL == 0 so this is initialized correctly. */ | |
133 static signal_handler sig_handlers[NSIG]; | |
134 | |
135 /* Fake signal implementation to record the SIGCHLD handler. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
136 signal_handler |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
137 sys_signal (int sig, signal_handler handler) |
9907 | 138 { |
139 signal_handler old; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
140 |
9907 | 141 if (sig != SIGCHLD) |
142 { | |
143 errno = EINVAL; | |
144 return SIG_ERR; | |
145 } | |
146 old = sig_handlers[sig]; | |
147 sig_handlers[sig] = handler; | |
148 return old; | |
149 } | |
150 | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
151 /* Defined in <process.h> which conflicts with the local copy */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
152 #define _P_NOWAIT 1 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
153 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
154 /* Child process management list. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
155 int child_proc_count = 0; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
156 child_process child_procs[ MAX_CHILDREN ]; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
157 child_process *dead_child = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
158 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
159 static DWORD WINAPI reader_thread (void *arg); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
160 |
9907 | 161 /* Find an unused process slot. */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
162 child_process * |
9907 | 163 new_child (void) |
164 { | |
165 child_process *cp; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
166 DWORD id; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
167 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
168 for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) |
9907 | 169 if (!CHILD_ACTIVE (cp)) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
170 goto Initialise; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
171 if (child_proc_count == MAX_CHILDREN) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
172 return NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
173 cp = &child_procs[child_proc_count++]; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
174 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
175 Initialise: |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
176 memset (cp, 0, sizeof (*cp)); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
177 cp->fd = -1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
178 cp->pid = -1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
179 cp->procinfo.hProcess = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
180 cp->status = STATUS_READ_ERROR; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
181 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
182 /* use manual reset event so that select() will function properly */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
183 cp->char_avail = CreateEvent (NULL, TRUE, FALSE, NULL); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
184 if (cp->char_avail) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
185 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
186 cp->char_consumed = CreateEvent (NULL, FALSE, FALSE, NULL); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
187 if (cp->char_consumed) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
188 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
189 cp->thrd = CreateThread (NULL, 1024, reader_thread, cp, 0, &id); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
190 if (cp->thrd) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
191 return cp; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
192 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
193 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
194 delete_child (cp); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
195 return NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
196 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
197 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
198 void |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
199 delete_child (child_process *cp) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
200 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
201 int i; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
202 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
203 /* Should not be deleting a child that is still needed. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
204 for (i = 0; i < MAXDESC; i++) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
205 if (fd_info[i].cp == cp) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
206 abort (); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
207 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
208 if (!CHILD_ACTIVE (cp)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
209 return; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
210 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
211 /* reap thread if necessary */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
212 if (cp->thrd) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
213 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
214 DWORD rc; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
215 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
216 if (GetExitCodeThread (cp->thrd, &rc) && rc == STILL_ACTIVE) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
217 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
218 /* let the thread exit cleanly if possible */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
219 cp->status = STATUS_READ_ERROR; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
220 SetEvent (cp->char_consumed); |
78726
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
221 #if 0 |
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
222 /* We used to forceably terminate the thread here, but it |
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
223 is normally unnecessary, and in abnormal cases, the worst that |
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
224 will happen is we have an extra idle thread hanging around |
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
225 waiting for the zombie process. */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
226 if (WaitForSingleObject (cp->thrd, 1000) != WAIT_OBJECT_0) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
227 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
228 DebPrint (("delete_child.WaitForSingleObject (thread) failed " |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
229 "with %lu for fd %ld\n", GetLastError (), cp->fd)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
230 TerminateThread (cp->thrd, 0); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
231 } |
78726
bede1aa77f62
(delete_child): Don't terminate threads of zombies.
Jason Rumney <jasonr@gnu.org>
parents:
78260
diff
changeset
|
232 #endif |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
233 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
234 CloseHandle (cp->thrd); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
235 cp->thrd = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
236 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
237 if (cp->char_avail) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
238 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
239 CloseHandle (cp->char_avail); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
240 cp->char_avail = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
241 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
242 if (cp->char_consumed) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
243 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
244 CloseHandle (cp->char_consumed); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
245 cp->char_consumed = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
246 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
247 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
248 /* update child_proc_count (highest numbered slot in use plus one) */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
249 if (cp == child_procs + child_proc_count - 1) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
250 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
251 for (i = child_proc_count-1; i >= 0; i--) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
252 if (CHILD_ACTIVE (&child_procs[i])) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
253 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
254 child_proc_count = i + 1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
255 break; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
256 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
257 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
258 if (i < 0) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
259 child_proc_count = 0; |
9907 | 260 } |
261 | |
262 /* Find a child by pid. */ | |
263 static child_process * | |
264 find_child_pid (DWORD pid) | |
265 { | |
266 child_process *cp; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
267 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
268 for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) |
9907 | 269 if (CHILD_ACTIVE (cp) && pid == cp->pid) |
270 return cp; | |
271 return NULL; | |
272 } | |
273 | |
274 | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
275 /* Thread proc for child process and socket reader threads. Each thread |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
276 is normally blocked until woken by select() to check for input by |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
277 reading one char. When the read completes, char_avail is signaled |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
278 to wake up the select emulator and the thread blocks itself again. */ |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
279 static DWORD WINAPI |
9907 | 280 reader_thread (void *arg) |
281 { | |
282 child_process *cp; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
283 |
9907 | 284 /* Our identity */ |
285 cp = (child_process *)arg; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
286 |
9907 | 287 /* We have to wait for the go-ahead before we can start */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
288 if (cp == NULL |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
289 || WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
290 return 1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
291 |
9907 | 292 for (;;) |
293 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
294 int rc; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
295 |
71901
7c2a2cf361cb
(reader_thread): Use _sys_wait_accept to wait on a
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
296 if (fd_info[cp->fd].flags & FILE_LISTEN) |
7c2a2cf361cb
(reader_thread): Use _sys_wait_accept to wait on a
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
297 rc = _sys_wait_accept (cp->fd); |
7c2a2cf361cb
(reader_thread): Use _sys_wait_accept to wait on a
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
298 else |
7c2a2cf361cb
(reader_thread): Use _sys_wait_accept to wait on a
Kim F. Storm <storm@cua.dk>
parents:
68651
diff
changeset
|
299 rc = _sys_read_ahead (cp->fd); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
300 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
301 /* The name char_avail is a misnomer - it really just means the |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
302 read-ahead has completed, whether successfully or not. */ |
9907 | 303 if (!SetEvent (cp->char_avail)) |
304 { | |
305 DebPrint (("reader_thread.SetEvent failed with %lu for fd %ld\n", | |
306 GetLastError (), cp->fd)); | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
307 return 1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
308 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
309 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
310 if (rc == STATUS_READ_ERROR) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
311 return 1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
312 |
9907 | 313 /* If the read died, the child has died so let the thread die */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
314 if (rc == STATUS_READ_FAILED) |
9907 | 315 break; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
316 |
9907 | 317 /* Wait until our input is acknowledged before reading again */ |
318 if (WaitForSingleObject (cp->char_consumed, INFINITE) != WAIT_OBJECT_0) | |
319 { | |
320 DebPrint (("reader_thread.WaitForSingleObject failed with " | |
321 "%lu for fd %ld\n", GetLastError (), cp->fd)); | |
322 break; | |
323 } | |
324 } | |
325 return 0; | |
326 } | |
327 | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
328 /* To avoid Emacs changing directory, we just record here the directory |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
329 the new process should start in. This is set just before calling |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
330 sys_spawnve, and is not generally valid at any other time. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
331 static char * process_dir; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
332 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
333 static BOOL |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
334 create_child (char *exe, char *cmdline, char *env, int is_gui_app, |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
335 int * pPid, child_process *cp) |
9907 | 336 { |
337 STARTUPINFO start; | |
338 SECURITY_ATTRIBUTES sec_attrs; | |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
339 #if 0 |
9907 | 340 SECURITY_DESCRIPTOR sec_desc; |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
341 #endif |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
342 DWORD flags; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
343 char dir[ MAXPATHLEN ]; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
344 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
345 if (cp == NULL) abort (); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
346 |
9907 | 347 memset (&start, 0, sizeof (start)); |
348 start.cb = sizeof (start); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
349 |
13425
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
350 #ifdef HAVE_NTGUI |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
351 if (NILP (Vw32_start_process_show_window) && !is_gui_app) |
16000
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
352 start.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; |
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
353 else |
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
354 start.dwFlags = STARTF_USESTDHANDLES; |
13425
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
355 start.wShowWindow = SW_HIDE; |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
356 |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
357 start.hStdInput = GetStdHandle (STD_INPUT_HANDLE); |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
358 start.hStdOutput = GetStdHandle (STD_OUTPUT_HANDLE); |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
359 start.hStdError = GetStdHandle (STD_ERROR_HANDLE); |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
360 #endif /* HAVE_NTGUI */ |
b6eacb7da9f6
[HAVE_NTGUI] (create_child): Pass handles to children.
Geoff Voelker <voelker@cs.washington.edu>
parents:
12325
diff
changeset
|
361 |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
362 #if 0 |
9907 | 363 /* Explicitly specify no security */ |
364 if (!InitializeSecurityDescriptor (&sec_desc, SECURITY_DESCRIPTOR_REVISION)) | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
365 goto EH_Fail; |
9907 | 366 if (!SetSecurityDescriptorDacl (&sec_desc, TRUE, NULL, FALSE)) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
367 goto EH_Fail; |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
368 #endif |
9907 | 369 sec_attrs.nLength = sizeof (sec_attrs); |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
370 sec_attrs.lpSecurityDescriptor = NULL /* &sec_desc */; |
9907 | 371 sec_attrs.bInheritHandle = FALSE; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
372 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
373 strcpy (dir, process_dir); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
374 unixtodos_filename (dir); |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
375 |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
376 flags = (!NILP (Vw32_start_process_share_console) |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
377 ? CREATE_NEW_PROCESS_GROUP |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
378 : CREATE_NEW_CONSOLE); |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
379 if (NILP (Vw32_start_process_inherit_error_mode)) |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
380 flags |= CREATE_DEFAULT_ERROR_MODE; |
9907 | 381 if (!CreateProcess (exe, cmdline, &sec_attrs, NULL, TRUE, |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
382 flags, env, dir, &start, &cp->procinfo)) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
383 goto EH_Fail; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
384 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
385 cp->pid = (int) cp->procinfo.dwProcessId; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
386 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
387 /* Hack for Windows 95, which assigns large (ie negative) pids */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
388 if (cp->pid < 0) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
389 cp->pid = -cp->pid; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
390 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
391 /* pid must fit in a Lisp_Int */ |
55674
97c2d7314ac2
(create_child): Use INTMASK.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55648
diff
changeset
|
392 cp->pid = cp->pid & INTMASK; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
393 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
394 *pPid = cp->pid; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
395 |
9907 | 396 return TRUE; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
397 |
9907 | 398 EH_Fail: |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
399 DebPrint (("create_child.CreateProcess failed: %ld\n", GetLastError ());); |
9907 | 400 return FALSE; |
401 } | |
402 | |
403 /* create_child doesn't know what emacs' file handle will be for waiting | |
404 on output from the child, so we need to make this additional call | |
405 to register the handle with the process | |
406 This way the select emulator knows how to match file handles with | |
407 entries in child_procs. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
408 void |
9907 | 409 register_child (int pid, int fd) |
410 { | |
411 child_process *cp; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
412 |
9907 | 413 cp = find_child_pid (pid); |
414 if (cp == NULL) | |
415 { | |
416 DebPrint (("register_child unable to find pid %lu\n", pid)); | |
417 return; | |
418 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
419 |
9907 | 420 #ifdef FULL_DEBUG |
421 DebPrint (("register_child registered fd %d with pid %lu\n", fd, pid)); | |
422 #endif | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
423 |
9907 | 424 cp->fd = fd; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
425 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
426 /* thread is initially blocked until select is called; set status so |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
427 that select will release thread */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
428 cp->status = STATUS_READ_ACKNOWLEDGED; |
9907 | 429 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
430 /* attach child_process to fd_info */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
431 if (fd_info[fd].cp != NULL) |
9907 | 432 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
433 DebPrint (("register_child: fd_info[%d] apparently in use!\n", fd)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
434 abort (); |
9907 | 435 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
436 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
437 fd_info[fd].cp = cp; |
9907 | 438 } |
439 | |
440 /* When a process dies its pipe will break so the reader thread will | |
441 signal failure to the select emulator. | |
442 The select emulator then calls this routine to clean up. | |
443 Since the thread signaled failure we can assume it is exiting. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
444 static void |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
445 reap_subprocess (child_process *cp) |
9907 | 446 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
447 if (cp->procinfo.hProcess) |
9907 | 448 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
449 /* Reap the process */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
450 #ifdef FULL_DEBUG |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
451 /* Process should have already died before we are called. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
452 if (WaitForSingleObject (cp->procinfo.hProcess, 0) != WAIT_OBJECT_0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
453 DebPrint (("reap_subprocess: child fpr fd %d has not died yet!", cp->fd)); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
454 #endif |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
455 CloseHandle (cp->procinfo.hProcess); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
456 cp->procinfo.hProcess = NULL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
457 CloseHandle (cp->procinfo.hThread); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
458 cp->procinfo.hThread = NULL; |
9907 | 459 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
460 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
461 /* For asynchronous children, the child_proc resources will be freed |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
462 when the last pipe read descriptor is closed; for synchronous |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
463 children, we must explicitly free the resources now because |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
464 register_child has not been called. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
465 if (cp->fd == -1) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
466 delete_child (cp); |
9907 | 467 } |
468 | |
469 /* Wait for any of our existing child processes to die | |
470 When it does, close its handle | |
471 Return the pid and fill in the status if non-NULL. */ | |
11388
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
472 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
473 int |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
474 sys_wait (int *status) |
9907 | 475 { |
476 DWORD active, retval; | |
477 int nh; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
478 int pid; |
9907 | 479 child_process *cp, *cps[MAX_CHILDREN]; |
480 HANDLE wait_hnd[MAX_CHILDREN]; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
481 |
9907 | 482 nh = 0; |
483 if (dead_child != NULL) | |
484 { | |
485 /* We want to wait for a specific child */ | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
486 wait_hnd[nh] = dead_child->procinfo.hProcess; |
9907 | 487 cps[nh] = dead_child; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
488 if (!wait_hnd[nh]) abort (); |
9907 | 489 nh++; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
490 active = 0; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
491 goto get_result; |
9907 | 492 } |
493 else | |
494 { | |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
495 for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
496 /* some child_procs might be sockets; ignore them */ |
73664
a525ba4c658b
* w32proc.c: (sys_wait) Only wait for processes with fd<0.
Chong Yidong <cyd@stupidchicken.com>
parents:
73091
diff
changeset
|
497 if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess |
a525ba4c658b
* w32proc.c: (sys_wait) Only wait for processes with fd<0.
Chong Yidong <cyd@stupidchicken.com>
parents:
73091
diff
changeset
|
498 && (cp->fd < 0 || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0)) |
9907 | 499 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
500 wait_hnd[nh] = cp->procinfo.hProcess; |
9907 | 501 cps[nh] = cp; |
502 nh++; | |
503 } | |
504 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
505 |
9907 | 506 if (nh == 0) |
507 { | |
508 /* Nothing to wait on, so fail */ | |
509 errno = ECHILD; | |
510 return -1; | |
511 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
512 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
513 do |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
514 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
515 /* Check for quit about once a second. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
516 QUIT; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
517 active = WaitForMultipleObjects (nh, wait_hnd, FALSE, 1000); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
518 } while (active == WAIT_TIMEOUT); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
519 |
9907 | 520 if (active == WAIT_FAILED) |
521 { | |
522 errno = EBADF; | |
523 return -1; | |
524 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
525 else if (active >= WAIT_OBJECT_0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
526 && active < WAIT_OBJECT_0+MAXIMUM_WAIT_OBJECTS) |
9907 | 527 { |
528 active -= WAIT_OBJECT_0; | |
529 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
530 else if (active >= WAIT_ABANDONED_0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
531 && active < WAIT_ABANDONED_0+MAXIMUM_WAIT_OBJECTS) |
9907 | 532 { |
533 active -= WAIT_ABANDONED_0; | |
534 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
535 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
536 abort (); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
537 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
538 get_result: |
9907 | 539 if (!GetExitCodeProcess (wait_hnd[active], &retval)) |
540 { | |
541 DebPrint (("Wait.GetExitCodeProcess failed with %lu\n", | |
542 GetLastError ())); | |
543 retval = 1; | |
544 } | |
545 if (retval == STILL_ACTIVE) | |
546 { | |
547 /* Should never happen */ | |
548 DebPrint (("Wait.WaitForMultipleObjects returned an active process\n")); | |
549 errno = EINVAL; | |
550 return -1; | |
551 } | |
12325
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
552 |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
553 /* Massage the exit code from the process to match the format expected |
14036 | 554 by the WIFSTOPPED et al macros in syswait.h. Only WIFSIGNALED and |
12325
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
555 WIFEXITED are supported; WIFSTOPPED doesn't make sense under NT. */ |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
556 |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
557 if (retval == STATUS_CONTROL_C_EXIT) |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
558 retval = SIGINT; |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
559 else |
aa6fc4e97a28
(win32_wait): Massage retval into what is expected in Unix.
Richard M. Stallman <rms@gnu.org>
parents:
12239
diff
changeset
|
560 retval <<= 8; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
561 |
9907 | 562 cp = cps[active]; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
563 pid = cp->pid; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
564 #ifdef FULL_DEBUG |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
565 DebPrint (("Wait signaled with process pid %d\n", cp->pid)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
566 #endif |
11388
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
567 |
9907 | 568 if (status) |
569 { | |
11388
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
570 *status = retval; |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
571 } |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
572 else if (synch_process_alive) |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
573 { |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
574 synch_process_alive = 0; |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
575 |
13931
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
576 /* Report the status of the synchronous process. */ |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
577 if (WIFEXITED (retval)) |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
578 synch_process_retcode = WRETCODE (retval); |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
579 else if (WIFSIGNALED (retval)) |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
580 { |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
581 int code = WTERMSIG (retval); |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25646
diff
changeset
|
582 char *signame; |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25646
diff
changeset
|
583 |
26526
b7438760079b
* callproc.c (strerror): Remove decl.
Paul Eggert <eggert@twinsun.com>
parents:
26088
diff
changeset
|
584 synchronize_system_messages_locale (); |
26088
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25646
diff
changeset
|
585 signame = strsignal (code); |
b7aa6ac26872
Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents:
25646
diff
changeset
|
586 |
13931
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
587 if (signame == 0) |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
588 signame = "unknown"; |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
589 |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
590 synch_process_death = signame; |
c80fb27c183b
(win32_wait): fixed bad synch_process_retcode
Geoff Voelker <voelker@cs.washington.edu>
parents:
13425
diff
changeset
|
591 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
592 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
593 reap_subprocess (cp); |
9907 | 594 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
595 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
596 reap_subprocess (cp); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
597 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
598 return pid; |
9907 | 599 } |
600 | |
78168
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
601 /* Old versions of w32api headers don't have separate 32-bit and |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
602 64-bit defines, but the one they have matches the 32-bit variety. */ |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
603 #ifndef IMAGE_NT_OPTIONAL_HDR32_MAGIC |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
604 # define IMAGE_NT_OPTIONAL_HDR32_MAGIC IMAGE_NT_OPTIONAL_HDR_MAGIC |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
605 # define IMAGE_OPTIONAL_HEADER32 IMAGE_OPTIONAL_HEADER |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
606 #endif |
5d5dea23e4fd
(IMAGE_NT_OPTIONAL_HDR32_MAGIC, IMAGE_OPTIONAL_HEADER32): Define
Eli Zaretskii <eliz@gnu.org>
parents:
78164
diff
changeset
|
607 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
608 static void |
109152
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
609 w32_executable_type (char * filename, |
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
610 int * is_dos_app, |
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
611 int * is_cygnus_app, |
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
612 int * is_gui_app) |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
613 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
614 file_data executable; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
615 char * p; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
616 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
617 /* Default values in case we can't tell for sure. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
618 *is_dos_app = FALSE; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
619 *is_cygnus_app = FALSE; |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
620 *is_gui_app = FALSE; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
621 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
622 if (!open_input_file (&executable, filename)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
623 return; |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
624 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
625 p = strrchr (filename, '.'); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
626 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
627 /* We can only identify DOS .com programs from the extension. */ |
95219
72c67a7befd5
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
94963
diff
changeset
|
628 if (p && xstrcasecmp (p, ".com") == 0) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
629 *is_dos_app = TRUE; |
95219
72c67a7befd5
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
94963
diff
changeset
|
630 else if (p && (xstrcasecmp (p, ".bat") == 0 |
72c67a7befd5
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
94963
diff
changeset
|
631 || xstrcasecmp (p, ".cmd") == 0)) |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
632 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
633 /* A DOS shell script - it appears that CreateProcess is happy to |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
634 accept this (somewhat surprisingly); presumably it looks at |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
635 COMSPEC to determine what executable to actually invoke. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
636 Therefore, we have to do the same here as well. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
637 /* Actually, I think it uses the program association for that |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
638 extension, which is defined in the registry. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
639 p = egetenv ("COMSPEC"); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
640 if (p) |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
641 w32_executable_type (p, is_dos_app, is_cygnus_app, is_gui_app); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
642 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
643 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
644 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
645 /* Look for DOS .exe signature - if found, we must also check that |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
646 it isn't really a 16- or 32-bit Windows exe, since both formats |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
647 start with a DOS program stub. Note that 16-bit Windows |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
648 executables use the OS/2 1.x format. */ |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
649 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
650 IMAGE_DOS_HEADER * dos_header; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
651 IMAGE_NT_HEADERS * nt_header; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
652 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
653 dos_header = (PIMAGE_DOS_HEADER) executable.file_base; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
654 if (dos_header->e_magic != IMAGE_DOS_SIGNATURE) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
655 goto unwind; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
656 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
657 nt_header = (PIMAGE_NT_HEADERS) ((char *) dos_header + dos_header->e_lfanew); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
658 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
659 if ((char *) nt_header > (char *) dos_header + executable.size) |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
660 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
661 /* Some dos headers (pkunzip) have bogus e_lfanew fields. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
662 *is_dos_app = TRUE; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
663 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
664 else if (nt_header->Signature != IMAGE_NT_SIGNATURE |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
665 && LOWORD (nt_header->Signature) != IMAGE_OS2_SIGNATURE) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
666 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
667 *is_dos_app = TRUE; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
668 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
669 else if (nt_header->Signature == IMAGE_NT_SIGNATURE) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
670 { |
78164
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
671 IMAGE_DATA_DIRECTORY *data_dir = NULL; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
672 if (nt_header->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
673 { |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
674 /* Ensure we are using the 32 bit structure. */ |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
675 IMAGE_OPTIONAL_HEADER32 *opt |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
676 = (IMAGE_OPTIONAL_HEADER32*) &(nt_header->OptionalHeader); |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
677 data_dir = opt->DataDirectory; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
678 *is_gui_app = (opt->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI); |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
679 } |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
680 /* MingW 3.12 has the required 64 bit structs, but in case older |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
681 versions don't, only check 64 bit exes if we know how. */ |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
682 #ifdef IMAGE_NT_OPTIONAL_HDR64_MAGIC |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
683 else if (nt_header->OptionalHeader.Magic |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
684 == IMAGE_NT_OPTIONAL_HDR64_MAGIC) |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
685 { |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
686 IMAGE_OPTIONAL_HEADER64 *opt |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
687 = (IMAGE_OPTIONAL_HEADER64*) &(nt_header->OptionalHeader); |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
688 data_dir = opt->DataDirectory; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
689 *is_gui_app = (opt->Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI); |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
690 } |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
691 #endif |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
692 if (data_dir) |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
693 { |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
694 /* Look for cygwin.dll in DLL import list. */ |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
695 IMAGE_DATA_DIRECTORY import_dir = |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
696 data_dir[IMAGE_DIRECTORY_ENTRY_IMPORT]; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
697 IMAGE_IMPORT_DESCRIPTOR * imports; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
698 IMAGE_SECTION_HEADER * section; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
699 |
78164
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
700 section = rva_to_section (import_dir.VirtualAddress, nt_header); |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
701 imports = RVA_TO_PTR (import_dir.VirtualAddress, section, |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
702 executable); |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
703 |
78164
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
704 for ( ; imports->Name; imports++) |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
705 { |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
706 char * dllname = RVA_TO_PTR (imports->Name, section, |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
707 executable); |
100062
d4660dbaa550
* w32proc.c (Fw32_get_locale_info): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
100045
diff
changeset
|
708 |
78164
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
709 /* The exact name of the cygwin dll has changed with |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
710 various releases, but hopefully this will be reasonably |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
711 future proof. */ |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
712 if (strncmp (dllname, "cygwin", 6) == 0) |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
713 { |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
714 *is_cygnus_app = TRUE; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
715 break; |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
716 } |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
717 } |
d9f9dda7474c
(w32_executable_type): Handle 64 bit executables.
Jason Rumney <jasonr@gnu.org>
parents:
75348
diff
changeset
|
718 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
719 } |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
720 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
721 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
722 unwind: |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
723 close_file_data (&executable); |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
724 } |
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
725 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
726 static int |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
727 compare_env (const void *strp1, const void *strp2) |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
728 { |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
729 const char *str1 = *(const char **)strp1, *str2 = *(const char **)strp2; |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
730 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
731 while (*str1 && *str2 && *str1 != '=' && *str2 != '=') |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
732 { |
31354
547138676a74
(compare_env): Convert to uppercase for comparison,
Andrew Innes <andrewi@gnu.org>
parents:
31115
diff
changeset
|
733 /* Sort order in command.com/cmd.exe is based on uppercasing |
547138676a74
(compare_env): Convert to uppercase for comparison,
Andrew Innes <andrewi@gnu.org>
parents:
31115
diff
changeset
|
734 names, so do the same here. */ |
547138676a74
(compare_env): Convert to uppercase for comparison,
Andrew Innes <andrewi@gnu.org>
parents:
31115
diff
changeset
|
735 if (toupper (*str1) > toupper (*str2)) |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
736 return 1; |
31354
547138676a74
(compare_env): Convert to uppercase for comparison,
Andrew Innes <andrewi@gnu.org>
parents:
31115
diff
changeset
|
737 else if (toupper (*str1) < toupper (*str2)) |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
738 return -1; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
739 str1++, str2++; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
740 } |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
741 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
742 if (*str1 == '=' && *str2 == '=') |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
743 return 0; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
744 else if (*str1 == '=') |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
745 return -1; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
746 else |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
747 return 1; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
748 } |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
749 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
750 static void |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
751 merge_and_sort_env (char **envp1, char **envp2, char **new_envp) |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
752 { |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
753 char **optr, **nptr; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
754 int num; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
755 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
756 nptr = new_envp; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
757 optr = envp1; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
758 while (*optr) |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
759 *nptr++ = *optr++; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
760 num = optr - envp1; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
761 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
762 optr = envp2; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
763 while (*optr) |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
764 *nptr++ = *optr++; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
765 num += optr - envp2; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
766 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
767 qsort (new_envp, num, sizeof (char *), compare_env); |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
768 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
769 *nptr = NULL; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
770 } |
9907 | 771 |
772 /* When a new child process is created we need to register it in our list, | |
773 so intercept spawn requests. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
774 int |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
775 sys_spawnve (int mode, char *cmdname, char **argv, char **envp) |
9907 | 776 { |
12239
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
777 Lisp_Object program, full; |
9907 | 778 char *cmdline, *env, *parg, **targ; |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
779 int arglen, numenv; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
780 int pid; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
781 child_process *cp; |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
782 int is_dos_app, is_cygnus_app, is_gui_app; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
783 int do_quoting = 0; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
784 char escape_char; |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
785 /* We pass our process ID to our children by setting up an environment |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
786 variable in their environment. */ |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
787 char ppid_env_var_buffer[64]; |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
788 char *extra_env[] = {ppid_env_var_buffer, NULL}; |
79490
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
789 /* These are the characters that cause an argument to need quoting. |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
790 Arguments with whitespace characters need quoting to prevent the |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
791 argument being split into two or more. Arguments with wildcards |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
792 are also quoted, for consistency with posix platforms, where wildcards |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
793 are not expanded if we run the program directly without a shell. |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
794 Some extra whitespace characters need quoting in Cygwin programs, |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
795 so this list is conditionally modified below. */ |
217ec3ada789
(sys_spawnve): Quote args with wildcards.
Jason Rumney <jasonr@gnu.org>
parents:
78726
diff
changeset
|
796 char *sepchars = " \t*?"; |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
797 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
798 /* We don't care about the other modes */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
799 if (mode != _P_NOWAIT) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
800 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
801 errno = EINVAL; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
802 return -1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
803 } |
12239
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
804 |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
805 /* Handle executable names without an executable suffix. */ |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
806 program = make_string (cmdname, strlen (cmdname)); |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
807 if (NILP (Ffile_executable_p (program))) |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
808 { |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
809 struct gcpro gcpro1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
810 |
12239
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
811 full = Qnil; |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
812 GCPRO1 (program); |
45008
07245ba4ebcc
(sys_spawnve): Update call to openp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44928
diff
changeset
|
813 openp (Vexec_path, program, Vexec_suffixes, &full, make_number (X_OK)); |
12239
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
814 UNGCPRO; |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
815 if (NILP (full)) |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
816 { |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
817 errno = EINVAL; |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
818 return -1; |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
819 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
820 program = full; |
12239
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
821 } |
ff7738cdbd99
(win32_spawnve): Accept program names without executable suffixes.
Richard M. Stallman <rms@gnu.org>
parents:
12183
diff
changeset
|
822 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
823 /* make sure argv[0] and cmdname are both in DOS format */ |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45089
diff
changeset
|
824 cmdname = SDATA (program); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
825 unixtodos_filename (cmdname); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
826 argv[0] = cmdname; |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
827 |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
828 /* Determine whether program is a 16-bit DOS executable, or a w32 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
829 executable that is implicitly linked to the Cygnus dll (implying it |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
830 was compiled with the Cygnus GNU toolchain and hence relies on |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
831 cygwin.dll to parse the command line - we use this to decide how to |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
832 escape quote chars in command line args that must be quoted). |
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
833 |
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
834 Also determine whether it is a GUI app, so that we don't hide its |
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
835 initial window unless specifically requested. */ |
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
836 w32_executable_type (cmdname, &is_dos_app, &is_cygnus_app, &is_gui_app); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
837 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
838 /* On Windows 95, if cmdname is a DOS app, we invoke a helper |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
839 application to start it by specifying the helper app as cmdname, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
840 while leaving the real app name as argv[0]. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
841 if (is_dos_app) |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
842 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
843 cmdname = alloca (MAXPATHLEN); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
844 if (egetenv ("CMDPROXY")) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
845 strcpy (cmdname, egetenv ("CMDPROXY")); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
846 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
847 { |
46370
40db0673e6f0
Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents:
45089
diff
changeset
|
848 strcpy (cmdname, SDATA (Vinvocation_directory)); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
849 strcat (cmdname, "cmdproxy.exe"); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
850 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
851 unixtodos_filename (cmdname); |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
852 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
853 |
9907 | 854 /* we have to do some conjuring here to put argv and envp into the |
855 form CreateProcess wants... argv needs to be a space separated/null | |
856 terminated list of parameters, and envp is a null | |
857 separated/double-null terminated list of parameters. | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
858 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
859 Additionally, zero-length args and args containing whitespace or |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
860 quote chars need to be wrapped in double quotes - for this to work, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
861 embedded quotes need to be escaped as well. The aim is to ensure |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
862 the child process reconstructs the argv array we start with |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
863 exactly, so we treat quotes at the beginning and end of arguments |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
864 as embedded quotes. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
865 |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
866 The w32 GNU-based library from Cygnus doubles quotes to escape |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
867 them, while MSVC uses backslash for escaping. (Actually the MSVC |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
868 startup code does attempt to recognise doubled quotes and accept |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
869 them, but gets it wrong and ends up requiring three quotes to get a |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
870 single embedded quote!) So by default we decide whether to use |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
871 quote or backslash as the escape character based on whether the |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
872 binary is apparently a Cygnus compiled app. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
873 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
874 Note that using backslash to escape embedded quotes requires |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
875 additional special handling if an embedded quote is already |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
876 preceeded by backslash, or if an arg requiring quoting ends with |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
877 backslash. In such cases, the run of escape characters needs to be |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
878 doubled. For consistency, we apply this special handling as long |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
879 as the escape character is not quote. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
880 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
881 Since we have no idea how large argv and envp are likely to be we |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
882 figure out list lengths on the fly and allocate them. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
883 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
884 if (!NILP (Vw32_quote_process_args)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
885 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
886 do_quoting = 1; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
887 /* Override escape char by binding w32-quote-process-args to |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
888 desired character, or use t for auto-selection. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
889 if (INTEGERP (Vw32_quote_process_args)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
890 escape_char = XINT (Vw32_quote_process_args); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
891 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
892 escape_char = is_cygnus_app ? '"' : '\\'; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
893 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
894 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
895 /* Cygwin apps needs quoting a bit more often. */ |
37290
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
896 if (escape_char == '"') |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
897 sepchars = "\r\n\t\f '"; |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
898 |
9907 | 899 /* do argv... */ |
900 arglen = 0; | |
901 targ = argv; | |
902 while (*targ) | |
903 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
904 char * p = *targ; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
905 int need_quotes = 0; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
906 int escape_char_run = 0; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
907 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
908 if (*p == 0) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
909 need_quotes = 1; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
910 for ( ; *p; p++) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
911 { |
37290
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
912 if (escape_char == '"' && *p == '\\') |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
913 /* If it's a Cygwin app, \ needs to be escaped. */ |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
914 arglen++; |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
915 else if (*p == '"') |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
916 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
917 /* allow for embedded quotes to be escaped */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
918 arglen++; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
919 need_quotes = 1; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
920 /* handle the case where the embedded quote is already escaped */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
921 if (escape_char_run > 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
922 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
923 /* To preserve the arg exactly, we need to double the |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
924 preceding escape characters (plus adding one to |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
925 escape the quote character itself). */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
926 arglen += escape_char_run; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
927 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
928 } |
37290
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
929 else if (strchr (sepchars, *p) != NULL) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
930 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
931 need_quotes = 1; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
932 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
933 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
934 if (*p == escape_char && escape_char != '"') |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
935 escape_char_run++; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
936 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
937 escape_char_run = 0; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
938 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
939 if (need_quotes) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
940 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
941 arglen += 2; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
942 /* handle the case where the arg ends with an escape char - we |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
943 must not let the enclosing quote be escaped. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
944 if (escape_char_run > 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
945 arglen += escape_char_run; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
946 } |
9907 | 947 arglen += strlen (*targ++) + 1; |
948 } | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
949 cmdline = alloca (arglen); |
9907 | 950 targ = argv; |
951 parg = cmdline; | |
952 while (*targ) | |
953 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
954 char * p = *targ; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
955 int need_quotes = 0; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
956 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
957 if (*p == 0) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
958 need_quotes = 1; |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
959 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
960 if (do_quoting) |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
961 { |
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
962 for ( ; *p; p++) |
37290
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
963 if ((strchr (sepchars, *p) != NULL) || *p == '"') |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
964 need_quotes = 1; |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
965 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
966 if (need_quotes) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
967 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
968 int escape_char_run = 0; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
969 char * first; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
970 char * last; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
971 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
972 p = *targ; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
973 first = p; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
974 last = p + strlen (p) - 1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
975 *parg++ = '"'; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
976 #if 0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
977 /* This version does not escape quotes if they occur at the |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
978 beginning or end of the arg - this could lead to incorrect |
96376
c3309dba6542
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96361
diff
changeset
|
979 behavior when the arg itself represents a command line |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
980 containing quoted args. I believe this was originally done |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
981 as a hack to make some things work, before |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
982 `w32-quote-process-args' was added. */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
983 while (*p) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
984 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
985 if (*p == '"' && p > first && p < last) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
986 *parg++ = escape_char; /* escape embedded quotes */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
987 *parg++ = *p++; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
988 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
989 #else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
990 for ( ; *p; p++) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
991 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
992 if (*p == '"') |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
993 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
994 /* double preceding escape chars if any */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
995 while (escape_char_run > 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
996 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
997 *parg++ = escape_char; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
998 escape_char_run--; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
999 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1000 /* escape all quote chars, even at beginning or end */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1001 *parg++ = escape_char; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1002 } |
37290
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
1003 else if (escape_char == '"' && *p == '\\') |
6e6e46d239df
(sys_spawnve): Quote more chars for Cygwin.
Gerd Moellmann <gerd@gnu.org>
parents:
33694
diff
changeset
|
1004 *parg++ = '\\'; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1005 *parg++ = *p; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1006 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1007 if (*p == escape_char && escape_char != '"') |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1008 escape_char_run++; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1009 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1010 escape_char_run = 0; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1011 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1012 /* double escape chars before enclosing quote */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1013 while (escape_char_run > 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1014 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1015 *parg++ = escape_char; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1016 escape_char_run--; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1017 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1018 #endif |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1019 *parg++ = '"'; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1020 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1021 else |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1022 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1023 strcpy (parg, *targ); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1024 parg += strlen (*targ); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1025 } |
9907 | 1026 *parg++ = ' '; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1027 targ++; |
9907 | 1028 } |
1029 *--parg = '\0'; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1030 |
9907 | 1031 /* and envp... */ |
1032 arglen = 1; | |
1033 targ = envp; | |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1034 numenv = 1; /* for end null */ |
9907 | 1035 while (*targ) |
1036 { | |
1037 arglen += strlen (*targ++) + 1; | |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1038 numenv++; |
9907 | 1039 } |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1040 /* extra env vars... */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1041 sprintf (ppid_env_var_buffer, "EM_PARENT_PROCESS_ID=%d", |
9907 | 1042 GetCurrentProcessId ()); |
1043 arglen += strlen (ppid_env_var_buffer) + 1; | |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1044 numenv++; |
9907 | 1045 |
16826
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1046 /* merge env passed in and extra env into one, and sort it. */ |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1047 targ = (char **) alloca (numenv * sizeof (char *)); |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1048 merge_and_sort_env (envp, extra_env, targ); |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1049 |
e7ad34b65d8e
(compare_env, merge_and_sort_env): New functions.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1050 /* concatenate env entries. */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1051 env = alloca (arglen); |
9907 | 1052 parg = env; |
1053 while (*targ) | |
1054 { | |
1055 strcpy (parg, *targ); | |
1056 parg += strlen (*targ++); | |
1057 *parg++ = '\0'; | |
1058 } | |
1059 *parg++ = '\0'; | |
1060 *parg = '\0'; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1061 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1062 cp = new_child (); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1063 if (cp == NULL) |
9907 | 1064 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1065 errno = EAGAIN; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1066 return -1; |
9907 | 1067 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1068 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1069 /* Now create the process. */ |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
1070 if (!create_child (cmdname, cmdline, env, is_gui_app, &pid, cp)) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1071 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1072 delete_child (cp); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1073 errno = ENOEXEC; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1074 return -1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1075 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1076 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1077 return pid; |
9907 | 1078 } |
1079 | |
1080 /* Emulate the select call | |
1081 Wait for available input on any of the given rfds, or timeout if | |
1082 a timeout is given and no input is detected | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1083 wfds and efds are not supported and must be NULL. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1084 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1085 For simplicity, we detect the death of child processes here and |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1086 synchronously call the SIGCHLD handler. Since it is possible for |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1087 children to be created without a corresponding pipe handle from which |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1088 to read output, we wait separately on the process handles as well as |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1089 the char_avail events for each process pipe. We only call |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1090 wait/reap_process when the process actually terminates. |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1091 |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1092 To reduce the number of places in which Emacs can be hung such that |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1093 C-g is not able to interrupt it, we always wait on interrupt_handle |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1094 (which is signaled by the input thread when C-g is detected). If we |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1095 detect that we were woken up by C-g, we return -1 with errno set to |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1096 EINTR as on Unix. */ |
9907 | 1097 |
1098 /* From ntterm.c */ | |
1099 extern HANDLE keyboard_handle; | |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1100 |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1101 /* From w32xfns.c */ |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1102 extern HANDLE interrupt_handle; |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1103 |
9907 | 1104 /* From process.c */ |
1105 extern int proc_buffered_char[]; | |
1106 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1107 int |
11388
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
1108 sys_select (int nfds, SELECT_TYPE *rfds, SELECT_TYPE *wfds, SELECT_TYPE *efds, |
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
1109 EMACS_TIME *timeout) |
9907 | 1110 { |
1111 SELECT_TYPE orfds; | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1112 DWORD timeout_ms, start_time; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1113 int i, nh, nc, nr; |
9907 | 1114 DWORD active; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1115 child_process *cp, *cps[MAX_CHILDREN]; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1116 HANDLE wait_hnd[MAXDESC + MAX_CHILDREN]; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1117 int fdindex[MAXDESC]; /* mapping from wait handles back to descriptors */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1118 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1119 timeout_ms = timeout ? (timeout->tv_sec * 1000 + timeout->tv_usec / 1000) : INFINITE; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1120 |
9907 | 1121 /* If the descriptor sets are NULL but timeout isn't, then just Sleep. */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1122 if (rfds == NULL && wfds == NULL && efds == NULL && timeout != NULL) |
9907 | 1123 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1124 Sleep (timeout_ms); |
9907 | 1125 return 0; |
1126 } | |
1127 | |
1128 /* Otherwise, we only handle rfds, so fail otherwise. */ | |
1129 if (rfds == NULL || wfds != NULL || efds != NULL) | |
1130 { | |
1131 errno = EINVAL; | |
1132 return -1; | |
1133 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1134 |
9907 | 1135 orfds = *rfds; |
1136 FD_ZERO (rfds); | |
1137 nr = 0; | |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1138 |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1139 /* Always wait on interrupt_handle, to detect C-g (quit). */ |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1140 wait_hnd[0] = interrupt_handle; |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1141 fdindex[0] = -1; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1142 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1143 /* Build a list of pipe handles to wait on. */ |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1144 nh = 1; |
9907 | 1145 for (i = 0; i < nfds; i++) |
1146 if (FD_ISSET (i, &orfds)) | |
1147 { | |
1148 if (i == 0) | |
1149 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1150 if (keyboard_handle) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1151 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1152 /* Handle stdin specially */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1153 wait_hnd[nh] = keyboard_handle; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1154 fdindex[nh] = i; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1155 nh++; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1156 } |
9907 | 1157 |
1158 /* Check for any emacs-generated input in the queue since | |
1159 it won't be detected in the wait */ | |
1160 if (detect_input_pending ()) | |
1161 { | |
1162 FD_SET (i, rfds); | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1163 return 1; |
9907 | 1164 } |
1165 } | |
1166 else | |
1167 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1168 /* Child process and socket input */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1169 cp = fd_info[i].cp; |
9907 | 1170 if (cp) |
1171 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1172 int current_status = cp->status; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1173 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1174 if (current_status == STATUS_READ_ACKNOWLEDGED) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1175 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1176 /* Tell reader thread which file handle to use. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1177 cp->fd = i; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1178 /* Wake up the reader thread for this process */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1179 cp->status = STATUS_READ_READY; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1180 if (!SetEvent (cp->char_consumed)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1181 DebPrint (("nt_select.SetEvent failed with " |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1182 "%lu for fd %ld\n", GetLastError (), i)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1183 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1184 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1185 #ifdef CHECK_INTERLOCK |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1186 /* slightly crude cross-checking of interlock between threads */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1187 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1188 current_status = cp->status; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1189 if (WaitForSingleObject (cp->char_avail, 0) == WAIT_OBJECT_0) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1190 { |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1191 /* char_avail has been signaled, so status (which may |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1192 have changed) should indicate read has completed |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1193 but has not been acknowledged. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1194 current_status = cp->status; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1195 if (current_status != STATUS_READ_SUCCEEDED |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1196 && current_status != STATUS_READ_FAILED) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1197 DebPrint (("char_avail set, but read not completed: status %d\n", |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1198 current_status)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1199 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1200 else |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1201 { |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1202 /* char_avail has not been signaled, so status should |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1203 indicate that read is in progress; small possibility |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1204 that read has completed but event wasn't yet signaled |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1205 when we tested it (because a context switch occurred |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1206 or if running on separate CPUs). */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1207 if (current_status != STATUS_READ_READY |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1208 && current_status != STATUS_READ_IN_PROGRESS |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1209 && current_status != STATUS_READ_SUCCEEDED |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1210 && current_status != STATUS_READ_FAILED) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1211 DebPrint (("char_avail reset, but read status is bad: %d\n", |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1212 current_status)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1213 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1214 #endif |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1215 wait_hnd[nh] = cp->char_avail; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1216 fdindex[nh] = i; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1217 if (!wait_hnd[nh]) abort (); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1218 nh++; |
9907 | 1219 #ifdef FULL_DEBUG |
1220 DebPrint (("select waiting on child %d fd %d\n", | |
1221 cp-child_procs, i)); | |
1222 #endif | |
1223 } | |
1224 else | |
1225 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1226 /* Unable to find something to wait on for this fd, skip */ |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1227 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1228 /* Note that this is not a fatal error, and can in fact |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1229 happen in unusual circumstances. Specifically, if |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1230 sys_spawnve fails, eg. because the program doesn't |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1231 exist, and debug-on-error is t so Fsignal invokes a |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1232 nested input loop, then the process output pipe is |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1233 still included in input_wait_mask with no child_proc |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1234 associated with it. (It is removed when the debugger |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1235 exits the nested input loop and the error is thrown.) */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1236 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1237 DebPrint (("sys_select: fd %ld is invalid! ignoring\n", i)); |
9907 | 1238 } |
1239 } | |
1240 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1241 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1242 count_children: |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1243 /* Add handles of child processes. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1244 nc = 0; |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1245 for (cp = child_procs + (child_proc_count-1); cp >= child_procs; cp--) |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1246 /* Some child_procs might be sockets; ignore them. Also some |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1247 children may have died already, but we haven't finished reading |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1248 the process output; ignore them too. */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1249 if (CHILD_ACTIVE (cp) && cp->procinfo.hProcess |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1250 && (cp->fd < 0 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1251 || (fd_info[cp->fd].flags & FILE_SEND_SIGCHLD) == 0 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1252 || (fd_info[cp->fd].flags & FILE_AT_EOF) != 0) |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1253 ) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1254 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1255 wait_hnd[nh + nc] = cp->procinfo.hProcess; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1256 cps[nc] = cp; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1257 nc++; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1258 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1259 |
9907 | 1260 /* Nothing to look for, so we didn't find anything */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1261 if (nh + nc == 0) |
9907 | 1262 { |
11388
96fa39ad9403
(win32_wait): Reap synchronous subprocesses, and place
Karl Heuer <kwzh@gnu.org>
parents:
9907
diff
changeset
|
1263 if (timeout) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1264 Sleep (timeout_ms); |
9907 | 1265 return 0; |
1266 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1267 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1268 start_time = GetTickCount (); |
24915
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1269 |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1270 /* Wait for input or child death to be signaled. If user input is |
24915
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1271 allowed, then also accept window messages. */ |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1272 if (FD_ISSET (0, &orfds)) |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1273 active = MsgWaitForMultipleObjects (nh + nc, wait_hnd, FALSE, timeout_ms, |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1274 QS_ALLINPUT); |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1275 else |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1276 active = WaitForMultipleObjects (nh + nc, wait_hnd, FALSE, timeout_ms); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1277 |
9907 | 1278 if (active == WAIT_FAILED) |
1279 { | |
1280 DebPrint (("select.WaitForMultipleObjects (%d, %lu) failed with %lu\n", | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1281 nh + nc, timeout_ms, GetLastError ())); |
56729
e6e0caa7ec87
Rename wait_reading_process_input to wait_reading_process_output.
Kim F. Storm <storm@cua.dk>
parents:
55674
diff
changeset
|
1282 /* don't return EBADF - this causes wait_reading_process_output to |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1283 abort; WAIT_FAILED is returned when single-stepping under |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1284 Windows 95 after switching thread focus in debugger, and |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1285 possibly at other times. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1286 errno = EINTR; |
9907 | 1287 return -1; |
1288 } | |
1289 else if (active == WAIT_TIMEOUT) | |
1290 { | |
1291 return 0; | |
1292 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1293 else if (active >= WAIT_OBJECT_0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1294 && active < WAIT_OBJECT_0+MAXIMUM_WAIT_OBJECTS) |
9907 | 1295 { |
1296 active -= WAIT_OBJECT_0; | |
1297 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1298 else if (active >= WAIT_ABANDONED_0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1299 && active < WAIT_ABANDONED_0+MAXIMUM_WAIT_OBJECTS) |
9907 | 1300 { |
1301 active -= WAIT_ABANDONED_0; | |
1302 } | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1303 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1304 abort (); |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1305 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1306 /* Loop over all handles after active (now officially documented as |
96361
a99299e4d2de
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
95277
diff
changeset
|
1307 being the first signaled handle in the array). We do this to |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1308 ensure fairness, so that all channels with data available will be |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1309 processed - otherwise higher numbered channels could be starved. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1310 do |
9907 | 1311 { |
24915
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1312 if (active == nh + nc) |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1313 { |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1314 /* There are messages in the lisp thread's queue; we must |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1315 drain the queue now to ensure they are processed promptly, |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1316 because if we don't do so, we will not be woken again until |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1317 further messages arrive. |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1318 |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1319 NB. If ever we allow window message procedures to callback |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1320 into lisp, we will need to ensure messages are dispatched |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1321 at a safe time for lisp code to be run (*), and we may also |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1322 want to provide some hooks in the dispatch loop to cater |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1323 for modeless dialogs created by lisp (ie. to register |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1324 window handles to pass to IsDialogMessage). |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1325 |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1326 (*) Note that MsgWaitForMultipleObjects above is an |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1327 internal dispatch point for messages that are sent to |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1328 windows created by this thread. */ |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1329 drain_message_queue (); |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1330 } |
ff85091a55e7
(sys_select): Call MsgWaitForMultipleObjects instead
Andrew Innes <andrewi@gnu.org>
parents:
24671
diff
changeset
|
1331 else if (active >= nh) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1332 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1333 cp = cps[active - nh]; |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1334 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1335 /* We cannot always signal SIGCHLD immediately; if we have not |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1336 finished reading the process output, we must delay sending |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1337 SIGCHLD until we do. */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1338 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1339 if (cp->fd >= 0 && (fd_info[cp->fd].flags & FILE_AT_EOF) == 0) |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1340 fd_info[cp->fd].flags |= FILE_SEND_SIGCHLD; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1341 /* SIG_DFL for SIGCHLD is ignore */ |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1342 else if (sig_handlers[SIGCHLD] != SIG_DFL && |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1343 sig_handlers[SIGCHLD] != SIG_IGN) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1344 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1345 #ifdef FULL_DEBUG |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1346 DebPrint (("select calling SIGCHLD handler for pid %d\n", |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1347 cp->pid)); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1348 #endif |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1349 dead_child = cp; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1350 sig_handlers[SIGCHLD] (SIGCHLD); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1351 dead_child = NULL; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1352 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1353 } |
22079
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1354 else if (fdindex[active] == -1) |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1355 { |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1356 /* Quit (C-g) was detected. */ |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1357 errno = EINTR; |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1358 return -1; |
b7a2370ee82d
(sys_select): Always wait on interrupt_handle, so that
Richard M. Stallman <rms@gnu.org>
parents:
21742
diff
changeset
|
1359 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1360 else if (fdindex[active] == 0) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1361 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1362 /* Keyboard input available */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1363 FD_SET (0, rfds); |
9907 | 1364 nr++; |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1365 } |
9907 | 1366 else |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1367 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1368 /* must be a socket or pipe - read ahead should have |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1369 completed, either succeeding or failing. */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1370 FD_SET (fdindex[active], rfds); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1371 nr++; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1372 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1373 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1374 /* Even though wait_reading_process_output only reads from at most |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1375 one channel, we must process all channels here so that we reap |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1376 all children that have died. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1377 while (++active < nh + nc) |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1378 if (WaitForSingleObject (wait_hnd[active], 0) == WAIT_OBJECT_0) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1379 break; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1380 } while (active < nh + nc); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1381 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1382 /* If no input has arrived and timeout hasn't expired, wait again. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1383 if (nr == 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1384 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1385 DWORD elapsed = GetTickCount () - start_time; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1386 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1387 if (timeout_ms > elapsed) /* INFINITE is MAX_UINT */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1388 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1389 if (timeout_ms != INFINITE) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1390 timeout_ms -= elapsed; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1391 goto count_children; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1392 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1393 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1394 |
9907 | 1395 return nr; |
1396 } | |
1397 | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1398 /* Substitute for certain kill () operations */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1399 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1400 static BOOL CALLBACK |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
1401 find_child_console (HWND hwnd, LPARAM arg) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1402 { |
31115
42753ce203f8
(IsValidLocale): Extern missing from mingw32 headers.
Andrew Innes <andrewi@gnu.org>
parents:
26526
diff
changeset
|
1403 child_process * cp = (child_process *) arg; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1404 DWORD thread_id; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1405 DWORD process_id; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1406 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1407 thread_id = GetWindowThreadProcessId (hwnd, &process_id); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1408 if (process_id == cp->procinfo.dwProcessId) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1409 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1410 char window_class[32]; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1411 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1412 GetClassName (hwnd, window_class, sizeof (window_class)); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1413 if (strcmp (window_class, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1414 (os_subtype == OS_WIN95) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1415 ? "tty" |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1416 : "ConsoleWindowClass") == 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1417 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1418 cp->hwnd = hwnd; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1419 return FALSE; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1420 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1421 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1422 /* keep looking */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1423 return TRUE; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1424 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1425 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1426 int |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1427 sys_kill (int pid, int sig) |
9907 | 1428 { |
1429 child_process *cp; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1430 HANDLE proc_hand; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1431 int need_to_free = 0; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1432 int rc = 0; |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1433 |
9907 | 1434 /* Only handle signals that will result in the process dying */ |
1435 if (sig != SIGINT && sig != SIGKILL && sig != SIGQUIT && sig != SIGHUP) | |
1436 { | |
1437 errno = EINVAL; | |
1438 return -1; | |
1439 } | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1440 |
9907 | 1441 cp = find_child_pid (pid); |
1442 if (cp == NULL) | |
1443 { | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1444 proc_hand = OpenProcess (PROCESS_TERMINATE, 0, pid); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1445 if (proc_hand == NULL) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1446 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1447 errno = EPERM; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1448 return -1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1449 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1450 need_to_free = 1; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1451 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1452 else |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1453 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1454 proc_hand = cp->procinfo.hProcess; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1455 pid = cp->procinfo.dwProcessId; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1456 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1457 /* Try to locate console window for process. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1458 EnumWindows (find_child_console, (LPARAM) cp); |
9907 | 1459 } |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1460 |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
1461 if (sig == SIGINT || sig == SIGQUIT) |
9907 | 1462 { |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1463 if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1464 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1465 BYTE control_scan_code = (BYTE) MapVirtualKey (VK_CONTROL, 0); |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
1466 /* Fake Ctrl-C for SIGINT, and Ctrl-Break for SIGQUIT. */ |
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
1467 BYTE vk_break_code = (sig == SIGINT) ? 'C' : VK_CANCEL; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1468 BYTE break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1469 HWND foreground_window; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1470 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1471 if (break_scan_code == 0) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1472 { |
38022
71e8b6ae114f
(create_child): Add new parameter is_gui_app.
Andrew Innes <andrewi@gnu.org>
parents:
37703
diff
changeset
|
1473 /* Fake Ctrl-C for SIGQUIT if we can't manage Ctrl-Break. */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1474 vk_break_code = 'C'; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1475 break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1476 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1477 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1478 foreground_window = GetForegroundWindow (); |
24671
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1479 if (foreground_window) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1480 { |
24671
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1481 /* NT 5.0, and apparently also Windows 98, will not allow |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1482 a Window to be set to foreground directly without the |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1483 user's involvement. The workaround is to attach |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1484 ourselves to the thread that owns the foreground |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1485 window, since that is the only thread that can set the |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1486 foreground window. */ |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1487 DWORD foreground_thread, child_thread; |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1488 foreground_thread = |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1489 GetWindowThreadProcessId (foreground_window, NULL); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1490 if (foreground_thread == GetCurrentThreadId () |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1491 || !AttachThreadInput (GetCurrentThreadId (), |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1492 foreground_thread, TRUE)) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1493 foreground_thread = 0; |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1494 |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1495 child_thread = GetWindowThreadProcessId (cp->hwnd, NULL); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1496 if (child_thread == GetCurrentThreadId () |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1497 || !AttachThreadInput (GetCurrentThreadId (), |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1498 child_thread, TRUE)) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1499 child_thread = 0; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1500 |
24671
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1501 /* Set the foreground window to the child. */ |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1502 if (SetForegroundWindow (cp->hwnd)) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1503 { |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1504 /* Generate keystrokes as if user had typed Ctrl-Break or |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1505 Ctrl-C. */ |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1506 keybd_event (VK_CONTROL, control_scan_code, 0, 0); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1507 keybd_event (vk_break_code, break_scan_code, |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1508 (vk_break_code == 'C' ? 0 : KEYEVENTF_EXTENDEDKEY), 0); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1509 keybd_event (vk_break_code, break_scan_code, |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1510 (vk_break_code == 'C' ? 0 : KEYEVENTF_EXTENDEDKEY) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1511 | KEYEVENTF_KEYUP, 0); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1512 keybd_event (VK_CONTROL, control_scan_code, |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1513 KEYEVENTF_KEYUP, 0); |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1514 |
24671
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1515 /* Sleep for a bit to give time for Emacs frame to respond |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1516 to focus change events (if Emacs was active app). */ |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1517 Sleep (100); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1518 |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1519 SetForegroundWindow (foreground_window); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1520 } |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1521 /* Detach from the foreground and child threads now that |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1522 the foreground switching is over. */ |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1523 if (foreground_thread) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1524 AttachThreadInput (GetCurrentThreadId (), |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1525 foreground_thread, FALSE); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1526 if (child_thread) |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1527 AttachThreadInput (GetCurrentThreadId (), |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1528 child_thread, FALSE); |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1529 } |
65ebab3569e0
(sys_kill): Attach to current foreground thread
Andrew Innes <andrewi@gnu.org>
parents:
24105
diff
changeset
|
1530 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1531 /* Ctrl-Break is NT equivalent of SIGINT. */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1532 else if (!GenerateConsoleCtrlEvent (CTRL_BREAK_EVENT, pid)) |
9907 | 1533 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1534 DebPrint (("sys_kill.GenerateConsoleCtrlEvent return %d " |
9907 | 1535 "for pid %lu\n", GetLastError (), pid)); |
1536 errno = EINVAL; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1537 rc = -1; |
21742
b1c3fe58dbbe
(sys_kill): Fix indenting.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21613
diff
changeset
|
1538 } |
9907 | 1539 } |
1540 else | |
1541 { | |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1542 if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1543 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1544 #if 1 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1545 if (os_subtype == OS_WIN95) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1546 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1547 /* |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1548 Another possibility is to try terminating the VDM out-right by |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1549 calling the Shell VxD (id 0x17) V86 interface, function #4 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1550 "SHELL_Destroy_VM", ie. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1551 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1552 mov edx,4 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1553 mov ebx,vm_handle |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1554 call shellapi |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1555 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1556 First need to determine the current VM handle, and then arrange for |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1557 the shellapi call to be made from the system vm (by using |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1558 Switch_VM_and_callback). |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1559 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1560 Could try to invoke DestroyVM through CallVxD. |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1561 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1562 */ |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1563 #if 0 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1564 /* On Win95, posting WM_QUIT causes the 16-bit subsystem |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1565 to hang when cmdproxy is used in conjunction with |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1566 command.com for an interactive shell. Posting |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1567 WM_CLOSE pops up a dialog that, when Yes is selected, |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1568 does the same thing. TerminateProcess is also less |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1569 than ideal in that subprocesses tend to stick around |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1570 until the machine is shutdown, but at least it |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1571 doesn't freeze the 16-bit subsystem. */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1572 PostMessage (cp->hwnd, WM_QUIT, 0xff, 0); |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1573 #endif |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1574 if (!TerminateProcess (proc_hand, 0xff)) |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1575 { |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1576 DebPrint (("sys_kill.TerminateProcess returned %d " |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1577 "for pid %lu\n", GetLastError (), pid)); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1578 errno = EINVAL; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1579 rc = -1; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
1580 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1581 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1582 else |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1583 #endif |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1584 PostMessage (cp->hwnd, WM_CLOSE, 0, 0); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1585 } |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
1586 /* Kill the process. On W32 this doesn't kill child processes |
15351
6deee3a18ba8
(sys_kill): Don't try to terminate a DOS process.
Richard M. Stallman <rms@gnu.org>
parents:
15325
diff
changeset
|
1587 so it doesn't work very well for shells which is why it's not |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1588 used in every case. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1589 else if (!TerminateProcess (proc_hand, 0xff)) |
9907 | 1590 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1591 DebPrint (("sys_kill.TerminateProcess returned %d " |
9907 | 1592 "for pid %lu\n", GetLastError (), pid)); |
1593 errno = EINVAL; | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1594 rc = -1; |
9907 | 1595 } |
1596 } | |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1597 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1598 if (need_to_free) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1599 CloseHandle (proc_hand); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1600 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1601 return rc; |
9907 | 1602 } |
1603 | |
21452
bd9b548fd162
Delete incorrect prototype of report_file_error.
Karl Heuer <kwzh@gnu.org>
parents:
19712
diff
changeset
|
1604 /* extern int report_file_error (char *, Lisp_Object); */ |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1605 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1606 /* The following two routines are used to manipulate stdin, stdout, and |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1607 stderr of our child processes. |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1608 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1609 Assuming that in, out, and err are *not* inheritable, we make them |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1610 stdin, stdout, and stderr of the child as follows: |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1611 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1612 - Save the parent's current standard handles. |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1613 - Set the std handles to inheritable duplicates of the ones being passed in. |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1614 (Note that _get_osfhandle() is an io.h procedure that retrieves the |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1615 NT file handle for a crt file descriptor.) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1616 - Spawn the child, which inherits in, out, and err as stdin, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1617 stdout, and stderr. (see Spawnve) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1618 - Close the std handles passed to the child. |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1619 - Reset the parent's standard handles to the saved handles. |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1620 (see reset_standard_handles) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1621 We assume that the caller closes in, out, and err after calling us. */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1622 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1623 void |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1624 prepare_standard_handles (int in, int out, int err, HANDLE handles[3]) |
9907 | 1625 { |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1626 HANDLE parent; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1627 HANDLE newstdin, newstdout, newstderr; |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1628 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1629 parent = GetCurrentProcess (); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1630 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1631 handles[0] = GetStdHandle (STD_INPUT_HANDLE); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1632 handles[1] = GetStdHandle (STD_OUTPUT_HANDLE); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1633 handles[2] = GetStdHandle (STD_ERROR_HANDLE); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1634 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1635 /* make inheritable copies of the new handles */ |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1636 if (!DuplicateHandle (parent, |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1637 (HANDLE) _get_osfhandle (in), |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1638 parent, |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1639 &newstdin, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1640 0, |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1641 TRUE, |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1642 DUPLICATE_SAME_ACCESS)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1643 report_file_error ("Duplicating input handle for child", Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1644 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1645 if (!DuplicateHandle (parent, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1646 (HANDLE) _get_osfhandle (out), |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1647 parent, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1648 &newstdout, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1649 0, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1650 TRUE, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1651 DUPLICATE_SAME_ACCESS)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1652 report_file_error ("Duplicating output handle for child", Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1653 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1654 if (!DuplicateHandle (parent, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1655 (HANDLE) _get_osfhandle (err), |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1656 parent, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1657 &newstderr, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1658 0, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1659 TRUE, |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1660 DUPLICATE_SAME_ACCESS)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1661 report_file_error ("Duplicating error handle for child", Qnil); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1662 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1663 /* and store them as our std handles */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1664 if (!SetStdHandle (STD_INPUT_HANDLE, newstdin)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1665 report_file_error ("Changing stdin handle", Qnil); |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
1666 |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1667 if (!SetStdHandle (STD_OUTPUT_HANDLE, newstdout)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1668 report_file_error ("Changing stdout handle", Qnil); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1669 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1670 if (!SetStdHandle (STD_ERROR_HANDLE, newstderr)) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1671 report_file_error ("Changing stderr handle", Qnil); |
9907 | 1672 } |
15145
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1673 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1674 void |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1675 reset_standard_handles (int in, int out, int err, HANDLE handles[3]) |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1676 { |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1677 /* close the duplicated handles passed to the child */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1678 CloseHandle (GetStdHandle (STD_INPUT_HANDLE)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1679 CloseHandle (GetStdHandle (STD_OUTPUT_HANDLE)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1680 CloseHandle (GetStdHandle (STD_ERROR_HANDLE)); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1681 |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1682 /* now restore parent's saved std handles */ |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1683 SetStdHandle (STD_INPUT_HANDLE, handles[0]); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1684 SetStdHandle (STD_OUTPUT_HANDLE, handles[1]); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1685 SetStdHandle (STD_ERROR_HANDLE, handles[2]); |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1686 } |
86a1f426871e
Include config.h after CRT headers. Include fcntl.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
1687 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1688 void |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1689 set_process_dir (char * dir) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1690 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1691 process_dir = dir; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1692 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1693 |
15356
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1694 /* To avoid problems with winsock implementations that work over dial-up |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1695 connections causing or requiring a connection to exist while Emacs is |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1696 running, Emacs no longer automatically loads winsock on startup if it |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1697 is present. Instead, it will be loaded when open-network-stream is |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1698 first called. |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1699 |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1700 To allow full control over when winsock is loaded, we provide these |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1701 two functions to dynamically load and unload winsock. This allows |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1702 dial-up users to only be connected when they actually need to use |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1703 socket services. */ |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1704 |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1705 /* From nt.c */ |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1706 extern HANDLE winsock_lib; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1707 extern BOOL term_winsock (void); |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1708 extern BOOL init_winsock (int load_now); |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1709 |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1710 extern Lisp_Object Vsystem_name; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1711 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
1712 DEFUN ("w32-has-winsock", Fw32_has_winsock, Sw32_has_winsock, 0, 1, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1713 doc: /* Test for presence of the Windows socket library `winsock'. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1714 Returns non-nil if winsock support is present, nil otherwise. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1715 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1716 If the optional argument LOAD-NOW is non-nil, the winsock library is |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1717 also loaded immediately if not already loaded. If winsock is loaded, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1718 the winsock local hostname is returned (since this may be different from |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1719 the value of `system-name' and should supplant it), otherwise t is |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1720 returned to indicate winsock support is present. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1721 (Lisp_Object load_now) |
15356
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1722 { |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1723 int have_winsock; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1724 |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1725 have_winsock = init_winsock (!NILP (load_now)); |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1726 if (have_winsock) |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1727 { |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1728 if (winsock_lib != NULL) |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1729 { |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1730 /* Return new value for system-name. The best way to do this |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1731 is to call init_system_name, saving and restoring the |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1732 original value to avoid side-effects. */ |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1733 Lisp_Object orig_hostname = Vsystem_name; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1734 Lisp_Object hostname; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1735 |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1736 init_system_name (); |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1737 hostname = Vsystem_name; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1738 Vsystem_name = orig_hostname; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1739 return hostname; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1740 } |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1741 return Qt; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1742 } |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1743 return Qnil; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1744 } |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1745 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
1746 DEFUN ("w32-unload-winsock", Fw32_unload_winsock, Sw32_unload_winsock, |
15356
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1747 0, 0, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1748 doc: /* Unload the Windows socket library `winsock' if loaded. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1749 This is provided to allow dial-up socket connections to be disconnected |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1750 when no longer needed. Returns nil without unloading winsock if any |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1751 socket connections still exist. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1752 (void) |
15356
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1753 { |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1754 return term_winsock () ? Qt : Qnil; |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1755 } |
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
1756 |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
1757 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1758 /* Some miscellaneous functions that are Windows specific, but not GUI |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1759 specific (ie. are applicable in terminal or batch mode as well). */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1760 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1761 DEFUN ("w32-short-file-name", Fw32_short_file_name, Sw32_short_file_name, 1, 1, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1762 doc: /* Return the short file name version (8.3) of the full path of FILENAME. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1763 If FILENAME does not exist, return nil. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1764 All path elements in FILENAME are converted to their short names. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1765 (Lisp_Object filename) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1766 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1767 char shortname[MAX_PATH]; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1768 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
1769 CHECK_STRING (filename); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1770 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1771 /* first expand it. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1772 filename = Fexpand_file_name (filename, Qnil); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1773 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1774 /* luckily, this returns the short version of each element in the path. */ |
100045
3ec2cc2d35c1
* w32proc.c: Include "coding.h".
Juanma Barranquero <lekktu@gmail.com>
parents:
96893
diff
changeset
|
1775 if (GetShortPathName (SDATA (ENCODE_FILE (filename)), shortname, MAX_PATH) == 0) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1776 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1777 |
108888
c2ac5cece5ea
Turn `directory-sep-char' into a noop.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1778 dostounix_filename (shortname); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1779 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1780 return build_string (shortname); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1781 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1782 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1783 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1784 DEFUN ("w32-long-file-name", Fw32_long_file_name, Sw32_long_file_name, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1785 1, 1, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1786 doc: /* Return the long file name version of the full path of FILENAME. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1787 If FILENAME does not exist, return nil. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1788 All path elements in FILENAME are converted to their long names. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1789 (Lisp_Object filename) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1790 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1791 char longname[ MAX_PATH ]; |
96893
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1792 int drive_only = 0; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1793 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
1794 CHECK_STRING (filename); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1795 |
96893
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1796 if (SBYTES (filename) == 2 |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1797 && *(SDATA (filename) + 1) == ':') |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1798 drive_only = 1; |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1799 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1800 /* first expand it. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1801 filename = Fexpand_file_name (filename, Qnil); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1802 |
100045
3ec2cc2d35c1
* w32proc.c: Include "coding.h".
Juanma Barranquero <lekktu@gmail.com>
parents:
96893
diff
changeset
|
1803 if (!w32_get_long_filename (SDATA (ENCODE_FILE (filename)), longname, MAX_PATH)) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1804 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1805 |
108888
c2ac5cece5ea
Turn `directory-sep-char' into a noop.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1806 dostounix_filename (longname); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1807 |
96893
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1808 /* If we were passed only a drive, make sure that a slash is not appended |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1809 for consistency with directories. Allow for drive mapping via SUBST |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1810 in case expand-file-name is ever changed to expand those. */ |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1811 if (drive_only && longname[1] == ':' && longname[2] == '/' && !longname[3]) |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1812 longname[2] = '\0'; |
532dd6819465
(Fw32_long_file_name): Don't append dir separator to bare drive.
Jason Rumney <jasonr@gnu.org>
parents:
96376
diff
changeset
|
1813 |
100045
3ec2cc2d35c1
* w32proc.c: Include "coding.h".
Juanma Barranquero <lekktu@gmail.com>
parents:
96893
diff
changeset
|
1814 return DECODE_FILE (build_string (longname)); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1815 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1816 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1817 DEFUN ("w32-set-process-priority", Fw32_set_process_priority, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1818 Sw32_set_process_priority, 2, 2, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1819 doc: /* Set the priority of PROCESS to PRIORITY. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1820 If PROCESS is nil, the priority of Emacs is changed, otherwise the |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1821 priority of the process whose pid is PROCESS is changed. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1822 PRIORITY should be one of the symbols high, normal, or low; |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1823 any other symbol will be interpreted as normal. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1824 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1825 If successful, the return value is t, otherwise nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1826 (Lisp_Object process, Lisp_Object priority) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1827 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1828 HANDLE proc_handle = GetCurrentProcess (); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1829 DWORD priority_class = NORMAL_PRIORITY_CLASS; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1830 Lisp_Object result = Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1831 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
1832 CHECK_SYMBOL (priority); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1833 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1834 if (!NILP (process)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1835 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1836 DWORD pid; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1837 child_process *cp; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1838 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
1839 CHECK_NUMBER (process); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1840 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1841 /* Allow pid to be an internally generated one, or one obtained |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1842 externally. This is necessary because real pids on Win95 are |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1843 negative. */ |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1844 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1845 pid = XINT (process); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1846 cp = find_child_pid (pid); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1847 if (cp != NULL) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1848 pid = cp->procinfo.dwProcessId; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1849 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1850 proc_handle = OpenProcess (PROCESS_SET_INFORMATION, FALSE, pid); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1851 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1852 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1853 if (EQ (priority, Qhigh)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1854 priority_class = HIGH_PRIORITY_CLASS; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1855 else if (EQ (priority, Qlow)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1856 priority_class = IDLE_PRIORITY_CLASS; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1857 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1858 if (proc_handle != NULL) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1859 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1860 if (SetPriorityClass (proc_handle, priority_class)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1861 result = Qt; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1862 if (!NILP (process)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1863 CloseHandle (proc_handle); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1864 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1865 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1866 return result; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1867 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1868 |
73091
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1869 #ifdef HAVE_LANGINFO_CODESET |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1870 /* Emulation of nl_langinfo. Used in fns.c:Flocale_info. */ |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1871 char * |
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
1872 nl_langinfo (nl_item item) |
73091
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1873 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1874 /* Conversion of Posix item numbers to their Windows equivalents. */ |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1875 static const LCTYPE w32item[] = { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1876 LOCALE_IDEFAULTANSICODEPAGE, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1877 LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1878 LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6, LOCALE_SDAYNAME7, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1879 LOCALE_SMONTHNAME1, LOCALE_SMONTHNAME2, LOCALE_SMONTHNAME3, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1880 LOCALE_SMONTHNAME4, LOCALE_SMONTHNAME5, LOCALE_SMONTHNAME6, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1881 LOCALE_SMONTHNAME7, LOCALE_SMONTHNAME8, LOCALE_SMONTHNAME9, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1882 LOCALE_SMONTHNAME10, LOCALE_SMONTHNAME11, LOCALE_SMONTHNAME12 |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1883 }; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1884 |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1885 static char *nl_langinfo_buf = NULL; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1886 static int nl_langinfo_len = 0; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1887 |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1888 if (nl_langinfo_len <= 0) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1889 nl_langinfo_buf = xmalloc (nl_langinfo_len = 1); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1890 |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1891 if (item < 0 || item >= _NL_NUM) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1892 nl_langinfo_buf[0] = 0; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1893 else |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1894 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1895 LCID cloc = GetThreadLocale (); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1896 int need_len = GetLocaleInfo (cloc, w32item[item] | LOCALE_USE_CP_ACP, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1897 NULL, 0); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1898 |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1899 if (need_len <= 0) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1900 nl_langinfo_buf[0] = 0; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1901 else |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1902 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1903 if (item == CODESET) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1904 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1905 need_len += 2; /* for the "cp" prefix */ |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1906 if (need_len < 8) /* for the case we call GetACP */ |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1907 need_len = 8; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1908 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1909 if (nl_langinfo_len <= need_len) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1910 nl_langinfo_buf = xrealloc (nl_langinfo_buf, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1911 nl_langinfo_len = need_len); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1912 if (!GetLocaleInfo (cloc, w32item[item] | LOCALE_USE_CP_ACP, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1913 nl_langinfo_buf, nl_langinfo_len)) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1914 nl_langinfo_buf[0] = 0; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1915 else if (item == CODESET) |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1916 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1917 if (strcmp (nl_langinfo_buf, "0") == 0 /* CP_ACP */ |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1918 || strcmp (nl_langinfo_buf, "1") == 0) /* CP_OEMCP */ |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1919 sprintf (nl_langinfo_buf, "cp%u", GetACP ()); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1920 else |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1921 { |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1922 memmove (nl_langinfo_buf + 2, nl_langinfo_buf, |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1923 strlen (nl_langinfo_buf) + 1); |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1924 nl_langinfo_buf[0] = 'c'; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1925 nl_langinfo_buf[1] = 'p'; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1926 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1927 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1928 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1929 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1930 return nl_langinfo_buf; |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1931 } |
fd4e9d08fa35
(nl_langinfo): New function.
Eli Zaretskii <eliz@gnu.org>
parents:
71901
diff
changeset
|
1932 #endif /* HAVE_LANGINFO_CODESET */ |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1933 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1934 DEFUN ("w32-get-locale-info", Fw32_get_locale_info, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1935 Sw32_get_locale_info, 1, 2, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1936 doc: /* Return information about the Windows locale LCID. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1937 By default, return a three letter locale code which encodes the default |
100062
d4660dbaa550
* w32proc.c (Fw32_get_locale_info): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
100045
diff
changeset
|
1938 language as the first two characters, and the country or regional variant |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1939 as the third letter. For example, ENU refers to `English (United States)', |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1940 while ENC means `English (Canadian)'. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1941 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1942 If the optional argument LONGFORM is t, the long form of the locale |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1943 name is returned, e.g. `English (United States)' instead; if LONGFORM |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1944 is a number, it is interpreted as an LCTYPE constant and the corresponding |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1945 locale information is returned. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1946 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1947 If LCID (a 16-bit number) is not a valid locale, the result is nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1948 (Lisp_Object lcid, Lisp_Object longform) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1949 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1950 int got_abbrev; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1951 int got_full; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1952 char abbrev_name[32] = { 0 }; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1953 char full_name[256] = { 0 }; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1954 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
1955 CHECK_NUMBER (lcid); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1956 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1957 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1958 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1959 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1960 if (NILP (longform)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1961 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1962 got_abbrev = GetLocaleInfo (XINT (lcid), |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1963 LOCALE_SABBREVLANGNAME | LOCALE_USE_CP_ACP, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1964 abbrev_name, sizeof (abbrev_name)); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1965 if (got_abbrev) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1966 return build_string (abbrev_name); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1967 } |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1968 else if (EQ (longform, Qt)) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1969 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1970 got_full = GetLocaleInfo (XINT (lcid), |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1971 LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP, |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1972 full_name, sizeof (full_name)); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1973 if (got_full) |
100351
d23b1588c7c1
Move decoding of locale info from Lisp to C.
Juanma Barranquero <lekktu@gmail.com>
parents:
100062
diff
changeset
|
1974 return DECODE_SYSTEM (build_string (full_name)); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1975 } |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1976 else if (NUMBERP (longform)) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1977 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1978 got_full = GetLocaleInfo (XINT (lcid), |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1979 XINT (longform), |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1980 full_name, sizeof (full_name)); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1981 if (got_full) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1982 return make_unibyte_string (full_name, got_full); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
1983 } |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1984 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1985 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1986 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1987 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1988 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1989 DEFUN ("w32-get-current-locale-id", Fw32_get_current_locale_id, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1990 Sw32_get_current_locale_id, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1991 doc: /* Return Windows locale id for current locale setting. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1992 This is a numerical value; use `w32-get-locale-info' to convert to a |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
1993 human-readable form. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
1994 (void) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1995 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1996 return make_number (GetThreadLocale ()); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1997 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
1998 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
1999 static DWORD |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2000 int_from_hex (char * s) |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2001 { |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2002 DWORD val = 0; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2003 static char hex[] = "0123456789abcdefABCDEF"; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2004 char * p; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2005 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2006 while (*s && (p = strchr (hex, *s)) != NULL) |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2007 { |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2008 unsigned digit = p - hex; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2009 if (digit > 15) |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2010 digit -= 6; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2011 val = val * 16 + digit; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2012 s++; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2013 } |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2014 return val; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2015 } |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2016 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2017 /* We need to build a global list, since the EnumSystemLocale callback |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2018 function isn't given a context pointer. */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2019 Lisp_Object Vw32_valid_locale_ids; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2020 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
2021 static BOOL CALLBACK |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2022 enum_locale_fn (LPTSTR localeNum) |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2023 { |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2024 DWORD id = int_from_hex (localeNum); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2025 Vw32_valid_locale_ids = Fcons (make_number (id), Vw32_valid_locale_ids); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2026 return TRUE; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2027 } |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2028 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2029 DEFUN ("w32-get-valid-locale-ids", Fw32_get_valid_locale_ids, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2030 Sw32_get_valid_locale_ids, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2031 doc: /* Return list of all valid Windows locale ids. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2032 Each id is a numerical value; use `w32-get-locale-info' to convert to a |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2033 human-readable form. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2034 (void) |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2035 { |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2036 Vw32_valid_locale_ids = Qnil; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2037 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2038 EnumSystemLocales (enum_locale_fn, LCID_SUPPORTED); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2039 |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2040 Vw32_valid_locale_ids = Fnreverse (Vw32_valid_locale_ids); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2041 return Vw32_valid_locale_ids; |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2042 } |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2043 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2044 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2045 DEFUN ("w32-get-default-locale-id", Fw32_get_default_locale_id, Sw32_get_default_locale_id, 0, 1, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2046 doc: /* Return Windows locale id for default locale setting. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2047 By default, the system default locale setting is returned; if the optional |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2048 parameter USERP is non-nil, the user default locale setting is returned. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2049 This is a numerical value; use `w32-get-locale-info' to convert to a |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2050 human-readable form. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2051 (Lisp_Object userp) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2052 { |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2053 if (NILP (userp)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2054 return make_number (GetSystemDefaultLCID ()); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2055 return make_number (GetUserDefaultLCID ()); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2056 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2057 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
2058 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2059 DEFUN ("w32-set-current-locale", Fw32_set_current_locale, Sw32_set_current_locale, 1, 1, 0, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2060 doc: /* Make Windows locale LCID be the current locale setting for Emacs. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2061 If successful, the new locale id is returned, otherwise nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2062 (Lisp_Object lcid) |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2063 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
2064 CHECK_NUMBER (lcid); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2065 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2066 if (!IsValidLocale (XINT (lcid), LCID_SUPPORTED)) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2067 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2068 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2069 if (!SetThreadLocale (XINT (lcid))) |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2070 return Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2071 |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2072 /* Need to set input thread locale if present. */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2073 if (dwWindowsThreadId) |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2074 /* Reply is not needed. */ |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2075 PostThreadMessage (dwWindowsThreadId, WM_EMACS_SETLOCALE, XINT (lcid), 0); |
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2076 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2077 return make_number (GetThreadLocale ()); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2078 } |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2079 |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2080 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2081 /* We need to build a global list, since the EnumCodePages callback |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2082 function isn't given a context pointer. */ |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2083 Lisp_Object Vw32_valid_codepages; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2084 |
110975
e0ac9a58795e
src/w32*.c: Make functions static.
Juanma Barranquero <lekktu@gmail.com>
parents:
110431
diff
changeset
|
2085 static BOOL CALLBACK |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2086 enum_codepage_fn (LPTSTR codepageNum) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2087 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2088 DWORD id = atoi (codepageNum); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2089 Vw32_valid_codepages = Fcons (make_number (id), Vw32_valid_codepages); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2090 return TRUE; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2091 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2092 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2093 DEFUN ("w32-get-valid-codepages", Fw32_get_valid_codepages, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2094 Sw32_get_valid_codepages, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2095 doc: /* Return list of all valid Windows codepages. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2096 (void) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2097 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2098 Vw32_valid_codepages = Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2099 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2100 EnumSystemCodePages (enum_codepage_fn, CP_SUPPORTED); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2101 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2102 Vw32_valid_codepages = Fnreverse (Vw32_valid_codepages); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2103 return Vw32_valid_codepages; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2104 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2105 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2106 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2107 DEFUN ("w32-get-console-codepage", Fw32_get_console_codepage, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2108 Sw32_get_console_codepage, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2109 doc: /* Return current Windows codepage for console input. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2110 (void) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2111 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2112 return make_number (GetConsoleCP ()); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2113 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2114 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
2115 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2116 DEFUN ("w32-set-console-codepage", Fw32_set_console_codepage, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2117 Sw32_set_console_codepage, 1, 1, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2118 doc: /* Make Windows codepage CP be the current codepage setting for Emacs. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2119 The codepage setting affects keyboard input and display in tty mode. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2120 If successful, the new CP is returned, otherwise nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2121 (Lisp_Object cp) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2122 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
2123 CHECK_NUMBER (cp); |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2124 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2125 if (!IsValidCodePage (XINT (cp))) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2126 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2127 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2128 if (!SetConsoleCP (XINT (cp))) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2129 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2130 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2131 return make_number (GetConsoleCP ()); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2132 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2133 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2134 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2135 DEFUN ("w32-get-console-output-codepage", Fw32_get_console_output_codepage, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2136 Sw32_get_console_output_codepage, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2137 doc: /* Return current Windows codepage for console output. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2138 (void) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2139 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2140 return make_number (GetConsoleOutputCP ()); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2141 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2142 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
2143 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2144 DEFUN ("w32-set-console-output-codepage", Fw32_set_console_output_codepage, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2145 Sw32_set_console_output_codepage, 1, 1, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2146 doc: /* Make Windows codepage CP be the current codepage setting for Emacs. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2147 The codepage setting affects keyboard input and display in tty mode. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2148 If successful, the new CP is returned, otherwise nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2149 (Lisp_Object cp) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2150 { |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
2151 CHECK_NUMBER (cp); |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2152 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2153 if (!IsValidCodePage (XINT (cp))) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2154 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2155 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2156 if (!SetConsoleOutputCP (XINT (cp))) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2157 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2158 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2159 return make_number (GetConsoleOutputCP ()); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2160 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2161 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2162 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2163 DEFUN ("w32-get-codepage-charset", Fw32_get_codepage_charset, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2164 Sw32_get_codepage_charset, 1, 1, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2165 doc: /* Return charset of codepage CP. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2166 Returns nil if the codepage is not valid. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2167 (Lisp_Object cp) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2168 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2169 CHARSETINFO info; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2170 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
2171 CHECK_NUMBER (cp); |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2172 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2173 if (!IsValidCodePage (XINT (cp))) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2174 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2175 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2176 if (TranslateCharsetInfo ((DWORD *) XINT (cp), &info, TCI_SRCCODEPAGE)) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2177 return make_number (info.ciCharset); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2178 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2179 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2180 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2181 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2182 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2183 DEFUN ("w32-get-valid-keyboard-layouts", Fw32_get_valid_keyboard_layouts, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2184 Sw32_get_valid_keyboard_layouts, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2185 doc: /* Return list of Windows keyboard languages and layouts. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2186 The return value is a list of pairs of language id and layout id. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2187 (void) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2188 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2189 int num_layouts = GetKeyboardLayoutList (0, NULL); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2190 HKL * layouts = (HKL *) alloca (num_layouts * sizeof (HKL)); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2191 Lisp_Object obj = Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2192 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2193 if (GetKeyboardLayoutList (num_layouts, layouts) == num_layouts) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2194 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2195 while (--num_layouts >= 0) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2196 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2197 DWORD kl = (DWORD) layouts[num_layouts]; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2198 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2199 obj = Fcons (Fcons (make_number (kl & 0xffff), |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2200 make_number ((kl >> 16) & 0xffff)), |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2201 obj); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2202 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2203 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2204 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2205 return obj; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2206 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2207 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2208 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2209 DEFUN ("w32-get-keyboard-layout", Fw32_get_keyboard_layout, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2210 Sw32_get_keyboard_layout, 0, 0, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2211 doc: /* Return current Windows keyboard language and layout. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2212 The return value is the cons of the language id and the layout id. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2213 (void) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2214 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2215 DWORD kl = (DWORD) GetKeyboardLayout (dwWindowsThreadId); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2216 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2217 return Fcons (make_number (kl & 0xffff), |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2218 make_number ((kl >> 16) & 0xffff)); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2219 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2220 |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
2221 |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2222 DEFUN ("w32-set-keyboard-layout", Fw32_set_keyboard_layout, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2223 Sw32_set_keyboard_layout, 1, 1, 0, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2224 doc: /* Make LAYOUT be the current keyboard layout for Emacs. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2225 The keyboard layout setting affects interpretation of keyboard input. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2226 If successful, the new layout id is returned, otherwise nil. */) |
109179
8cfee7d2955f
Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109160
diff
changeset
|
2227 (Lisp_Object layout) |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2228 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2229 DWORD kl; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2230 |
40656
cdfd4d09b79a
Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents:
39812
diff
changeset
|
2231 CHECK_CONS (layout); |
40752
8b5deb3bca03
(Fw32_set_keyboard_layout): Use CHECK_NUMBER_CAR and
Andrew Innes <andrewi@gnu.org>
parents:
40656
diff
changeset
|
2232 CHECK_NUMBER_CAR (layout); |
8b5deb3bca03
(Fw32_set_keyboard_layout): Use CHECK_NUMBER_CAR and
Andrew Innes <andrewi@gnu.org>
parents:
40656
diff
changeset
|
2233 CHECK_NUMBER_CDR (layout); |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2234 |
25646
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
24915
diff
changeset
|
2235 kl = (XINT (XCAR (layout)) & 0xffff) |
9154af188477
Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents:
24915
diff
changeset
|
2236 | (XINT (XCDR (layout)) << 16); |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2237 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2238 /* Synchronize layout with input thread. */ |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2239 if (dwWindowsThreadId) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2240 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2241 if (PostThreadMessage (dwWindowsThreadId, WM_EMACS_SETKEYBOARDLAYOUT, |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2242 (WPARAM) kl, 0)) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2243 { |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2244 MSG msg; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2245 GetMessage (&msg, NULL, WM_EMACS_DONE, WM_EMACS_DONE); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2246 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2247 if (msg.wParam == 0) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2248 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2249 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2250 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2251 else if (!ActivateKeyboardLayout ((HKL) kl, 0)) |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2252 return Qnil; |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2253 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2254 return Fw32_get_keyboard_layout (); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2255 } |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2256 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2257 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
2258 void |
109152
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
108888
diff
changeset
|
2259 syms_of_ntproc (void) |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
2260 { |
90921
47c076d206e6
(syms_of_ntproc): Use DEFSYM macro.
Jason Rumney <jasonr@gnu.org>
parents:
90737
diff
changeset
|
2261 DEFSYM (Qhigh, "high"); |
47c076d206e6
(syms_of_ntproc): Use DEFSYM macro.
Jason Rumney <jasonr@gnu.org>
parents:
90737
diff
changeset
|
2262 DEFSYM (Qlow, "low"); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2263 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2264 defsubr (&Sw32_has_winsock); |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2265 defsubr (&Sw32_unload_winsock); |
110431
9fe8167bbd9b
Don't make W32 code conditional on HAVE_SOCKETS, it's always defined.
Juanma Barranquero <lekktu@gmail.com>
parents:
109179
diff
changeset
|
2266 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2267 defsubr (&Sw32_short_file_name); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2268 defsubr (&Sw32_long_file_name); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2269 defsubr (&Sw32_set_process_priority); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2270 defsubr (&Sw32_get_locale_info); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2271 defsubr (&Sw32_get_current_locale_id); |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2272 defsubr (&Sw32_get_default_locale_id); |
21613
fe4f5bfae371
(w32_executable_type): Properly cast dos_header when
Geoff Voelker <voelker@cs.washington.edu>
parents:
21452
diff
changeset
|
2273 defsubr (&Sw32_get_valid_locale_ids); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2274 defsubr (&Sw32_set_current_locale); |
15356
1a917c5d944c
(Fwin32_has_winsock, Fwin32_unload_winsock) [HAVE_SOCKETS]: New functions.
Richard M. Stallman <rms@gnu.org>
parents:
15351
diff
changeset
|
2275 |
23678
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2276 defsubr (&Sw32_get_console_codepage); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2277 defsubr (&Sw32_set_console_codepage); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2278 defsubr (&Sw32_get_console_output_codepage); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2279 defsubr (&Sw32_set_console_output_codepage); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2280 defsubr (&Sw32_get_valid_codepages); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2281 defsubr (&Sw32_get_codepage_charset); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2282 |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2283 defsubr (&Sw32_get_valid_keyboard_layouts); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2284 defsubr (&Sw32_get_keyboard_layout); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2285 defsubr (&Sw32_set_keyboard_layout); |
b2480e274f42
(sys_kill): Set extended key flag when faking
Geoff Voelker <voelker@cs.washington.edu>
parents:
22298
diff
changeset
|
2286 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2287 DEFVAR_LISP ("w32-quote-process-args", &Vw32_quote_process_args, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2288 doc: /* Non-nil enables quoting of process arguments to ensure correct parsing. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2289 Because Windows does not directly pass argv arrays to child processes, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2290 programs have to reconstruct the argv array by parsing the command |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2291 line string. For an argument to contain a space, it must be enclosed |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2292 in double quotes or it will be parsed as multiple arguments. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2293 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2294 If the value is a character, that character will be used to escape any |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2295 quote characters that appear, otherwise a suitable escape character |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2296 will be chosen based on the type of the program. */); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2297 Vw32_quote_process_args = Qt; |
15247
874a66251747
(Vwin32_pipe_read_delay): New var.
Karl Heuer <kwzh@gnu.org>
parents:
15201
diff
changeset
|
2298 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2299 DEFVAR_LISP ("w32-start-process-show-window", |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2300 &Vw32_start_process_show_window, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2301 doc: /* When nil, new child processes hide their windows. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2302 When non-nil, they show their window in the method of their choice. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2303 This variable doesn't affect GUI applications, which will never be hidden. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2304 Vw32_start_process_show_window = Qnil; |
16000
b5ecd5022991
(Vwin32_start_process_show_window): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15419
diff
changeset
|
2305 |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2306 DEFVAR_LISP ("w32-start-process-share-console", |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2307 &Vw32_start_process_share_console, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2308 doc: /* When nil, new child processes are given a new console. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2309 When non-nil, they share the Emacs console; this has the limitation of |
43548
c185eb97b9ee
(syms_of_ntproc): Doc fix.
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
2310 allowing only one DOS subprocess to run at a time (whether started directly |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2311 or indirectly by Emacs), and preventing Emacs from cleanly terminating the |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2312 subprocess group, but may allow Emacs to interrupt a subprocess that doesn't |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2313 otherwise respond to interrupts from Emacs. */); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2314 Vw32_start_process_share_console = Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2315 |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
2316 DEFVAR_LISP ("w32-start-process-inherit-error-mode", |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
2317 &Vw32_start_process_inherit_error_mode, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2318 doc: /* When nil, new child processes revert to the default error mode. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2319 When non-nil, they inherit their error mode setting from Emacs, which stops |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2320 them blocking when trying to access unmounted drives etc. */); |
23949
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
2321 Vw32_start_process_inherit_error_mode = Qt; |
9f8417cca07b
(Vw32_start_process_inherit_error_mode): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
23678
diff
changeset
|
2322 |
55642
d69e0fb91340
* w32proc.c (w32_pipe_read_delay): Rename from Vw32_pipe_read_delay
Jason Rumney <jasonr@gnu.org>
parents:
52401
diff
changeset
|
2323 DEFVAR_INT ("w32-pipe-read-delay", &w32_pipe_read_delay, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2324 doc: /* Forced delay before reading subprocess output. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2325 This is done to improve the buffering of subprocess output, by |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2326 avoiding the inefficiency of frequently reading small amounts of data. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2327 |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2328 If positive, the value is the number of milliseconds to sleep before |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2329 reading the subprocess output. If negative, the magnitude is the number |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2330 of time slices to wait (effectively boosting the priority of the child |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2331 process temporarily). A value of zero disables waiting entirely. */); |
55642
d69e0fb91340
* w32proc.c (w32_pipe_read_delay): Rename from Vw32_pipe_read_delay
Jason Rumney <jasonr@gnu.org>
parents:
52401
diff
changeset
|
2332 w32_pipe_read_delay = 50; |
15325
5c8e4ef3137c
(Vwin32_downcase_file_names): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15247
diff
changeset
|
2333 |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2334 DEFVAR_LISP ("w32-downcase-file-names", &Vw32_downcase_file_names, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2335 doc: /* Non-nil means convert all-upper case file names to lower case. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2336 This applies when performing completions and file name expansion. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2337 Note that the value of this setting also affects remote file names, |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2338 so you probably don't want to set to non-nil if you use case-sensitive |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
46750
diff
changeset
|
2339 filesystems via ange-ftp. */); |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16000
diff
changeset
|
2340 Vw32_downcase_file_names = Qnil; |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2341 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2342 #if 0 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2343 DEFVAR_LISP ("w32-generate-fake-inodes", &Vw32_generate_fake_inodes, |
40962
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2344 doc: /* Non-nil means attempt to fake realistic inode values. |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2345 This works by hashing the truename of files, and should detect |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2346 aliasing between long and short (8.3 DOS) names, but can have |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2347 false positives because of hash collisions. Note that determing |
f66d09d1bb2f
Change doc-string comments to `new style'. [w/`doc:' keyword]. Doc fixes.
Jason Rumney <jasonr@gnu.org>
parents:
40752
diff
changeset
|
2348 the truename of a file can be slow. */); |
19712
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2349 Vw32_generate_fake_inodes = Qnil; |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2350 #endif |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2351 |
9a6e50f6b471
Include w32heap.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
2352 DEFVAR_LISP ("w32-get-true-file-attributes", &Vw32_get_true_file_attributes, |
94839
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2353 doc: /* Non-nil means determine accurate file attributes in `file-attributes'. |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2354 This option controls whether to issue additional system calls to determine |
103813
c7da7466b614
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
100951
diff
changeset
|
2355 accurate link counts, file type, and ownership information. It is more |
94839
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2356 useful for files on NTFS volumes, where hard links and file security are |
103813
c7da7466b614
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
100951
diff
changeset
|
2357 supported, than on volumes of the FAT family. |
94839
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2358 |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2359 Without these system calls, link count will always be reported as 1 and file |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2360 ownership will be attributed to the current user. |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2361 The default value `local' means only issue these system calls for files |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2362 on local fixed drives. A value of nil means never issue them. |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2363 Any other non-nil value means do this even on remote and removable drives |
f82e9e80393e
(syms_of_ntproc) <w32-get-true-file-attributes>: Doc fix.
Eli Zaretskii <eliz@gnu.org>
parents:
94293
diff
changeset
|
2364 where the performance impact may be noticeable even on modern hardware. */); |
80485
f1f27e9c15d7
(syms_of_ntproc): Change Vw32_get_true_file attributes
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
2365 Vw32_get_true_file_attributes = Qlocal; |
64363
71c7519df9b7
(syms_of_ntproc): staticpro Qhigh, Qlow,
Eli Zaretskii <eliz@gnu.org>
parents:
64084
diff
changeset
|
2366 |
71c7519df9b7
(syms_of_ntproc): staticpro Qhigh, Qlow,
Eli Zaretskii <eliz@gnu.org>
parents:
64084
diff
changeset
|
2367 staticpro (&Vw32_valid_locale_ids); |
71c7519df9b7
(syms_of_ntproc): staticpro Qhigh, Qlow,
Eli Zaretskii <eliz@gnu.org>
parents:
64084
diff
changeset
|
2368 staticpro (&Vw32_valid_codepages); |
15201
43551ec4b69d
(Vwin32_quote_process_args): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15145
diff
changeset
|
2369 } |
111551
3207606734d5
Remove config.h include guards.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
110997
diff
changeset
|
2370 /* end of w32proc.c */ |
52401 | 2371 |