Changeset 3389 for trunk/src/kmk/kmkbuiltin/cp.c

Timestamp:

Jun 26, 2020, 7: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.

File:

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

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)