mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-18 01:50:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

(fix_argv): New function.

Browse Source 
(pexecute): Win32 but not Cygwin32 needs its arguments fixed.
Add underscore to cwait function call.

From-SVN: r14338
This commit is contained in:
Richard Kenner 1997-06-27 15:20:28 -04:00
parent 84d02eb4aa
commit b662a90d41
1 changed files with 42 additions and 4 deletions

46
gcc/pexecute.c

@ -217,12 +217,49 @@ pwait (pid, status, flags)
#endif /* MSDOS */
#if defined (_WIN32)
#if defined (_WIN32) && !defined (__CYGWIN32__)
#include <process.h>
extern int _spawnv ();
extern int _spawnvp ();
/* This is a kludge to get around the Microsoft C spawn functions' propensity
to remove the outermost set of double quotes from all arguments. */
const char * const *
fix_argv (argvec)
char **argvec;
{
int i;
for (i = 1; argvec[i] != 0; i++)
{
int len, j;
char *temp, *newtemp;
temp = argvec[i];
len = strlen (temp);
for (j = 0; j < len; j++)
{
if (temp[j] == '"')
{
newtemp = xmalloc (len + 2);
strncpy (newtemp, temp, j);
newtemp [j] = '\\';
strncpy (&newtemp [j+1], &temp [j], len-j);
newtemp [len+1] = 0;
temp = newtemp;
len++;
j++;
}
}
argvec[i] = temp;
}
return (const char * const *) argvec;
}
int
pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
const char *program;
@ -236,7 +273,8 @@ pexecute (program, argv, this_pname, temp_base, errmsg_fmt, errmsg_arg, flags)
if ((flags & PEXECUTE_ONE) != PEXECUTE_ONE)
abort ();
pid = (flags & PEXECUTE_SEARCH ? _spawnvp : _spawnv) (_P_NOWAIT, program, argv);
pid = (flags & PEXECUTE_SEARCH ? _spawnvp : _spawnv)
(_P_NOWAIT, program, fix_argv(argv));
if (pid == -1)
{
*errmsg_fmt = install_error_msg;
@ -254,7 +292,7 @@ pwait (pid, status, flags)
{
/* ??? Here's an opportunity to canonicalize the values in STATUS.
Needed? */
return cwait (status, pid, WAIT_CHILD);
return _cwait (status, pid, WAIT_CHILD);
}
#endif /* _WIN32 */
@ -440,7 +478,7 @@ pfinish ()
/* include for Unix-like environments but not for Dos-like environments */
#if ! defined (__MSDOS__) && ! defined (OS2) && ! defined (MPW) \
&& ! defined (_WIN32)
&& (defined (__CYGWIN32__) || ! defined (_WIN32))
#ifdef VMS
#define vfork() (decc$$alloc_vfork_blocks() >= 0 ? \