Changeset 3389 in kBuild for trunk/src

Timestamp:

Jun 26, 2020 5:16:26 PM (5 years ago)

Author:

bird

Message:

kmk: Avoid setting umask just to get it, store the current value in a global variable (g_fUMask). The umask(0777) call in cp.c raced other code (kmk_append) that created files and directories, leaving us with read-only files sometimes.

Location:

trunk/src/kmk

Files:

• function.c (modified) (2 diffs)
• kmkbuiltin.c (modified) (3 diffs)
• kmkbuiltin/chmod.c (modified) (1 diff)
• kmkbuiltin/cp.c (modified) (4 diffs)
• kmkbuiltin/install.c (modified) (1 diff)
• kmkbuiltin/mkdir.c (modified) (6 diffs)
• kmkbuiltin/setmode.c (modified) (2 diffs)
• main.c (modified) (2 diffs)
• makeint.h (modified) (1 diff)

trunk/src/kmk/function.c

@@ -5665 +5665 @@
     }
 
-  u = umask (002);
-  umask (u);
+  u = g_fUMask;
+  assert (u == umask (g_fUMask));
 
   if (symbolic)
@@ -5734 +5734 @@
       if (argv[1] != NULL)
           OS (error, reading_file, _("$(%s ) too many arguments for octal mode"), funcname);
+
+      umask (u);
+      g_fUMask = u;
   }
   else
   {
-      u = umask(0);
-      umask(u);
       OS (error, reading_file, _("$(%s ) symbol mode is not implemented"), funcname);
   }
-
-  umask(u);
 
   return o;

trunk/src/kmk/kmkbuiltin.c

@@ -402 +402 @@
                 {
                     /*
-                     * Call the worker function, making sure to preserve umask.
+                     * Call the worker function.
                      */
 #ifdef CONFIG_WITH_KMK_BUILTIN_STATS
@@ -408 +408 @@
 #endif
                     KMKBUILTINCTX Ctx;
-                    int const iUmask = umask(0);        /* save umask */
-                    umask(iUmask);
+                    assert(g_fUMask == umask(g_fUMask));
 
                     Ctx.pszProgName = pEntry->uName.s.sz;
@@ -448 +447 @@
                         rc = 99;
 
-                    umask(iUmask);                      /* restore it */
+                    assert(g_fUMask == umask(g_fUMask)); /* builtin command must preserve umask! */
 
 #ifdef CONFIG_WITH_KMK_BUILTIN_STATS

trunk/src/kmk/kmkbuiltin/chmod.c

@@ -278 +278 @@
 
 #ifdef KMK_BUILTIN_STANDALONE
+mode_t g_fUMask;
 int main(int argc, char **argv, char **envp)
 {
     KMKBUILTINCTX Ctx = { "kmk_chmod", NULL };
+    umask(g_fUMask = umask(0077));
     return kmk_builtin_chmod(argc, argv, envp, &Ctx);
 }

trunk/src/kmk/kmkbuiltin/cp.c

@@ -69 +69 @@
 #include <sys/stat.h>
 
+#include <assert.h>
 #include "err.h"
 #include <errno.h>
@@ -175 +176 @@
 volatile sig_atomic_t g_cp_info;
 #endif
+
+extern mode_t g_fUMask;
 
 
@@ -423 +426 @@
 
 #ifdef KMK_BUILTIN_STANDALONE
+mode_t g_fUMask;
 int main(int argc, char **argv, char **envp)
 {
     KMKBUILTINCTX Ctx = { "kmk_cp", NULL };
+    umask(g_fUMask = umask(0077));
     return kmk_builtin_cp(argc, argv, envp, &Ctx);
 }
@@ -445 +450 @@
          * permissions on created directories when not using -p.
          */
-        mask = ~umask(0777);
-        umask(~mask);
+        mask = g_fUMask;
+        assert(mask == umask(mask));
+        mask = ~mask;
 
         if ((ftsp = fts_open(argv, fts_options, mastercmp)) == NULL)

trunk/src/kmk/kmkbuiltin/install.c

@@ -396 +396 @@
 
 #ifdef KMK_BUILTIN_STANDALONE
+mode_t g_fUMask;
 int main(int argc, char **argv, char **envp)
 {
         KMKBUILTINCTX Ctx = { "kmk_install", NULL };
+        umask(g_fUMask = umask(0077));
         return kmk_builtin_install(argc, argv, envp, &Ctx);
 }

trunk/src/kmk/kmkbuiltin/mkdir.c

@@ -49 +49 @@
 #include "err.h"
 #include <errno.h>
+#include <assert.h>
 #ifndef _MSC_VER
 # include <libgen.h>
@@ -80 +81 @@
 };
 
+extern mode_t g_fUMask;
 
 extern void * bsd_setmode(const char *p);
@@ -167 +169 @@
 
 #ifdef KMK_BUILTIN_STANDALONE
+mode_t g_fUMask;
 int main(int argc, char **argv, char **envp)
 {
     KMKBUILTINCTX Ctx = { "kmk_mkdir", NULL };
+    umask(g_fUMask = umask(0077));
     return kmk_builtin_mkdir(argc, argv, envp, &Ctx);
 }
@@ -240 +244 @@
                          * instead of doing chmod's.
                          */
-                        oumask = umask(0);
+#ifdef KMK_BUILTIN_STANDALONE
+                        oumask = umask(0077);
+#else
+                        oumask = g_fUMask;
+                        assert(oumask == umask(g_fUMask));
+#endif
                         numask = oumask & ~(S_IWUSR | S_IXUSR);
-                        (void)umask(numask);
+                        if (numask != oumask)
+                            (void)umask(numask);
                         first = 0;
                 }
-                if (last)
+                if (last && oumask != numask)
                         (void)umask(oumask);
                 if (mkdir(path, last ? omode : S_IRWXU | S_IRWXG | S_IRWXO) < 0) {
@@ -255 +265 @@
                                         retval = 1;
                                         break;
-                                } else if (!S_ISDIR(sb.st_mode)) {
+                                }
+                                if (!S_ISDIR(sb.st_mode)) {
                                         if (last)
                                                 errno = EEXIST;
@@ -274 +285 @@
                     *p = '/';
         }
-        if (!first && !last)
+        if (!first && !last && oumask != numask)
                 (void)umask(oumask);
         return (retval);

trunk/src/kmk/kmkbuiltin/setmode.c

@@ -100 +100 @@
 #endif /* !S_ISTXT */
 
+extern mode_t g_fUMask; /* Initialize in main() and keep up to date. */
+
+
 /*
  * Given the old mode and an array of bitcmd structures, apply the operations
@@ -223 +226 @@
         (void)sigprocmask(SIG_BLOCK, &signset, &sigoset);
 #endif
-        (void)umask(mask = umask(0));
+        mask = g_fUMask;
+        assert(mask == umask(g_fUMask));
         mask = ~mask;
 #ifndef _MSC_VER

trunk/src/kmk/main.c

@@ -821 +821 @@
 struct output make_sync;
 
+#ifdef KMK
+/** Current umask() value. */
+mode_t g_fUMask = 0022;
+#endif
+
 
 
@@ -1769 +1774 @@
 #endif
 
+#ifdef KMK
+  /* Get the incoming umask so we don't have to modify it later to get it. */
+  umask(g_fUMask = umask(0077));
+#endif
+
 #ifdef CONFIG_NEW_WIN32_CTRL_EVENT
   /* bird: dispatch signals in our own way to try avoid deadlocks. */

trunk/src/kmk/makeint.h

@@ -1189 +1189 @@
 #endif
 
+#ifdef KMK
+/* main.c */
+extern mode_t g_fUMask;
+#endif