Changeset 3186 in kBuild

Timestamp:

Mar 23, 2018 10:44:44 PM (7 years ago)

Author:

bird

Message:

kmk: replaced w32ify() as it uses unsafe static buffer and encourages buffer size assumptions.

Location:

trunk/src/kmk

Files:

• dir.c (modified) (2 diffs)
• function.c (modified) (1 diff)
• job.c (modified) (1 diff)
• main.c (modified) (5 diffs)
• w32/include/pathstuff.h (modified) (1 diff)
• w32/pathstuff.c (modified) (6 diffs)

trunk/src/kmk/dir.c

@@ -585 +585 @@
 
 #ifdef WINDOWS32
+          PATH_VAR (w32_fullpath);
           char *w32_path;
 #endif
@@ -593 +594 @@
           dc_key.dev = st.st_dev;
 #ifdef WINDOWS32
+          w32_path = unix_slashes_resolved (name, w32_fullpath, GET_PATH_MAX);
 # ifndef CONFIG_WITH_STRCACHE2
-          dc_key.path_key = w32_path = w32ify (name, 1);
+          dc_key.path_key = w32_path; /* = w32ify (name, 1); - bird */
 # else  /* CONFIG_WITH_STRCACHE2 */
-          w32_path = w32ify (name, 1);
-          dc_key.path_key = strcache_add (w32_path);
+          dc_key.path_key = strcache_add (w32_path);
 # endif /* CONFIG_WITH_STRCACHE2 */
-          dc_key.ctime = st.st_ctime;
+          dc_key.ctime = st.st_ctime;
 #else
 # ifdef VMS_INO_T

trunk/src/kmk/function.c

@@ -2876 +2876 @@
 
 #ifdef WINDOWS32                                                    /* bird */
-  dest = w32ify((char *)name, 1);
+  dest = unix_slashes_resolved (name, apath, GET_PATH_MAX);
   if (!dest)
     return NULL;
-  {
-  size_t len = strlen(dest);
-  memcpy(apath, dest, len);
-  dest = apath + len;
-  }
+  dest = strchr(apath, '\0');
 
   (void)end; (void)start; (void)apath_limit;

trunk/src/kmk/job.c

@@ -3830 +3830 @@
     if (shell)
       {
+# if 1 /* bird */
+        unix_slashes (shell);
+# else
         char *p = w32ify (shell, 0);
         strcpy (shell, p);
+# endif
       }
 #endif

trunk/src/kmk/main.c

@@ -1242 +1242 @@
       batch_mode_shell = 1;
       unixy_shell = 0;
+# if 1  /* bird: sprintf? wtf. */
+      default_shell = unix_slashes (xstrdup (search_token));
+# else
       sprintf (sh_path, "%s", search_token);
       default_shell = xstrdup (w32ify (sh_path, 0));
+# endif
       DB (DB_VERBOSE, (_("find_and_set_shell() setting default_shell = %s\n"),
                        default_shell));
@@ -1257 +1261 @@
     {
       /* search token path was found */
+# if 1  /* bird: sprintf? wtf. */
+      default_shell = unix_slashes (xstrdup (search_token));
+# else
       sprintf (sh_path, "%s", search_token);
       default_shell = xstrdup (w32ify (sh_path, 0));
+# endif
       DB (DB_VERBOSE, (_("find_and_set_shell() setting default_shell = %s\n"),
                        default_shell));
@@ -1280 +1288 @@
               *ep = '\0';
 
+# if 1 /* bird: insanity insurance */
+              _snprintf (sh_path, GET_PATH_MAX, "%s/%s", p, search_token);
+# else
               sprintf (sh_path, "%s/%s", p, search_token);
+# endif
               if (_access (sh_path, 0) == 0)
                 {
+# if 1  /* bird: we can modify sh_path directly. */
+                  default_shell = xstrdup (unix_slashes (sh_path));
+# else
                   default_shell = xstrdup (w32ify (sh_path, 0));
+# endif
                   sh_found = 1;
                   *ep = PATH_SEPARATOR_CHAR;
@@ -1302 +1318 @@
           if (p && *p)
             {
+# if 1 /* bird: insanity insurance */
+              _snprintf (sh_path, GET_PATH_MAX, "%s/%s", p, search_token);
+# else
               sprintf (sh_path, "%s/%s", p, search_token);
+# endif
               if (_access (sh_path, 0) == 0)
                 {
+# if 1  /* bird: we can modify sh_path directly. */
+                  default_shell = xstrdup (unix_slashes (sh_path));
+# else
                   default_shell = xstrdup (w32ify (sh_path, 0));
+# endif
                   sh_found = 1;
                 }
@@ -2130 +2154 @@
   if (strpbrk (argv[0], "/:\\") || strstr (argv[0], "..")
       || strneq (argv[0], "//", 2))
-    argv[0] = xstrdup (w32ify (argv[0], 1));
+# if 1  /* bird */
+    {
+      PATH_VAR (tmp_path_buf);
+      argv[0] = xstrdup (unix_slashes_resolved (argv[0], tmp_path_buf,
+                                                GET_PATH_MAX));
+    }
+# else  /* bird */
+      //argv[0] = xstrdup (w32ify (argv[0], 1));
+# endif /* bird */
 #else /* WINDOWS32 */
 #if defined (__MSDOS__) || defined (__EMX__)

trunk/src/kmk/w32/include/pathstuff.h

@@ -20 +20 @@
 char *convert_Path_to_windows32(char *Path, char to_delim);
 char *convert_vpath_to_windows32(char *Path, char to_delim);
+#if 1
+char *unix_slashes(char *filename); /* bird */
+char *unix_slashes_resolved(const char *src, char *dst, unsigned len); /* bird */
+#else
 char *w32ify(const char *filename, int resolve);
+#endif
 char *getcwd_fs(char *buf, int len);
 

trunk/src/kmk/w32/pathstuff.c

@@ -21 +21 @@
 #if 1 /* bird */
 # include "nt_fullpath.h"
+# include <assert.h>
 #endif
 
@@ -95 +96 @@
 
 /*
+ * Convert to forward slashes directly (w32ify(filename, 0)).
+ */
+char *unix_slashes(char *filename) /* bird */
+{
+    char *slash = filename ;
+    while ((slash = strchr(slash, '\\')) != NULL)
+        *slash++ = '/';
+    return filename;
+}
+
+/*
+ * Resolve and convert to forward slashes directly (w32ify(filename, 1)).
+ * Returns if out of buffer space.
+ */
+char *unix_slashes_resolved(const char *src, char *dst, unsigned len)
+{
+    assert(len >= FILENAME_MAX);
+    *dst = '\0'; /** @todo nt_fullpath_cached needs to return some indication of overflow. */
+#if 1
+    nt_fullpath_cached(src, dst, len);
+#else
+    _fullpath(dst, src, len);
+#endif
+
+    return unix_slashes(dst);
+}
+
+#if 0 /* bird: replaced by unix_slashes and unix_slahes_resolved. */
+/*
  * Convert to forward slashes. Resolve to full pathname optionally
  */
@@ -101 +131 @@
 {
     static char w32_path[FILENAME_MAX];
-    char *p;
-
 #if 1 /* bird */
+
     if (resolve) {
         nt_fullpath_cached(filename, w32_path, sizeof(w32_path));
@@ -110 +139 @@
         strncat(w32_path, filename, sizeof(w32_path));
     }
+    return unix_slashes(w32_path);
+
 #else   /* !bird */
+    char *p;
+
     if (resolve) {
         _fullpath(w32_path, filename, sizeof (w32_path));
     } else
         strncpy(w32_path, filename, sizeof (w32_path));
-#endif  /* !bird */
 
     for (p = w32_path; p && *p; p++)
@@ -122 +154 @@
 
     return w32_path;
-}
+#endif  /* !bird */
+}
+#endif
 
 char *
@@ -130 +164 @@
 
         if (p) {
+#if 1
+                p = unix_slashes(p);
+#else
                 char *q = w32ify(buf, 0);
 #if 1  /* bird - UPSTREAM? */
-                buf[0] = '\0';
-                strncat(buf, q, len);
+                buf[0] = '\0';
+                strncat(buf, q, len);
 #else  /* !bird */
                 strncpy(buf, q, len);
+#endif
 #endif
         }