Mercurial > emacs
annotate nt/cmdproxy.c @ 109085:6a23dfd2048b
* startup.el (command-line): Don't call tool-bar-setup in a tty-only build.
author | Andreas Schwab <schwab@linux-m68k.org> |
---|---|
date | Thu, 01 Jul 2010 00:58:19 +0200 |
parents | 1d1d5d9bd884 |
children | d12162869c07 b09078962d7c |
rev | line source |
---|---|
19236 | 1 /* Proxy shell designed for use with Emacs on Windows 95 and NT. |
94795
188974bfdea0
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79730
diff
changeset
|
2 Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 3 2008, 2009, 2010 Free Software Foundation, Inc. |
19236 | 4 |
96460 | 5 Accepts subset of Unix sh(1) command-line options, for compatibility |
19236 | 6 with elisp code written for Unix. When possible, executes external |
7 programs directly (a common use of /bin/sh by Emacs), otherwise | |
8 invokes the user-specified command processor to handle built-in shell | |
9 commands, batch files and interactive mode. | |
10 | |
11 The main function is simply to process the "-c string" option in the | |
12 way /bin/sh does, since the standard Windows command shells use the | |
13 convention that everything after "/c" (the Windows equivalent of | |
14 "-c") is the input string. | |
15 | |
16 This file is part of GNU Emacs. | |
17 | |
94795
188974bfdea0
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79730
diff
changeset
|
18 GNU Emacs is free software: you can redistribute it and/or modify |
19236 | 19 it under the terms of the GNU General Public License as published by |
94795
188974bfdea0
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79730
diff
changeset
|
20 the Free Software Foundation, either version 3 of the License, or |
188974bfdea0
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79730
diff
changeset
|
21 (at your option) any later version. |
19236 | 22 |
23 GNU Emacs is distributed in the hope that it will be useful, | |
24 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
26 GNU General Public License for more details. | |
27 | |
28 You should have received a copy of the GNU General Public License | |
94795
188974bfdea0
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79730
diff
changeset
|
29 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
19236 | 30 |
31 #include <windows.h> | |
32 | |
33 #include <stdarg.h> /* va_args */ | |
34 #include <malloc.h> /* alloca */ | |
35 #include <stdlib.h> /* getenv */ | |
36 #include <string.h> /* strlen */ | |
37 | |
38 | |
39 /******* Mock C library routines *********************************/ | |
40 | |
41 /* These routines are used primarily to minimize the executable size. */ | |
42 | |
43 #define stdin GetStdHandle (STD_INPUT_HANDLE) | |
44 #define stdout GetStdHandle (STD_OUTPUT_HANDLE) | |
45 #define stderr GetStdHandle (STD_ERROR_HANDLE) | |
46 | |
47 int | |
48 vfprintf(HANDLE hnd, char * msg, va_list args) | |
49 { | |
50 DWORD bytes_written; | |
51 char buf[1024]; | |
52 | |
53 wvsprintf (buf, msg, args); | |
54 return WriteFile (hnd, buf, strlen (buf), &bytes_written, NULL); | |
55 } | |
56 | |
57 int | |
58 fprintf(HANDLE hnd, char * msg, ...) | |
59 { | |
60 va_list args; | |
61 int rc; | |
62 | |
63 va_start (args, msg); | |
64 rc = vfprintf (hnd, msg, args); | |
65 va_end (args); | |
66 | |
67 return rc; | |
68 } | |
69 | |
70 int | |
71 printf(char * msg, ...) | |
72 { | |
73 va_list args; | |
74 int rc; | |
75 | |
76 va_start (args, msg); | |
77 rc = vfprintf (stdout, msg, args); | |
78 va_end (args); | |
79 | |
80 return rc; | |
81 } | |
82 | |
83 void | |
84 fail (char * msg, ...) | |
85 { | |
86 va_list args; | |
87 | |
88 va_start (args, msg); | |
89 vfprintf (stderr, msg, args); | |
90 va_end (args); | |
91 | |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
92 exit (-1); |
19236 | 93 } |
94 | |
95 void | |
96 warn (char * msg, ...) | |
97 { | |
98 va_list args; | |
99 | |
100 va_start (args, msg); | |
101 vfprintf (stderr, msg, args); | |
102 va_end (args); | |
103 } | |
104 | |
105 /******************************************************************/ | |
106 | |
107 char * | |
108 canon_filename (char *fname) | |
109 { | |
110 char *p = fname; | |
111 | |
112 while (*p) | |
113 { | |
114 if (*p == '/') | |
115 *p = '\\'; | |
116 p++; | |
117 } | |
118 | |
119 return fname; | |
120 } | |
121 | |
122 char * | |
123 skip_space (char *str) | |
124 { | |
125 while (isspace (*str)) str++; | |
126 return str; | |
127 } | |
128 | |
129 char * | |
130 skip_nonspace (char *str) | |
131 { | |
132 while (*str && !isspace (*str)) str++; | |
133 return str; | |
134 } | |
135 | |
136 int escape_char = '\\'; | |
137 | |
138 /* Get next token from input, advancing pointer. */ | |
139 int | |
140 get_next_token (char * buf, char ** pSrc) | |
141 { | |
142 char * p = *pSrc; | |
143 char * o = buf; | |
144 | |
145 p = skip_space (p); | |
146 if (*p == '"') | |
147 { | |
148 int escape_char_run = 0; | |
149 | |
150 /* Go through src until an ending quote is found, unescaping | |
151 quotes along the way. If the escape char is not quote, then do | |
152 special handling of multiple escape chars preceding a quote | |
153 char (ie. the reverse of what Emacs does to escape quotes). */ | |
154 p++; | |
155 while (1) | |
156 { | |
157 if (p[0] == escape_char && escape_char != '"') | |
158 { | |
159 escape_char_run++; | |
36858
f6aff87320dd
(get_next_token): Fix indefinite loop bug scanning
Andrew Innes <andrewi@gnu.org>
parents:
24555
diff
changeset
|
160 p++; |
19236 | 161 continue; |
162 } | |
163 else if (p[0] == '"') | |
164 { | |
165 while (escape_char_run > 1) | |
166 { | |
167 *o++ = escape_char; | |
168 escape_char_run -= 2; | |
169 } | |
170 | |
171 if (escape_char_run > 0) | |
172 { | |
173 /* escaped quote */ | |
174 *o++ = *p++; | |
175 escape_char_run = 0; | |
176 } | |
177 else if (p[1] == escape_char && escape_char == '"') | |
178 { | |
179 /* quote escaped by doubling */ | |
180 *o++ = *p; | |
181 p += 2; | |
182 } | |
183 else | |
184 { | |
185 /* The ending quote. */ | |
186 *o = '\0'; | |
187 /* Leave input pointer after token. */ | |
188 p++; | |
189 break; | |
190 } | |
191 } | |
192 else if (p[0] == '\0') | |
193 { | |
194 /* End of string, but no ending quote found. We might want to | |
195 flag this as an error, but for now will consider the end as | |
196 the end of the token. */ | |
197 *o = '\0'; | |
198 break; | |
199 } | |
200 else | |
201 { | |
202 *o++ = *p++; | |
203 } | |
204 } | |
205 } | |
206 else | |
207 { | |
208 /* Next token is delimited by whitespace. */ | |
209 char * p1 = skip_nonspace (p); | |
210 memcpy (o, p, p1 - p); | |
211 o += (p1 - p); | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
212 *o = '\0'; |
19236 | 213 p = p1; |
214 } | |
215 | |
216 *pSrc = p; | |
217 | |
218 return o - buf; | |
219 } | |
220 | |
221 /* Search for EXEC file in DIR. If EXEC does not have an extension, | |
222 DIR is searched for EXEC with the standard extensions appended. */ | |
223 int | |
224 search_dir (char *dir, char *exec, int bufsize, char *buffer) | |
225 { | |
226 char *exts[] = {".bat", ".cmd", ".exe", ".com"}; | |
227 int n_exts = sizeof (exts) / sizeof (char *); | |
228 char *dummy; | |
229 int i, rc; | |
230 | |
231 /* Search the directory for the program. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
232 for (i = 0; i < n_exts; i++) |
19236 | 233 { |
234 rc = SearchPath (dir, exec, exts[i], bufsize, buffer, &dummy); | |
235 if (rc > 0) | |
236 return rc; | |
237 } | |
238 | |
239 return 0; | |
240 } | |
241 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
242 /* Return the absolute name of executable file PROG, including |
19236 | 243 any file extensions. If an absolute name for PROG cannot be found, |
244 return NULL. */ | |
245 char * | |
246 make_absolute (char *prog) | |
247 { | |
248 char absname[MAX_PATH]; | |
249 char dir[MAX_PATH]; | |
250 char curdir[MAX_PATH]; | |
251 char *p, *fname; | |
252 char *path; | |
253 int i; | |
254 | |
255 /* At least partial absolute path specified; search there. */ | |
256 if ((isalpha (prog[0]) && prog[1] == ':') || | |
257 (prog[0] == '\\')) | |
258 { | |
259 /* Split the directory from the filename. */ | |
260 fname = strrchr (prog, '\\'); | |
261 if (!fname) | |
262 /* Only a drive specifier is given. */ | |
263 fname = prog + 2; | |
264 strncpy (dir, prog, fname - prog); | |
265 dir[fname - prog] = '\0'; | |
266 | |
267 /* Search the directory for the program. */ | |
268 if (search_dir (dir, prog, MAX_PATH, absname) > 0) | |
269 return strdup (absname); | |
270 else | |
271 return NULL; | |
272 } | |
273 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
274 if (GetCurrentDirectory (MAX_PATH, curdir) <= 0) |
19236 | 275 return NULL; |
276 | |
277 /* Relative path; search in current dir. */ | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
278 if (strpbrk (prog, "\\")) |
19236 | 279 { |
280 if (search_dir (curdir, prog, MAX_PATH, absname) > 0) | |
281 return strdup (absname); | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
282 else |
19236 | 283 return NULL; |
284 } | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
285 |
19236 | 286 /* Just filename; search current directory then PATH. */ |
287 path = alloca (strlen (getenv ("PATH")) + strlen (curdir) + 2); | |
288 strcpy (path, curdir); | |
289 strcat (path, ";"); | |
290 strcat (path, getenv ("PATH")); | |
291 | |
292 while (*path) | |
293 { | |
294 /* Get next directory from path. */ | |
295 p = path; | |
296 while (*p && *p != ';') p++; | |
297 strncpy (dir, path, p - path); | |
298 dir[p - path] = '\0'; | |
299 | |
300 /* Search the directory for the program. */ | |
301 if (search_dir (dir, prog, MAX_PATH, absname) > 0) | |
302 return strdup (absname); | |
303 | |
304 /* Move to the next directory. */ | |
305 path = p + 1; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
306 } |
19236 | 307 |
308 return NULL; | |
309 } | |
310 | |
311 /*****************************************************************/ | |
312 | |
313 #if 0 | |
314 char ** _argv; | |
315 int _argc; | |
316 | |
317 /* Parse commandline into argv array, allowing proper quoting of args. */ | |
318 void | |
319 setup_argv (void) | |
320 { | |
321 char * cmdline = GetCommandLine (); | |
322 int arg_bytes = 0; | |
323 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
324 |
19236 | 325 } |
326 #endif | |
327 | |
328 /* Information about child proc is global, to allow for automatic | |
329 termination when interrupted. At the moment, only one child process | |
330 can be running at any one time. */ | |
331 | |
332 PROCESS_INFORMATION child; | |
333 int interactive = TRUE; | |
334 | |
335 BOOL | |
336 console_event_handler (DWORD event) | |
337 { | |
338 switch (event) | |
339 { | |
340 case CTRL_C_EVENT: | |
341 case CTRL_BREAK_EVENT: | |
342 if (!interactive) | |
343 { | |
96376
c3309dba6542
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
94795
diff
changeset
|
344 /* Both command.com and cmd.exe have the annoying behavior of |
19236 | 345 prompting "Terminate batch job (y/n)?" when interrupted |
346 while running a batch file, even if running in | |
347 non-interactive (-c) mode. Try to make up for this | |
348 deficiency by forcibly terminating the subprocess if | |
349 running non-interactively. */ | |
350 if (child.hProcess && | |
351 WaitForSingleObject (child.hProcess, 500) != WAIT_OBJECT_0) | |
352 TerminateProcess (child.hProcess, 0); | |
353 exit (STATUS_CONTROL_C_EXIT); | |
354 } | |
355 break; | |
356 | |
357 #if 0 | |
358 default: | |
359 /* CLOSE, LOGOFF and SHUTDOWN events - actually we don't get these | |
360 under Windows 95. */ | |
361 fail ("cmdproxy: received %d event\n", event); | |
362 if (child.hProcess) | |
363 TerminateProcess (child.hProcess, 0); | |
364 #endif | |
365 } | |
366 return TRUE; | |
367 } | |
368 | |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
369 /* Change from normal usage; return value indicates whether spawn |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
370 succeeded or failed - program return code is returned separately. */ |
19236 | 371 int |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
372 spawn (char * progname, char * cmdline, char * dir, int * retcode) |
19236 | 373 { |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
374 BOOL success = FALSE; |
19236 | 375 SECURITY_ATTRIBUTES sec_attrs; |
376 STARTUPINFO start; | |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
377 /* In theory, passing NULL for the environment block to CreateProcess |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
378 is the same as passing the value of GetEnvironmentStrings, but |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
379 doing this explicitly seems to cure problems running DOS programs |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
380 in some cases. */ |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
381 char * envblock = GetEnvironmentStrings (); |
19236 | 382 |
383 sec_attrs.nLength = sizeof (sec_attrs); | |
384 sec_attrs.lpSecurityDescriptor = NULL; | |
385 sec_attrs.bInheritHandle = FALSE; | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
36858
diff
changeset
|
386 |
19236 | 387 memset (&start, 0, sizeof (start)); |
388 start.cb = sizeof (start); | |
389 | |
390 if (CreateProcess (progname, cmdline, &sec_attrs, NULL, TRUE, | |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
391 0, envblock, dir, &start, &child)) |
19236 | 392 { |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
393 success = TRUE; |
19236 | 394 /* wait for completion and pass on return code */ |
395 WaitForSingleObject (child.hProcess, INFINITE); | |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
396 if (retcode) |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
397 GetExitCodeProcess (child.hProcess, (DWORD *)retcode); |
19236 | 398 CloseHandle (child.hThread); |
399 CloseHandle (child.hProcess); | |
400 child.hProcess = NULL; | |
401 } | |
402 | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
403 FreeEnvironmentStrings (envblock); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
404 |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
405 return success; |
19236 | 406 } |
407 | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
408 /* Return size of current environment block. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
409 int |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
410 get_env_size () |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
411 { |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
412 char * start = GetEnvironmentStrings (); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
413 char * tmp = start; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
414 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
415 while (tmp[0] || tmp[1]) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
416 ++tmp; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
417 FreeEnvironmentStrings (start); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
418 return tmp + 2 - start; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
419 } |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
420 |
19236 | 421 /******* Main program ********************************************/ |
422 | |
423 int | |
424 main (int argc, char ** argv) | |
425 { | |
426 int rc; | |
427 int need_shell; | |
428 char * cmdline; | |
429 char * progname; | |
430 int envsize; | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
431 char **pass_through_args; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
432 int num_pass_through_args; |
19236 | 433 char modname[MAX_PATH]; |
434 char path[MAX_PATH]; | |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
435 char dir[MAX_PATH]; |
19236 | 436 |
437 | |
438 interactive = TRUE; | |
439 | |
440 SetConsoleCtrlHandler ((PHANDLER_ROUTINE) console_event_handler, TRUE); | |
441 | |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
442 if (!GetCurrentDirectory (sizeof (dir), dir)) |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
443 fail ("error: GetCurrentDirectory failed\n"); |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
444 |
19236 | 445 /* We serve double duty: we can be called either as a proxy for the |
446 real shell (that is, because we are defined to be the user shell), | |
447 or in our role as a helper application for running DOS programs. | |
448 In the former case, we interpret the command line options as if we | |
449 were a Unix shell, but in the latter case we simply pass our | |
450 command line to CreateProcess. We know which case we are dealing | |
451 with by whether argv[0] refers to ourself or to some other program. | |
452 (This relies on an arcane feature of CreateProcess, where we can | |
453 specify cmdproxy as the module to run, but specify a different | |
454 program in the command line - the MSVC startup code sets argv[0] | |
455 from the command line.) */ | |
456 | |
457 if (!GetModuleFileName (NULL, modname, sizeof (modname))) | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
458 fail ("error: GetModuleFileName failed\n"); |
19236 | 459 |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
460 /* Change directory to location of .exe so startup directory can be |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
461 deleted. */ |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
462 progname = strrchr (modname, '\\'); |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
463 *progname = '\0'; |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
464 SetCurrentDirectory (modname); |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
465 *progname = '\\'; |
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
466 |
78049
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
467 /* Due to problems with interaction between API functions that use "OEM" |
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
468 codepage vs API functions that use the "ANSI" codepage, we need to |
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
469 make things consistent by choosing one and sticking with it. */ |
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
470 SetConsoleCP (GetACP()); |
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
471 SetConsoleOutputCP (GetACP()); |
732fd38363dd
(main): Set console codepages to "ANSI".
Jason Rumney <jasonr@gnu.org>
parents:
75249
diff
changeset
|
472 |
19236 | 473 /* Although Emacs always sets argv[0] to an absolute pathname, we |
474 might get run in other ways as well, so convert argv[0] to an | |
24516
d519b387b8a9
(main): Call GetShortPathName to normalize program
Andrew Innes <andrewi@gnu.org>
parents:
24439
diff
changeset
|
475 absolute name before comparing to the module name. Don't get |
d519b387b8a9
(main): Call GetShortPathName to normalize program
Andrew Innes <andrewi@gnu.org>
parents:
24439
diff
changeset
|
476 caught out by mixed short and long names. */ |
d519b387b8a9
(main): Call GetShortPathName to normalize program
Andrew Innes <andrewi@gnu.org>
parents:
24439
diff
changeset
|
477 GetShortPathName (modname, modname, sizeof (modname)); |
d519b387b8a9
(main): Call GetShortPathName to normalize program
Andrew Innes <andrewi@gnu.org>
parents:
24439
diff
changeset
|
478 path[0] = '\0'; |
19236 | 479 if (!SearchPath (NULL, argv[0], ".exe", sizeof (path), path, &progname) |
24516
d519b387b8a9
(main): Call GetShortPathName to normalize program
Andrew Innes <andrewi@gnu.org>
parents:
24439
diff
changeset
|
480 || !GetShortPathName (path, path, sizeof (path)) |
19236 | 481 || stricmp (modname, path) != 0) |
482 { | |
483 /* We are being used as a helper to run a DOS app; just pass | |
484 command line to DOS app without change. */ | |
485 /* TODO: fill in progname. */ | |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
486 if (spawn (NULL, GetCommandLine (), dir, &rc)) |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
487 return rc; |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
488 fail ("Could not run %s\n", GetCommandLine ()); |
19236 | 489 } |
490 | |
491 /* Process command line. If running interactively (-c or /c not | |
492 specified) then spawn a real command shell, passing it the command | |
493 line arguments. | |
494 | |
495 If not running interactively, then attempt to execute the specified | |
496 command directly. If necessary, spawn a real shell to execute the | |
497 command. | |
498 | |
499 */ | |
500 | |
501 progname = NULL; | |
502 cmdline = NULL; | |
503 /* If no args, spawn real shell for interactive use. */ | |
504 need_shell = TRUE; | |
505 interactive = TRUE; | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
506 /* Ask command.com to create an environment block with a reasonable |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
507 amount of free space. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
508 envsize = get_env_size () + 300; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
509 pass_through_args = (char **) alloca (argc * sizeof(char *)); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
510 num_pass_through_args = 0; |
19236 | 511 |
512 while (--argc > 0) | |
513 { | |
514 ++argv; | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
515 /* Act on switches we recognize (mostly single letter switches, |
96460 | 516 except for -e); all unrecognized switches and extra args are |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
517 passed on to real shell if used (only really of benefit for |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
518 interactive use, but allow for batch use as well). Accept / as |
96460 | 519 switch char for compatibility with cmd.exe. */ |
23374
0110032de8b3
(main): Treat command line options as case-insensitive.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21733
diff
changeset
|
520 if (((*argv)[0] == '-' || (*argv)[0] == '/') && (*argv)[1] != '\0') |
19236 | 521 { |
23374
0110032de8b3
(main): Treat command line options as case-insensitive.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21733
diff
changeset
|
522 if (((*argv)[1] == 'c' || (*argv)[1] == 'C') && ((*argv)[2] == '\0')) |
19236 | 523 { |
524 if (--argc == 0) | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
525 fail ("error: expecting arg for %s\n", *argv); |
19236 | 526 cmdline = *(++argv); |
527 interactive = FALSE; | |
528 } | |
23374
0110032de8b3
(main): Treat command line options as case-insensitive.
Geoff Voelker <voelker@cs.washington.edu>
parents:
21733
diff
changeset
|
529 else if (((*argv)[1] == 'i' || (*argv)[1] == 'I') && ((*argv)[2] == '\0')) |
19236 | 530 { |
531 if (cmdline) | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
532 warn ("warning: %s ignored because of -c\n", *argv); |
19236 | 533 } |
24555
2bf5c4b2cc5a
cmdproxy.c (main): Fix parens.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24516
diff
changeset
|
534 else if (((*argv)[1] == 'e' || (*argv)[1] == 'E') && ((*argv)[2] == ':')) |
19236 | 535 { |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
536 int requested_envsize = atoi (*argv + 3); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
537 /* Enforce a reasonable minimum size, as above. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
538 if (requested_envsize > envsize) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
539 envsize = requested_envsize; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
540 /* For sanity, enforce a reasonable maximum. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
541 if (envsize > 32768) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
542 envsize = 32768; |
19236 | 543 } |
544 else | |
545 { | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
546 /* warn ("warning: unknown option %s ignored", *argv); */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
547 pass_through_args[num_pass_through_args++] = *argv; |
19236 | 548 } |
549 } | |
550 else | |
551 break; | |
552 } | |
553 | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
554 #if 0 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
555 /* I think this is probably not useful - cmd.exe ignores extra |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
556 (non-switch) args in interactive mode, and they cannot be passed on |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
557 when -c was given. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
558 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
559 /* Collect any remaining args after (initial) switches. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
560 while (argc-- > 0) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
561 { |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
562 pass_through_args[num_pass_through_args++] = *argv++; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
563 } |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
564 #else |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
565 /* Probably a mistake for there to be extra args; not fatal. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
566 if (argc > 0) |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
567 warn ("warning: extra args ignored after '%s'\n", argv[-1]); |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
568 #endif |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
569 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
570 pass_through_args[num_pass_through_args] = NULL; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
571 |
19236 | 572 /* If -c option, determine if we must spawn a real shell, or if we can |
573 execute the command directly ourself. */ | |
574 if (cmdline) | |
575 { | |
576 /* If no redirection or piping, and if program can be found, then | |
577 run program directly. Otherwise invoke a real shell. */ | |
578 | |
579 static char copout_chars[] = "|<>&"; | |
580 | |
581 if (strpbrk (cmdline, copout_chars) == NULL) | |
582 { | |
583 char *args; | |
584 | |
585 /* The program name is the first token of cmdline. Since | |
586 filenames cannot legally contain embedded quotes, the value | |
587 of escape_char doesn't matter. */ | |
588 args = cmdline; | |
589 if (!get_next_token (path, &args)) | |
590 fail ("error: no program name specified.\n"); | |
591 | |
592 canon_filename (path); | |
593 progname = make_absolute (path); | |
594 | |
595 /* If we found the program, run it directly (if not found it | |
596 might be an internal shell command, so don't fail). */ | |
597 if (progname != NULL) | |
598 need_shell = FALSE; | |
599 } | |
600 } | |
601 | |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
602 pass_to_shell: |
19236 | 603 if (need_shell) |
604 { | |
605 char * p; | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
606 int extra_arg_space = 0; |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
607 int run_command_dot_com; |
19236 | 608 |
609 progname = getenv ("COMSPEC"); | |
610 if (!progname) | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
611 fail ("error: COMSPEC is not set\n"); |
19236 | 612 |
613 canon_filename (progname); | |
614 progname = make_absolute (progname); | |
615 | |
616 if (progname == NULL || strchr (progname, '\\') == NULL) | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
617 fail ("error: the program %s could not be found.\n", getenv ("COMSPEC")); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
618 |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
619 /* Need to set environment size when running command.com. */ |
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
620 run_command_dot_com = |
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
621 (stricmp (strrchr (progname, '\\'), "command.com") == 0); |
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
622 |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
623 /* Work out how much extra space is required for |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
624 pass_through_args. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
625 for (argv = pass_through_args; *argv != NULL; ++argv) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
626 /* We don't expect to have to quote switches. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
627 extra_arg_space += strlen (*argv) + 2; |
19236 | 628 |
629 if (cmdline) | |
630 { | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
631 char * buf; |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
632 |
19236 | 633 /* Convert to syntax expected by cmd.exe/command.com for |
634 running non-interactively. Always quote program name in | |
635 case path contains spaces (fortunately it can't contain | |
636 quotes, since they are illegal in path names). */ | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
637 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
638 buf = p = alloca (strlen (progname) + extra_arg_space + |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
639 strlen (cmdline) + 16); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
640 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
641 /* Quote progname in case it contains spaces. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
642 p += wsprintf (p, "\"%s\"", progname); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
643 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
644 /* Include pass_through_args verbatim; these are just switches |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
645 so should not need quoting. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
646 for (argv = pass_through_args; *argv != NULL; ++argv) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
647 p += wsprintf (p, " %s", *argv); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
648 |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
649 if (run_command_dot_com) |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
650 wsprintf(p, " /e:%d /c %s", envsize, cmdline); |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
651 else |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
652 wsprintf(p, " /c %s", cmdline); |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
653 cmdline = buf; |
19236 | 654 } |
655 else | |
656 { | |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
657 if (run_command_dot_com) |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
658 { |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
659 /* Provide dir arg expected by command.com when first |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
660 started interactively (the "command search path"). To |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
661 avoid potential problems with spaces in command dir |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
662 (which cannot be quoted - command.com doesn't like it), |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
663 we always use the 8.3 form. */ |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
664 GetShortPathName (progname, path, sizeof (path)); |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
665 p = strrchr (path, '\\'); |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
666 /* Trailing slash is acceptable, so always leave it. */ |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
667 *(++p) = '\0'; |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
668 } |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
669 else |
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
670 path[0] = '\0'; |
19236 | 671 |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
672 cmdline = p = alloca (strlen (progname) + extra_arg_space + |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
673 strlen (path) + 13); |
19236 | 674 |
675 /* Quote progname in case it contains spaces. */ | |
19718
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
676 p += wsprintf (p, "\"%s\" %s", progname, path); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
677 |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
678 /* Include pass_through_args verbatim; these are just switches |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
679 so should not need quoting. */ |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
680 for (argv = pass_through_args; *argv != NULL; ++argv) |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
681 p += wsprintf (p, " %s", *argv); |
f645084cc96c
(get_env_size): New function.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19236
diff
changeset
|
682 |
23683
cb300ad44b55
(main): Set environment size only when running
Geoff Voelker <voelker@cs.washington.edu>
parents:
23374
diff
changeset
|
683 if (run_command_dot_com) |
21733
a373669e1196
(main): Only set environment size for real shell, and
Geoff Voelker <voelker@cs.washington.edu>
parents:
21598
diff
changeset
|
684 wsprintf (p, " /e:%d", envsize); |
19236 | 685 } |
686 } | |
687 | |
688 if (!progname) | |
689 fail ("Internal error: program name not defined\n"); | |
690 | |
691 if (!cmdline) | |
692 cmdline = progname; | |
693 | |
23947
f01d27883cb1
(spawn): Pass directory for child as parameter.
Andrew Innes <andrewi@gnu.org>
parents:
23683
diff
changeset
|
694 if (spawn (progname, cmdline, dir, &rc)) |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
695 return rc; |
19236 | 696 |
21598
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
697 if (!need_shell) |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
698 { |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
699 need_shell = TRUE; |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
700 goto pass_to_shell; |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
701 } |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
702 |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
703 fail ("Could not run %s\n", progname); |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
704 |
235f717e6916
(fail): Exit with a negative return value.
Geoff Voelker <voelker@cs.washington.edu>
parents:
19718
diff
changeset
|
705 return 0; |
19236 | 706 } |
52401 | 707 |
708 /* arch-tag: 88678d93-07ac-4e2f-ad63-d4a740ca69ac | |
709 (do not change this comment) */ |