Changeset 1674

Timestamp:

07/11/08 02:49:29 (8 weeks ago)

Author:

bird

Message:

Fixed the error message on _spawnvp failure (windows) and added an error message for execvp failure (the rest).

Files:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (23 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -48 +48 @@
 #  define LIBPATHSTRICT 3
 # endif
-#endif 
+#endif
+
+
+static const char *name(const char *pszName)
+{
+    const char *psz = strrchr(pszName, '/');
+#if defined(_MSC_VER) || defined(__OS2__)
+    const char *psz2 = strrchr(pszName, '\\');
+    if (!psz2)
+        psz2 = strrchr(pszName, ':');
+    if (psz2 && (!psz || psz2 > psz))
+        psz = psz2;
+#endif
+    return psz ? psz + 1 : pszName;
+}
 
 
@@ -93 +107 @@
      */
     if (argc <= 1)
-        return usage(pStdErr, argv[0]);
+        return usage(pStdErr, name(argv[0]));
     for (i = 1; i < argc; i++)
     {
@@ -127 +141 @@
             if (*psz == 'h')
             {
-                usage(pStdOut, argv[0]);
+                usage(pStdOut, name(argv[0]));
                 return 0;
             }
@@ -151 +165 @@
                     if (i + 1 >= argc)
                     {
-                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", argv[0], argv[i]);
+                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", name(argv[0]), argv[i]);
                         return 1;
                     }
@@ -168 +182 @@
                     if (rc)
                     {
-                        fprintf(pStdErr, "%s: error: DosSetExtLibPath(\"%s\", %.*s (%lu)): %lu\n", 
-                                argv[0], pszVal, pszVal - psz - 1, psz, ulVar, rc);
+                        fprintf(pStdErr, "%s: error: DosSetExtLibPath(\"%s\", %.*s (%lu)): %lu\n",
+                                name(argv[0]), pszVal, pszVal - psz - 1, psz, ulVar, rc);
                         return 1;
                     }
@@ -177 +191 @@
                 if (putenv(psz))
                 {
-                    fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", argv[0], psz, strerror(errno));
+                    fprintf(pStdErr, "%s: error: putenv(\"%s\"): %s\n", name(argv[0]), psz, strerror(errno));
                     return 1;
                 }
@@ -195 +209 @@
                     if (i + 1 >= argc)
                     {
-                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", argv[0], argv[i]);
+                        fprintf(pStdErr, "%s: syntax error: no argument for %s\n", name(argv[0]), argv[i]);
                         return 1;
                     }
@@ -223 +237 @@
                 }
 #endif
-                fprintf(pStdErr, "%s: error: chdir(\"%s\"): %s\n", argv[0], psz, strerror(errno));
+                fprintf(pStdErr, "%s: error: chdir(\"%s\"): %s\n", name(argv[0]), psz, strerror(errno));
                 return 1;
             }
@@ -272 +286 @@
 
                 case '+':
-                    fprintf(pStdErr, "%s: syntax error: Unexpected '+' in '%s'\n", argv[0], argv[i]);
+                    fprintf(pStdErr, "%s: syntax error: Unexpected '+' in '%s'\n", name(argv[0]), argv[i]);
                     return 1;
 
@@ -342 +356 @@
                     if (!fd)
                     {
-                        fprintf(pStdErr, "%s: error: failed to convert '%s' to a number\n", argv[0], argv[i]);
+                        fprintf(pStdErr, "%s: error: failed to convert '%s' to a number\n", name(argv[0]), argv[i]);
                         return 1;
 
@@ -348 +362 @@
                     if (fd < 0)
                     {
-                        fprintf(pStdErr, "%s: error: negative fd %d (%s)\n", argv[0], fd, argv[i]);
+                        fprintf(pStdErr, "%s: error: negative fd %d (%s)\n", name(argv[0]), fd, argv[i]);
                         return 1;
                     }
@@ -357 +371 @@
                  */
                 default:
-                    fprintf(pStdErr, "%s: error: failed to convert '%s' ('%s') to a file descriptor\n", argv[0], psz, argv[i]);
+                    fprintf(pStdErr, "%s: error: failed to convert '%s' ('%s') to a file descriptor\n", name(argv[0]), psz, argv[i]);
                     return 1;
             }
@@ -368 +382 @@
                 if (*psz != ':' && *psz != '=')
                 {
-                    fprintf(pStdErr, "%s: syntax error: characters following the file descriptor: '%s' ('%s')\n", argv[0], psz, argv[i]);
+                    fprintf(pStdErr, "%s: syntax error: characters following the file descriptor: '%s' ('%s')\n", name(argv[0]), psz, argv[i]);
                     return 1;
                 }
@@ -378 +392 @@
                 if (i >= argc)
                 {
-                    fprintf(pStdErr, "%s: syntax error: missing filename argument.\n", argv[0]);
+                    fprintf(pStdErr, "%s: syntax error: missing filename argument.\n", name(argv[0]));
                     return 1;
                 }
@@ -397 +411 @@
                 if (fdOpened == -1)
                 {
-                    fprintf(pStdErr, "%s: error: failed to dup stderr (%d): %s\n", argv[0], fileno(pStdErr), strerror(errno));
+                    fprintf(pStdErr, "%s: error: failed to dup stderr (%d): %s\n", name(argv[0]), fileno(pStdErr), strerror(errno));
                     return 1;
                 }
@@ -407 +421 @@
                 if (fcntl(fdOpened, F_SETFD, FD_CLOEXEC) == -1)
                 {
-                    fprintf(pStdErr, "%s: error: failed to make stderr (%d) close-on-exec: %s\n", argv[0], fdOpened, strerror(errno));
+                    fprintf(pStdErr, "%s: error: failed to make stderr (%d) close-on-exec: %s\n", name(argv[0]), fdOpened, strerror(errno));
                     return 1;
                 }
@@ -415 +429 @@
                 if (!pNew)
                 {
-                    fprintf(pStdErr, "%s: error: failed to fdopen the new stderr (%d): %s\n", argv[0], fdOpened, strerror(errno));
+                    fprintf(pStdErr, "%s: error: failed to fdopen the new stderr (%d): %s\n", name(argv[0]), fdOpened, strerror(errno));
                     return 1;
                 }
@@ -436 +450 @@
             if (fdOpened == -1)
             {
-                fprintf(pStdErr, "%s: error: failed to open '%s' as %d: %s\n", argv[0], psz, fd, strerror(errno));
+                fprintf(pStdErr, "%s: error: failed to open '%s' as %d: %s\n", name(argv[0]), psz, fd, strerror(errno));
                 return 1;
             }
@@ -444 +458 @@
                 if (dup2(fdOpened, fd) == -1)
                 {
-                    fprintf(pStdErr, "%s: error: failed to dup '%s' as %d: %s\n", argv[0], psz, fd, strerror(errno));
+                    fprintf(pStdErr, "%s: error: failed to dup '%s' as %d: %s\n", name(argv[0]), psz, fd, strerror(errno));
                     return 1;
                 }
@@ -452 +466 @@
         else
         {
-            fprintf(pStdErr, "%s: syntax error: Invalid argument '%s'.\n", argv[0], argv[i]);
-            return usage(pStdErr, argv[0]);
+            fprintf(pStdErr, "%s: syntax error: Invalid argument '%s'.\n", name(argv[0]), argv[i]);
+            return usage(pStdErr, name(argv[0]));
         }
     }
@@ -462 +476 @@
     if (i >= argc)
     {
-        fprintf(pStdErr, "%s: syntax error: nothing to execute!\n", argv[0]);
-        return usage(pStdErr, argv[0]);
+        fprintf(pStdErr, "%s: syntax error: nothing to execute!\n", name(argv[0]));
+        return usage(pStdErr, name(argv[0]));
     }
 
 #if defined(_MSC_VER)
+    if (fileno(pStdErr) != 2) /* no close-on-exec flag on windows */
+    {
+        fclose(pStdErr);
+        pStdErr = NULL;
+    }
+
     /** @todo
      * We'll have to find the '--' in the commandline and pass that
@@ -472 +492 @@
      * is gonna be messed up.
      */
-    if (fileno(pStdErr) != 2)
-        fclose(pStdErr);
     rc = _spawnvp(_P_WAIT, argv[i], &argv[i]);
-    if (rc == -1 && fileno(pStdErr) != 2)
+    if (rc == -1 && pStdErr)
     {
-        fprintf(pStdErr, "%s: error: _spawnvp(_P_WAIT,%s,..) failed: %s\n", argv[0], argv[i], strerror(errno));
+        fprintf(pStdErr, "%s: error: _spawnvp(_P_WAIT, \"%s\", ...) failed: %s\n", name(argv[0]), argv[i], strerror(errno));
         rc = 1;
     }
@@ -483 +501 @@
 #else
     execvp(argv[i], &argv[i]);
+    fprintf(pStdErr, "%s: error: _execvp(_P_WAIT, \"%s\", ...) failed: %s\n", name(argv[0]), argv[i], strerror(errno));
     return 1;
 #endif