Changeset 2642 in kBuild

Timestamp:

Sep 9, 2012 2:03:12 AM (12 years ago)

Author:

bird

Message:

kash: Correct hash bang self to match kmk_ash, kmk_sh, kash and sh. Also increased the number of new arguments to 16 (from 5).

File:

• trunk/src/kash/exec.c (modified) (2 diffs)

trunk/src/kash/exec.c

@@ -240 +240 @@
  */
 
-#define NEWARGS 5
+#define NEWARGS 16
 
 STATIC void
@@ -276 +276 @@
                 *ap++ = grabstackstr(psh, outp);
         }
-        if (ap == newargs + 1) {        /* if no args, maybe no exec is needed */
-                p = newargs[0];
-                for (;;) {
-                        if (equal(p, "sh") || equal(p, "ash")) {
-                                TRACE((psh, "hash bang self\n"));
-                                return;
-                        }
-                        while (*p != '/') {
-                                if (*p == '\0')
-                                        goto break2;
-                                p++;
-                        }
-                        p++;
-                }
-break2:;
-        }
+
+        /* if no args, maybe shell and no exec is needed. */
+        if (ap == newargs + 1) {
+                p = strrchr(newargs[0], '/');
+                if (!p)
+                        p = newargs[0];
+                if (equal(p, "kmk_ash") || equal(p, "kmk_sh") || equal(p, "kash") || equal(p, "sh")) {
+                        TRACE((psh, "hash bang self\n"));
+                        return;
+                }
+        }
+
         i = (char *)ap - (char *)newargs;               /* size in bytes */
         if (i == 0)