mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-04 11:00:45 -08:00
Code Issues Projects Releases Wiki Activity

(w32_execvp): New function; wrapper for `execvp'.

Browse source 
(execvp) [WINDOWSNT]: Redefine to `w32_execvp'.
(fail): Remove Windows-specific fix (subsumed in w32_execvp).
This commit is contained in:
Juanma Barranquero 2006-12-15 14:53:44 +00:00
parent c6e87e8968
commit 4472aef4c3
2 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib-src/ChangeLog
View file

@ -1,3 +1,10 @@
2006-12-15 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (w32_execvp): New function; wrapper for `execvp'.
(execvp) [WINDOWSNT]: Redefine to `w32_execvp'.
(fail): Remove Windows-specific fix (subsumed into w32_execvp).
Suggestions and comment by Eli Zaretskii.
2006-12-06 Christoph Conrad <christoph.conrad@gmx.de> 2006-12-06 Christoph Conrad <christoph.conrad@gmx.de>
* makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe): * makefile.w32-in ($(BLD)/emacsclient.exe, $(BLD)/emacsclientw.exe):
@ -19,11 +26,11 @@
(set_tcp_socket): Make the message for non-local connections (set_tcp_socket): Make the message for non-local connections
informational rather than an error. informational rather than an error.
2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change) 2006-11-28 Kevin Ryde <user42@zip.com.au> (tiny change)
* etags.c (readline): Check for double quote after #line. * etags.c (readline): Check for double quote after #line.
2006-11-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> (tiny change) 2006-11-28 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* etags.c (readline): sscanf could in principle return 2. * etags.c (readline): sscanf could in principle return 2.
@ -55,8 +62,8 @@
2006-11-24 Michael Mauger <mmaug@yahoo.com> 2006-11-24 Michael Mauger <mmaug@yahoo.com>
* emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support * emacsclient.c (file_name_absolute_p) [WINDOWSNT]: Support absolute
absolute file names with forward slashes. file names with forward slashes.
2006-11-23 Juanma Barranquero <lekktu@gmail.com> 2006-11-23 Juanma Barranquero <lekktu@gmail.com>

40
lib-src/emacsclient.c
View file

@ -298,6 +298,42 @@ Report bugs to bug-gnu-emacs@gnu.org.\n", progname);
} }
#ifdef WINDOWSNT
/*
execvp() wrapper for Windows. Quotes arguments with embedded spaces.
This is necessary due to the broken implementation of exec* routines in
the Microsoft libraries: they concatenate the arguments together without
quoting special characters, and pass the result to CreateProcess, with
predictably bad results. By contrast, Posix execvp passes the arguments
directly into the argv[] array of the child process.
*/
int
w32_execvp (path, argv)
char *path;
char **argv;
{
int i;
argv[0] = (char *) alternate_editor;
for (i = 0; argv[i]; i++)
if (strchr (argv[i], ' '))
{
char *quoted = alloca (strlen (argv[i]) + 3);
sprintf (quoted, "\"%s\"", argv[i]);
argv[i] = quoted;
}
return execvp (path, argv);
}
#undef execvp
#define execvp w32_execvp
#endif /* WINDOWSNT */
/* /*
Try to run a different command, or --if no alternate editor is Try to run a different command, or --if no alternate editor is
defined-- exit with an errorcode. defined-- exit with an errorcode.
@ -310,9 +346,7 @@ fail (argc, argv)
if (alternate_editor) if (alternate_editor)
{ {
int i = optind - 1; int i = optind - 1;
#ifdef WINDOWSNT
argv[i] = (char *)alternate_editor;
#endif
execvp (alternate_editor, argv + i); execvp (alternate_editor, argv + i);
message (TRUE, "%s: error executing alternate editor \"%s\"\n", message (TRUE, "%s: error executing alternate editor \"%s\"\n",
progname, alternate_editor); progname, alternate_editor);