Changeset 1298 in kBuild

Timestamp:

Dec 1, 2007 8:11:25 PM (17 years ago)

Author:

bird

Message:

better check for the kmk shell. don't freak out and use the shell on double-quote (probably a bug).

Location:

trunk/src/kmk

Files:

• job.c (modified) (5 diffs)
• kbuild.c (modified) (6 diffs)
• kbuild.h (modified) (1 diff)

trunk/src/kmk/job.c

@@ -29 +29 @@
 #ifdef CONFIG_WITH_KMK_BUILTIN
 # include "kmkbuiltin.h"
+#endif
+#ifdef KMK
+# include "kbuild.h"
 #endif
 
@@ -2522 +2525 @@
   static char *sh_cmds[] = { 0 };
 #else  /* must be UNIX-ish */
-  static char sh_chars[] = "#;\"*?[]&|<>(){}$`^~!";
-  static char *sh_cmds[] = { ".", ":", "break", "case", "cd", "continue",
+  static char sh_chars_sh[] = "#;\"*?[]&|<>(){}$`^~!";                          /* kmk: +_sh */
+  static char *sh_cmds_sh[] = { ".", ":", "break", "case", "cd", "continue",    /* kmk: +_sh */
                              "eval", "exec", "exit", "export", "for", "if",
                              "login", "logout", "read", "readonly", "set",
@@ -2534 +2537 @@
   static char *sh_chars_sh = sh_chars;
 # endif  /* HAVE_DOS_PATHS */
+# ifdef KMK
+  char*  sh_chars = sh_chars_sh;
+  char** sh_cmds = sh_cmds_sh;
+# endif
+#endif
+#ifdef KMK
+  static char sh_chars_kash[] = "#;*?[]&|<>(){}$`^~!";                          /* note: no \" */
+  static char *sh_cmds_kash[] = {
+      ".", ":", "break", "case", "cd", "continue",
+      "echo", "eval", "exec", "exit", "export", "for", "if",
+      "login", "logout", "read", "readonly", "set",
+      "shift", "switch", "test", "times", "trap",
+      "umask", "wait", "while", 0
+  };
+  int is_kmk_shell = 0;
 #endif
   int i;
@@ -2564 +2582 @@
 
   /* See if it is safe to parse commands internally.  */
+#ifdef KMK /* kmk_ash and kmk_kash are both fine, kmk_ash is the default btw. */
+  if (shell == 0)
+    {
+      is_kmk_shell = 1;
+      shell = (char *)get_default_kbuild_shell ();
+    }
+  else if (!strcmp (shell, get_default_kbuild_shell()))
+    is_kmk_shell = 1;
+  else
+    {
+      const char *psz = strstr (shell, "/kmk_ash");
+      if (psz)
+        psz += sizeof ("/kmk_ash") - 1;
+      else
+        {
+          psz = strstr (shell, "/kmk_kash");
+          if (psz)
+            psz += sizeof ("/kmk_kash") - 1;
+        }
+# if defined (__OS2__) || defined (_WIN32) || defined (WINDOWS32)
+      is_kmk_shell = psz && (*psz == '\0' || !stricmp (psz, ".exe"));
+# else
+      is_kmk_shell = psz && *psz == '\0';
+# endif
+    }
+  if (is_kmk_shell)
+    {
+      sh_chars = sh_chars_kash;
+      sh_cmds = sh_cmds_kash;
+    }
+#else /* !KMK */
   if (shell == 0)
     shell = default_shell;
+#endif /* !KMK */
 #ifdef WINDOWS32
   else if (strcmp (shell, default_shell))
@@ -2613 +2663 @@
 #else  /* !__MSDOS__ */
   else if (strcmp (shell, default_shell))
-# ifndef KMK
     goto slow;
-# else /* KMK */
-    {
-      /* Allow ash from kBuild. */
-      const char *psz = strstr(shell, "/kmk_ash");
-      if (   !psz
-          || (!psz[sizeof("/kmk_ash")] && psz[sizeof("/kmk_ash")] == '.')) /* FIXME: this test looks bogus... */
-        goto slow;
-    }
-# endif  /* KMK */
 #endif /* !__MSDOS__ && !__EMX__ */
 #endif /* not WINDOWS32 */

trunk/src/kmk/kbuild.c

@@ -134 +134 @@
             szTmp[rc] = '\0';
     }
-    
+
 #elif defined(WINDOWS32)
     if (GetModuleFileName(GetModuleHandle(NULL), szTmp, GET_PATH_MAX))
@@ -167 +167 @@
                     break;
                 }
-            }    
+            }
 
             /* next */
@@ -176 +176 @@
         free(pszCopy);
     }
-#endif        
+#endif
 
     if (rc < 0)
@@ -204 +204 @@
  * Determin the PATH_KBUILD value.
  *
- * @returns Pointer to static buffer to be treated as read only!
+ * @returns Pointer to static a buffer containing the value (consider it read-only).
  */
 const char *get_path_kbuild(void)
@@ -236 +236 @@
  * Determin the PATH_KBUILD_BIN value.
  *
- * @returns Pointer to static buffer to be treated as read only!
+ * @returns Pointer to static a buffer containing the value (consider it read-only).
  */
 const char *get_path_kbuild_bin(void)
@@ -276 +276 @@
 }
 
+
+/**
+ * Determin the location of default kBuild shell.
+ *
+ * @returns Pointer to static a buffer containing the location (consider it read-only).
+ */
+const char *get_default_kbuild_shell(void)
+{
+    static char *s_pszDefaultShell = NULL;
+    if (!s_pszDefaultShell)
+      {
+#if defined(__OS2__) || defined(_WIN32) || defined(WINDOWS32)
+        static const char s_szShellName[] = "/kmk_ash.exe";
+#else
+        static const char s_szShellName[] = "/kmk_ash";
+#endif
+        const char *pszBin = get_path_kbuild_bin();
+        size_t cchBin = strlen(pszBin);
+        s_pszDefaultShell = xmalloc(cchBin + sizeof(s_szShellName));
+        memcpy(s_pszDefaultShell, pszBin, cchBin);
+        memcpy(&s_pszDefaultShell[cchBin], s_szShellName, sizeof(s_szShellName));
+      }
+    return s_pszDefaultShell;
+}
 
 #ifdef KMK_HELPERS

trunk/src/kmk/kbuild.h

@@ -37 +37 @@
 const char *get_path_kbuild(void);
 const char *get_path_kbuild_bin(void);
+const char *get_default_kbuild_shell(void);
 
 #endif