Changeset 1730 in kBuild for trunk/src/kmk/kmkbuiltin/install.c

Timestamp:

Sep 5, 2008 4:24:19 AM (16 years ago)

Author:

bird

Message:

kmk_install: --[no-]ignore-perm-errors on chmod and chown. This defaults to true unless we're root.

File:

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

trunk/src/kmk/kmkbuiltin/install.c

@@ -125 +125 @@
 static mode_t mode = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH;
 static const char *suffix = BACKUP_SUFFIX;
+static int ignore_perm_errors;
 
 static struct option long_options[] =
@@ -130 +131 @@
     { "help",                                           no_argument, 0, 261 },
     { "version",                                        no_argument, 0, 262 },
+    { "ignore-perm-errors",                             no_argument, 0, 263 },
+    { "no-ignore-perm-errors",                          no_argument, 0, 264 },
     { 0, 0,     0, 0 },
 };
@@ -149 +152 @@
 
 int
-kmk_builtin_install(int argc, char *argv[], char **envp)
+kmk_builtin_install(int argc, char *argv[], char ** envp)
 {
         struct stat from_sb, to_sb;
@@ -158 +161 @@
         char *flags;
         const char *group, *owner, *to_name;
+        (void)envp;
 
         /* reinitialize globals */
@@ -165 +169 @@
         uid = 0;
         dobackup = docompare = dodir = dopreserve = dostrip = nommap = safecopy = verbose = 0;
+        ignore_perm_errors = geteuid() != 0;
 
         /* reset getopt and set progname. */
@@ -235 +240 @@
                 case 262:
                         return kbuild_version(argv[0]);
+                case 263:
+                        ignore_perm_errors = 1;
+                        break;
+                case 264:
+                        ignore_perm_errors = 0;
+                        break;
                 case '?':
                 default:
@@ -614 +625 @@
             (uid != (uid_t)-1 && uid != to_sb.st_uid))
                 if (fchown(to_fd, uid, gid) == -1) {
-                        serrno = errno;
-                        (void)unlink(to_name);
-                        errno = serrno;
-                        rc = err(EX_OSERR,"%s: chown/chgrp", to_name);
-                        goto l_done;
+                        if (errno == EPERM && ignore_perm_errors) {
+                                warn("%s: ignoring chown uid=%d gid=%d failure", to_name, (int)uid, (int)gid);
+                        } else {
+                                serrno = errno;
+                                (void)unlink(to_name);
+                                errno = serrno;
+                                rc = err(EX_OSERR,"%s: chown/chgrp", to_name);
+                                goto l_done;
+                        }
                 }
 
@@ -624 +639 @@
                 if (fchmod(to_fd, mode)) {
                         serrno = errno;
-                        (void)unlink(to_name);
-                        errno = serrno;
-                        rc = err(EX_OSERR, "%s: chmod", to_name);
-                        goto l_done;
+                        if (serrno == EPERM && ignore_perm_errors) {
+                                fchmod(to_fd, mode & (ALLPERMS & ~0007000));
+                                errno = errno;
+                                warn("%s: ignoring chmod 0%o failure", to_name, (int)(mode & ALLPERMS));
+                        } else  {
+                                serrno = errno;
+                                (void)unlink(to_name);
+                                errno = serrno;
+                                rc = err(EX_OSERR, "%s: chmod", to_name);
+                                goto l_done;
+                        }
                 }
 
@@ -843 +865 @@
         }
 #else
-        (void)p;
+        (void)p; (void)size;
 #endif
         if (!done_copy) {
@@ -949 +971 @@
 usage(FILE *pf)
 {
-        fprintf(stderr,
-"usage: %s [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
-"           [-o owner] file1 file2\n"
-"   or: %s [-bCcpSsv] [-B suffix] [-f flags] [-g group] [-m mode]\n"
-"           [-o owner] file1 ... fileN directory\n"
+        fprintf(pf,
+"usage: %s [-bCcpSsv] [--[no-]ignore-perm-errors] [-B suffix] [-f flags]\n"
+"            [-g group] [-m mode] [-o owner] file1 file2\n"
+"   or: %s [-bCcpSsv] [--[no-]ignore-perm-errors] [-B suffix] [-f flags]\n"
+"            [-g group] [-m mode] [-o owner] file1 ... fileN directory\n"
 "   or: %s -d [-v] [-g group] [-m mode] [-o owner] directory ...\n"
 "   or: %s --help\n"