Changeset 3656 in kBuild

Timestamp:

Nov 4, 2024 1:56:03 AM (5 months ago)

Author:

bird

Message:

kmk/job.c: Deal with escape sequences inside double quotes when we're using kmk_ash. Simplified some windo32 special double-quote handling, some of which looks bogus. Shut up warning. Classify kmk_ash and kmk_kash as bourne shells.

File:

• trunk/src/kmk/job.c (modified) (4 diffs)

trunk/src/kmk/job.c

@@ -442 +442 @@
   /* List of known POSIX (or POSIX-ish) shells.  */
   static const char *unix_shells[] = {
+#ifdef KMK
+    "kmk_ash",
+    "kmk_kash",
+#endif
     "sh",
     "bash",
@@ -1780 +1784 @@
         for (i = 0; argv[i]; i++)
           fprintf (stderr, "%s ", argv[i]);
-        fprintf (stderr, "\n", argv[i]);
+        fprintf (stderr, "\n");
         goto error;
       }
@@ -3095 +3099 @@
              But on MSDOS, if we use COMMAND.COM, double and single
              quotes have the same effect.  */
+#ifdef KMK
+          else if (instring == '"' && unixy_shell && *p == '\\')
+            {
+              /* If kmk_ash, allow simple escape sequence: \", \\, \$, \` */
+              char const ch2 = p[1];
+              if (is_kmk_shell
+               && (   ch2 == '\"'
+                   || ch2 == '\\'
+                   || ch2 == '$'
+                   || ch2 == '`'))
+                *ap++ = *++p;
+              else
+                goto slow;
+            }
+          else if (instring == '"' && unixy_shell && (*p == '$' || *p == '`'))
+            goto slow;
+# ifdef WINDOWS32
+          /* Quoted wildcard characters must be passed quoted to the
+             command, so give up the fast route.  */
+          else if (instring == '"' && !unixy_shell && (*p == '*' || *p == '?'))
+            goto slow;
+          else if (instring == '"' && !unixy_shell && p[0] == '\\' && p[1] == '"') /* bird: this smells */
+            *ap++ = *++p;
+# endif
+#else /* !KMK */
           else if (instring == '"' && strchr ("\\$`", *p) != 0 && unixy_shell)
             goto slow;
@@ -3105 +3134 @@
             *ap++ = *++p;
 #endif
+#endif /* !KMK */
           else
             *ap++ = *p;