Changeset 1298 for trunk/src/kmk/kbuild.c

Timestamp:

Dec 1, 2007, 9:11:25 PM (18 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).

File:

• trunk/src/kmk/kbuild.c (modified) (6 diffs)

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