Use _IO_FILE_complete, not _IO_file_plus.

[kopensolaris-gnu/glibc.git] / posix / execvp.c

diff --git a/posix/execvp.c b/posix/execvp.c
index c231ec6..26c7be9 100644 (file)
--- a/posix/execvp.c
+++ b/posix/execvp.c
@@ -23,6 +23,41 @@
 #include <errno.h>
 #include <paths.h>
 
 #include <errno.h>
 #include <paths.h>
 

+
+static void
+internal_function
+execute (const char *file, char *const argv[])
+{
+  execv (file, argv);
+
+  if (errno == ENOEXEC)
+    {
+      /* The file is accessible but it is not an executable file.
+        Invoke the shell to interpret it as a script.  */
+
+      /* Count the arguments.  */
+      int argc = 0;
+      while (argv[argc++])
+       ;
+
+      /* Construct an argument list for the shell.  */
+      {
+       char *new_argv[argc + 1];
+       new_argv[0] = (char *) _PATH_BSHELL;
+       new_argv[1] = (char *) file;
+       while (argc > 1)
+         {
+           new_argv[argc] = argv[argc - 1];
+           --argc;
+         }
+
+       /* Execute the shell.  */
+       execv (new_argv[0], new_argv);
+      }
+       }
+}
+
+

 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from `environ'.  */
 int
 /* Execute FILE, searching in the `PATH' environment variable if it contains
    no slashes, with arguments ARGV and environment from `environ'.  */
 int


@@ -32,37 +67,6 @@ execvp (file, argv)
 {
   int got_eacces = 0;
 
 {
   int got_eacces = 0;
 

-  void execute (const char *file, char *const argv[])
-    {
-      execv (file, argv);
-
-      if (errno == ENOEXEC)
-       {
-         /* The file is accessible but it is not an executable file.
-            Invoke the shell to interpret it as a script.  */
-
-         /* Count the arguments.  */
-         int argc = 0;
-         while (argv[argc++])
-           ;
-
-         /* Construct an argument list for the shell.  */
-         {
-           char *new_argv[argc + 1];
-           new_argv[0] = (char *) _PATH_BSHELL;
-           new_argv[1] = (char *) file;
-           while (argc > 1)
-             {
-               new_argv[argc] = argv[argc - 1];
-               --argc;
-             }
-
-           /* Execute the shell.  */
-           execv (new_argv[0], new_argv);
-         }
-       }
-    }
-

   if (strchr (file, '/') != NULL)
     /* Don't search when it contains a slash.  */
     execute (file, argv);
   if (strchr (file, '/') != NULL)
     /* Don't search when it contains a slash.  */
     execute (file, argv);


@@ -116,6 +120,7 @@ execvp (file, argv)
                 that we did find one but were denied access.  */
              got_eacces = 1;
            case ENOENT:
                 that we did find one but were denied access.  */
              got_eacces = 1;
            case ENOENT:

+           case ESTALE:

              /* Those errors indicate the file is missing or not executable
                 by us, in which case we want to just try the next path
                 directory.  */
              /* Those errors indicate the file is missing or not executable
                 by us, in which case we want to just try the next path
                 directory.  */