PR preprocessor/43642

[pf3gnuchains/gcc-fork.git] / libiberty / pex-win32.c

diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c
index aef386d..4427406 100644 (file)
--- a/libiberty/pex-win32.c
+++ b/libiberty/pex-win32.c
@@ -1,6 +1,6 @@
 /* Utilities to execute a program in a subprocess (possibly linked by pipes
    with other subprocesses), and wait for it.  Generic Win32 specialization.
 /* Utilities to execute a program in a subprocess (possibly linked by pipes
    with other subprocesses), and wait for it.  Generic Win32 specialization.

-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006

    Free Software Foundation, Inc.
 
 This file is part of the libiberty library.
    Free Software Foundation, Inc.
 
 This file is part of the libiberty library.


@@ -79,12 +79,12 @@ backslashify (char *s)
 
 static int pex_win32_open_read (struct pex_obj *, const char *, int);
 static int pex_win32_open_write (struct pex_obj *, const char *, int);
 
 static int pex_win32_open_read (struct pex_obj *, const char *, int);
 static int pex_win32_open_write (struct pex_obj *, const char *, int);

-static long pex_win32_exec_child (struct pex_obj *, int, const char *,
+static pid_t pex_win32_exec_child (struct pex_obj *, int, const char *,

                                  char * const *, char * const *,
                                   int, int, int, int,
                                  const char **, int *);
 static int pex_win32_close (struct pex_obj *, int);
                                  char * const *, char * const *,
                                   int, int, int, int,
                                  const char **, int *);
 static int pex_win32_close (struct pex_obj *, int);

-static int pex_win32_wait (struct pex_obj *, long, int *,
+static pid_t pex_win32_wait (struct pex_obj *, pid_t, int *,

                           struct pex_time *, int, const char **, int *);
 static int pex_win32_pipe (struct pex_obj *, int *, int);
 static FILE *pex_win32_fdopenr (struct pex_obj *, int, int);
                           struct pex_time *, int, const char **, int *);
 static int pex_win32_pipe (struct pex_obj *, int *, int);
 static FILE *pex_win32_fdopenr (struct pex_obj *, int, int);


@@ -321,6 +321,18 @@ msys_rootify (const char *executable)
 }
 #endif
 
 }
 #endif
 

+/* Return the number of arguments in an argv array, not including the null
+   terminating argument. */
+
+static int
+argv_to_argc (char *const *argv)
+{
+  char *const *i = argv;
+  while (*i)
+    i++;
+  return i - argv;
+}
+

 /* Return a Windows command-line from ARGV.  It is the caller's
    responsibility to free the string returned.  */
 
 /* Return a Windows command-line from ARGV.  It is the caller's
    responsibility to free the string returned.  */
 


@@ -358,7 +370,7 @@ argv_to_cmdline (char *const *argv)
       cmdline_len += j;
       cmdline_len += 3;  /* for leading and trailing quotes and space */
     }
       cmdline_len += j;
       cmdline_len += 3;  /* for leading and trailing quotes and space */
     }

-  cmdline = xmalloc (cmdline_len);
+  cmdline = XNEWVEC (char, cmdline_len);

   p = cmdline;
   for (i = 0; argv[i]; i++)
     {
   p = cmdline;
   for (i = 0; argv[i]; i++)
     {


@@ -382,16 +394,18 @@ argv_to_cmdline (char *const *argv)
   return cmdline;
 }
 
   return cmdline;
 }
 

+/* We'll try the passed filename with all the known standard
+   extensions, and then without extension.  We try no extension
+   last so that we don't try to run some random extension-less
+   file that might be hanging around.  We try both extension
+   and no extension so that we don't need any fancy logic
+   to determine if a file has extension.  */

 static const char *const
 std_suffixes[] = {
   ".com",
   ".exe",
   ".bat",
   ".cmd",
 static const char *const
 std_suffixes[] = {
   ".com",
   ".exe",
   ".bat",
   ".cmd",

-  0
-};
-static const char *const
-no_suffixes[] = {

   "",
   0
 };
   "",
   0
 };


@@ -409,7 +423,6 @@ find_executable (const char *program, BOOL search)
   const char *const *ext;
   const char *p, *q;
   size_t proglen = strlen (program);
   const char *const *ext;
   const char *p, *q;
   size_t proglen = strlen (program);

-  int has_extension = !!strchr (program, '.');

   int has_slash = (strchr (program, '/') || strchr (program, '\\'));
   HANDLE h;
 
   int has_slash = (strchr (program, '/') || strchr (program, '\\'));
   HANDLE h;
 


@@ -432,8 +445,8 @@ find_executable (const char *program, BOOL search)
       if (*q == ';')
        q++;
     }
       if (*q == ';')
        q++;
     }

-  fe_len = fe_len + 1 + proglen + (has_extension ? 1 : 5);
-  full_executable = xmalloc (fe_len);
+  fe_len = fe_len + 1 + proglen + 5 /* space for extension */;
+  full_executable = XNEWVEC (char, fe_len);

 
   p = path;
   do
 
   p = path;
   do


@@ -458,7 +471,7 @@ find_executable (const char *program, BOOL search)
 
       /* At this point, e points to the terminating NUL character for
          full_executable.  */
 
       /* At this point, e points to the terminating NUL character for
          full_executable.  */

-      for (ext = has_extension ? no_suffixes : std_suffixes; *ext; ext++)
+      for (ext = std_suffixes; *ext; ext++)

        {
          /* Remove any current extension.  */
          *e = '\0';
        {
          /* Remove any current extension.  */
          *e = '\0';


@@ -521,7 +534,10 @@ env_compare (const void *a_ptr, const void *b_ptr)
   return c1 - c2;
 }
 
   return c1 - c2;
 }
 

-static long
+/* Execute a Windows executable as a child process.  This will fail if the
+ * target is not actually an executable, such as if it is a shell script. */
+
+static pid_t

 win32_spawn (const char *executable,
             BOOL search,
             char *const *argv,
 win32_spawn (const char *executable,
             BOOL search,
             char *const *argv,


@@ -557,14 +573,14 @@ win32_spawn (const char *executable,
     
           /* Windows needs the members of the block to be sorted by variable
              name.  */
     
           /* Windows needs the members of the block to be sorted by variable
              name.  */

-          env_copy = alloca (sizeof (char *) * env_size);
+          env_copy = (char **) alloca (sizeof (char *) * env_size);

           memcpy (env_copy, env, sizeof (char *) * env_size);
           qsort (env_copy, env_size, sizeof (char *), env_compare);
     
           for (var = 0; var < env_size; var++)
             total_size += strlen (env[var]) + 1;
     
           memcpy (env_copy, env, sizeof (char *) * env_size);
           qsort (env_copy, env_size, sizeof (char *), env_compare);
     
           for (var = 0; var < env_size; var++)
             total_size += strlen (env[var]) + 1;
     

-          env_block = malloc (total_size);
+          env_block = XNEWVEC (char, total_size);

           bufptr = env_block;
           for (var = 0; var < env_size; var++)
             bufptr = stpcpy (bufptr, env_copy[var]) + 1;
           bufptr = env_block;
           for (var = 0; var < env_size; var++)
             bufptr = stpcpy (bufptr, env_copy[var]) + 1;


@@ -596,7 +612,7 @@ win32_spawn (const char *executable,
 
       free (full_executable);
 
 
       free (full_executable);
 

-      return -1;
+      return (pid_t) -1;

     }
 
   /* Clean up.  */
     }
 
   /* Clean up.  */


@@ -605,7 +621,7 @@ win32_spawn (const char *executable,
   if (env_block)
     free (env_block);
 
   if (env_block)
     free (env_block);
 

-  return (long) pi->hProcess;
+  return (pid_t) pi->hProcess;

 
  error:
   if (env_block)
 
  error:
   if (env_block)


@@ -615,20 +631,25 @@ win32_spawn (const char *executable,
   if (full_executable)
     free (full_executable);
 
   if (full_executable)
     free (full_executable);
 

-  return -1;
+  return (pid_t) -1;

 }
 
 }
 

-static long
+/* Spawn a script.  This simulates the Unix script execution mechanism.
+   This function is called as a fallback if win32_spawn fails. */
+
+static pid_t

 spawn_script (const char *executable, char *const *argv,
               char* const *env,
              DWORD dwCreationFlags,
              LPSTARTUPINFO si,
              LPPROCESS_INFORMATION pi)
 {
 spawn_script (const char *executable, char *const *argv,
               char* const *env,
              DWORD dwCreationFlags,
              LPSTARTUPINFO si,
              LPPROCESS_INFORMATION pi)
 {

-  int pid = -1;
+  pid_t pid = (pid_t) -1;

   int save_errno = errno;
   int fd = _open (executable, _O_RDONLY);
 
   int save_errno = errno;
   int fd = _open (executable, _O_RDONLY);
 

+  /* Try to open script, check header format, extract interpreter path,
+     and spawn script using that interpretter. */

   if (fd >= 0)
     {
       char buf[MAX_PATH + 5];
   if (fd >= 0)
     {
       char buf[MAX_PATH + 5];


@@ -641,16 +662,28 @@ spawn_script (const char *executable, char *const *argv,
          eol = strchr (buf, '\n');
          if (eol && strncmp (buf, "#!", 2) == 0)
            {
          eol = strchr (buf, '\n');
          if (eol && strncmp (buf, "#!", 2) == 0)
            {

+            
+             /* Header format is OK. */

              char *executable1;
              char *executable1;

-             const char ** avhere = (const char **) --argv;
+              int new_argc;
+              const char **avhere;
+
+             /* Extract interpreter path. */

              do
                *eol = '\0';
              while (*--eol == '\r' || *eol == ' ' || *eol == '\t');
              for (executable1 = buf + 2; *executable1 == ' ' || *executable1 == '\t'; executable1++)
                continue;
              do
                *eol = '\0';
              while (*--eol == '\r' || *eol == ' ' || *eol == '\t');
              for (executable1 = buf + 2; *executable1 == ' ' || *executable1 == '\t'; executable1++)
                continue;

-

              backslashify (executable1);
              backslashify (executable1);

+
+             /* Duplicate argv, prepending the interpreter path. */
+             new_argc = argv_to_argc (argv) + 1;
+             avhere = XNEWVEC (const char *, new_argc + 1);

              *avhere = executable1;
              *avhere = executable1;

+             memcpy (avhere + 1, argv, new_argc * sizeof(*argv));
+             argv = (char *const *)avhere;
+
+             /* Spawn the child. */

 #ifndef USE_MINGW_MSYS
              executable = strrchr (executable1, '\\') + 1;
              if (!executable)
 #ifndef USE_MINGW_MSYS
              executable = strrchr (executable1, '\\') + 1;
              if (!executable)


@@ -672,7 +705,7 @@ spawn_script (const char *executable, char *const *argv,
                                     dwCreationFlags, si, pi);
                  if (executable1 != newex)
                    free ((char *) newex);
                                     dwCreationFlags, si, pi);
                  if (executable1 != newex)
                    free ((char *) newex);

-                 if (pid < 0)
+                 if (pid == (pid_t) -1)

                    {
                      newex = msys_rootify (executable1);
                      if (newex != executable1)
                    {
                      newex = msys_rootify (executable1);
                      if (newex != executable1)


@@ -685,17 +718,18 @@ spawn_script (const char *executable, char *const *argv,
                    }
                }
 #endif
                    }
                }
 #endif

+             free (avhere);

            }
        }
     }
            }
        }
     }

-  if (pid < 0)
+  if (pid == (pid_t) -1)

     errno = save_errno;
   return pid;
 }
 
 /* Execute a child.  */
 
     errno = save_errno;
   return pid;
 }
 
 /* Execute a child.  */
 

-static long
+static pid_t

 pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
                      const char *executable, char * const * argv,
                       char* const* env,
 pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
                      const char *executable, char * const * argv,
                       char* const* env,


@@ -704,7 +738,7 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
                      const char **errmsg,
                      int *err)
 {
                      const char **errmsg,
                      int *err)
 {

-  long pid;
+  pid_t pid;

   HANDLE stdin_handle;
   HANDLE stdout_handle;
   HANDLE stderr_handle;
   HANDLE stdin_handle;
   HANDLE stdout_handle;
   HANDLE stderr_handle;


@@ -712,6 +746,28 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
   OSVERSIONINFO version_info;
   STARTUPINFO si;
   PROCESS_INFORMATION pi;
   OSVERSIONINFO version_info;
   STARTUPINFO si;
   PROCESS_INFORMATION pi;

+  int orig_out, orig_in, orig_err;
+  BOOL separate_stderr = !(flags & PEX_STDERR_TO_STDOUT);
+
+  /* Ensure we have inheritable descriptors to pass to the child, and close the
+     original descriptors.  */
+  orig_in = in;
+  in = _dup (orig_in);
+  if (orig_in != STDIN_FILENO)
+    _close (orig_in);
+  
+  orig_out = out;
+  out = _dup (orig_out);
+  if (orig_out != STDOUT_FILENO)
+    _close (orig_out);
+  
+  if (separate_stderr)
+    {
+      orig_err = errdes;
+      errdes = _dup (orig_err);
+      if (orig_err != STDERR_FILENO)
+       _close (orig_err);
+    }

 
   stdin_handle = INVALID_HANDLE_VALUE;
   stdout_handle = INVALID_HANDLE_VALUE;
 
   stdin_handle = INVALID_HANDLE_VALUE;
   stdout_handle = INVALID_HANDLE_VALUE;


@@ -719,7 +775,7 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
 
   stdin_handle = (HANDLE) _get_osfhandle (in);
   stdout_handle = (HANDLE) _get_osfhandle (out);
 
   stdin_handle = (HANDLE) _get_osfhandle (in);
   stdout_handle = (HANDLE) _get_osfhandle (out);

-  if (!(flags & PEX_STDERR_TO_STDOUT))
+  if (separate_stderr)

     stderr_handle = (HANDLE) _get_osfhandle (errdes);
   else
     stderr_handle = stdout_handle;
     stderr_handle = (HANDLE) _get_osfhandle (errdes);
   else
     stderr_handle = stdout_handle;


@@ -779,21 +835,22 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
   /* Create the child process.  */  
   pid = win32_spawn (executable, (flags & PEX_SEARCH) != 0,
                     argv, env, dwCreationFlags, &si, &pi);
   /* Create the child process.  */  
   pid = win32_spawn (executable, (flags & PEX_SEARCH) != 0,
                     argv, env, dwCreationFlags, &si, &pi);

-  if (pid == -1)
+  if (pid == (pid_t) -1)

     pid = spawn_script (executable, argv, env, dwCreationFlags,
                         &si, &pi);
     pid = spawn_script (executable, argv, env, dwCreationFlags,
                         &si, &pi);

-  if (pid == -1)
+  if (pid == (pid_t) -1)

     {
       *err = ENOENT;
       *errmsg = "CreateProcess";
     }
 
     {
       *err = ENOENT;
       *errmsg = "CreateProcess";
     }
 

-  /* Close the standard output and standard error handles in the
-     parent.  */ 
-  if (out != STDOUT_FILENO)
-    obj->funcs->close (obj, out);
-  if (errdes != STDERR_FILENO)
-    obj->funcs->close (obj, errdes);
+  /* Close the standard input, standard output and standard error handles
+     in the parent.  */ 
+
+  _close (in);
+  _close (out);
+  if (separate_stderr)
+    _close (errdes);

 
   return pid;
 }
 
   return pid;
 }


@@ -806,8 +863,8 @@ pex_win32_exec_child (struct pex_obj *obj ATTRIBUTE_UNUSED, int flags,
    status == 3.  We fix the status code to conform to the usual WIF*
    macros.  Note that WIFSIGNALED will never be true under CRTDLL. */
 
    status == 3.  We fix the status code to conform to the usual WIF*
    macros.  Note that WIFSIGNALED will never be true under CRTDLL. */
 

-static int
-pex_win32_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, long pid,
+static pid_t
+pex_win32_wait (struct pex_obj *obj ATTRIBUTE_UNUSED, pid_t pid,

                int *status, struct pex_time *time, int done ATTRIBUTE_UNUSED,
                const char **errmsg, int *err)
 {
                int *status, struct pex_time *time, int done ATTRIBUTE_UNUSED,
                const char **errmsg, int *err)
 {


@@ -849,7 +906,7 @@ static int
 pex_win32_pipe (struct pex_obj *obj ATTRIBUTE_UNUSED, int *p,
                int binary)
 {
 pex_win32_pipe (struct pex_obj *obj ATTRIBUTE_UNUSED, int *p,
                int binary)
 {

-  return _pipe (p, 256, binary ? _O_BINARY : _O_TEXT);
+  return _pipe (p, 256, (binary ? _O_BINARY : _O_TEXT) | _O_NOINHERIT);

 }
 
 /* Get a FILE pointer to read from a file descriptor.  */
 }
 
 /* Get a FILE pointer to read from a file descriptor.  */


@@ -858,6 +915,11 @@ static FILE *
 pex_win32_fdopenr (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
                   int binary)
 {
 pex_win32_fdopenr (struct pex_obj *obj ATTRIBUTE_UNUSED, int fd,
                   int binary)
 {

+  HANDLE h = (HANDLE) _get_osfhandle (fd);
+  if (h == INVALID_HANDLE_VALUE)
+    return NULL;
+  if (! SetHandleInformation (h, HANDLE_FLAG_INHERIT, 0))
+    return NULL;

   return fdopen (fd, binary ? "rb" : "r");
 }
 
   return fdopen (fd, binary ? "rb" : "r");
 }
 


@@ -882,7 +944,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv)
   char const *errmsg;
   int err;
   argv++;
   char const *errmsg;
   int err;
   argv++;

-  printf ("%ld\n", pex_win32_exec_child (NULL, PEX_SEARCH, argv[0], argv, NULL, 0, 0, 1, 2, &errmsg, &err));
+  printf ("%ld\n", (long) pex_win32_exec_child (NULL, PEX_SEARCH, argv[0], argv, NULL, 0, 0, 1, 2, &errmsg, &err));

   exit (0);
 }
 #endif
   exit (0);
 }
 #endif