Changeset 3219 for trunk/src/kmk/kmkbuiltin/install.c

Timestamp:

Mar 31, 2018, 12:30:15 AM (7 years ago)

Author:

bird

Message:

kmkbuiltin: Added KMK_OPEN_NO_INHERIT to all open calls.

File:

• trunk/src/kmk/kmkbuiltin/install.c (modified) (5 diffs)

trunk/src/kmk/kmkbuiltin/install.c

@@ -551 +551 @@
         }
 
-        if (!devnull && (from_fd = open(from_name, O_RDONLY | O_BINARY, 0)) < 0)
+        if (!devnull && (from_fd = open(from_name, O_RDONLY | O_BINARY | KMK_OPEN_NO_INHERIT, 0)) < 0)
                 return err(pThis->pCtx, EX_OSERR, "%s", from_name);
 
         /* If we don't strip, we can compare first. */
         if (pThis->docompare && !pThis->dostrip && target) {
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY | KMK_OPEN_NO_INHERIT, 0)) < 0) {
                         rc = err(pThis->pCtx, EX_OSERR, "%s", to_name);
                         goto l_done;
@@ -613 +613 @@
                 close(to_fd);
 #endif
-                to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY | O_BINARY, 0);
+                to_fd = open(tempcopy ? tempfile : to_name, O_RDONLY | O_BINARY | KMK_OPEN_NO_INHERIT, 0);
                 if (to_fd < 0) {
                         rc = err(pThis->pCtx, EX_OSERR, "stripping %s", to_name);
@@ -627 +627 @@
 
                 /* Re-open to_fd using the real target name. */
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY | KMK_OPEN_NO_INHERIT, 0)) < 0) {
                         rc = err(pThis->pCtx, EX_OSERR, "%s", to_name);
                         goto l_done;
@@ -707 +707 @@
                 /* Re-open to_fd so we aren't hosed by the rename(2). */
                 (void) close(to_fd);
-                if ((to_fd = open(to_name, O_RDONLY | O_BINARY, 0)) < 0) {
+                if ((to_fd = open(to_name, O_RDONLY | O_BINARY | KMK_OPEN_NO_INHERIT, 0)) < 0) {
                         rc = err(pThis->pCtx, EX_OSERR, "%s", to_name);
                         goto l_done;
@@ -913 +913 @@
         }
 
-        newfd = open(path, O_CREAT | O_RDWR | O_TRUNC | O_BINARY, S_IRUSR | S_IWUSR);
+        newfd = open(path, O_CREAT | O_RDWR | O_TRUNC | O_BINARY | KMK_OPEN_NO_INHERIT, S_IRUSR | S_IWUSR);
         if (newfd < 0 && saved_errno != 0)
                 errno = saved_errno;