Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/chown.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/chown.c (modified) (2 diffs)

branches/2.2.5/mindi-busybox/coreutils/chown.c

@@ -8 +8 @@
  */
 
-/* BB_AUDIT SUSv3 defects - unsupported options -h, -H, -L, and -P. */
-/* BB_AUDIT GNU defects - unsupported options -h, -c, -f, -v, and long options. */
-/* BB_AUDIT Note: gnu chown does not support -H, -L, or -P. */
+/* BB_AUDIT SUSv3 defects - none? */
+/* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chown.html */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include "busybox.h"
+#include "libbb.h"
 
-static uid_t uid = -1;
-static gid_t gid = -1;
+/* This is a NOEXEC applet. Be very careful! */
 
-static int (*chown_func)(const char *, uid_t, gid_t) = chown;
+
+#define OPT_STR     ("Rh" USE_DESKTOP("vcfLHP"))
+#define BIT_RECURSE 1
+#define OPT_RECURSE (option_mask32 & 1)
+#define OPT_NODEREF (option_mask32 & 2)
+#define OPT_VERBOSE (USE_DESKTOP(option_mask32 & 0x04) SKIP_DESKTOP(0))
+#define OPT_CHANGED (USE_DESKTOP(option_mask32 & 0x08) SKIP_DESKTOP(0))
+#define OPT_QUIET   (USE_DESKTOP(option_mask32 & 0x10) SKIP_DESKTOP(0))
+/* POSIX options
+ * -L traverse every symbolic link to a directory encountered
+ * -H if a command line argument is a symbolic link to a directory, traverse it
+ * -P do not traverse any symbolic links (default)
+ * We do not conform to the following:
+ * "Specifying more than one of -H, -L, and -P is not an error.
+ * The last option specified shall determine the behavior of the utility." */
+/* -L */
+#define BIT_TRAVERSE 0x20
+#define OPT_TRAVERSE (USE_DESKTOP(option_mask32 & BIT_TRAVERSE) SKIP_DESKTOP(0))
+/* -H or -L */
+#define BIT_TRAVERSE_TOP (0x20|0x40)
+#define OPT_TRAVERSE_TOP (USE_DESKTOP(option_mask32 & BIT_TRAVERSE_TOP) SKIP_DESKTOP(0))
+
+typedef int (*chown_fptr)(const char *, uid_t, gid_t);
+
+static struct bb_uidgid_t ugid = { -1, -1 };
 
 static int fileAction(const char *fileName, struct stat *statbuf,
-        void ATTRIBUTE_UNUSED *junk)
+        void *cf, int depth)
 {
-    if (!chown_func(fileName,
-                (uid == (uid_t)-1) ? statbuf->st_uid : uid,
-                (gid == (gid_t)-1) ? statbuf->st_gid : gid)) {
+    uid_t u = (ugid.uid == (uid_t)-1) ? statbuf->st_uid : ugid.uid;
+    gid_t g = (ugid.gid == (gid_t)-1) ? statbuf->st_gid : ugid.gid;
+
+    if (!((chown_fptr)cf)(fileName, u, g)) {
+        if (OPT_VERBOSE
+         || (OPT_CHANGED && (statbuf->st_uid != u || statbuf->st_gid != g))
+        ) {
+            printf("changed ownership of '%s' to %u:%u\n",
+                    fileName, (unsigned)u, (unsigned)g);
+        }
         return TRUE;
     }
-    bb_perror_msg("%s", fileName);  /* A filename could have % in it... */
+    if (!OPT_QUIET)
+        bb_perror_msg("%s", fileName);  /* A filename can have % in it... */
     return FALSE;
 }
 
-#define FLAG_R 1
-#define FLAG_h 2
-
+int chown_main(int argc, char **argv);
 int chown_main(int argc, char **argv)
 {
+    int retval = EXIT_SUCCESS;
     int flags;
-    int retval = EXIT_SUCCESS;
-    char *groupName;
+    chown_fptr chown_func;
 
-    flags = bb_getopt_ulflags(argc, argv, "Rh");
+    opt_complementary = "-2";
+    getopt32(argv, OPT_STR);
+    argv += optind;
 
-    if (flags & FLAG_h) chown_func = lchown;
-
-    if (argc - optind < 2) {
-        bb_show_usage();
+    /* This matches coreutils behavior (almost - see below) */
+    chown_func = chown;
+    if (OPT_NODEREF
+        /* || (OPT_RECURSE && !OPT_TRAVERSE_TOP): */
+        USE_DESKTOP( || (option_mask32 & (BIT_RECURSE|BIT_TRAVERSE_TOP)) == BIT_RECURSE)
+    ) {
+        chown_func = lchown;
     }
 
-    argv += optind;
+    flags = ACTION_DEPTHFIRST; /* match coreutils order */
+    if (OPT_RECURSE)
+        flags |= ACTION_RECURSE;
+    if (OPT_TRAVERSE_TOP)
+        flags |= ACTION_FOLLOWLINKS_L0; /* -H/-L: follow links on depth 0 */
+    if (OPT_TRAVERSE)
+        flags |= ACTION_FOLLOWLINKS; /* follow links if -L */
 
-    /* First, check if there is a group name here */
-    if ((groupName = strchr(*argv, '.')) == NULL) {
-        groupName = strchr(*argv, ':');
-    }
-
-    /* Check for the username and groupname */
-    if (groupName) {
-        *groupName++ = '\0';
-        gid = get_ug_id(groupName, bb_xgetgrnam);
-    }
-    if (--groupName != *argv) uid = get_ug_id(*argv, bb_xgetpwnam);
-    ++argv;
+    parse_chown_usergroup_or_die(&ugid, argv[0]);
 
     /* Ok, ready to do the deed now */
+    argv++;
     do {
-        if (! recursive_action (*argv, (flags & FLAG_R), FALSE, FALSE,
-                                fileAction, fileAction, NULL)) {
+        if (!recursive_action(*argv,
+                flags,          /* flags */
+                fileAction,     /* file action */
+                fileAction,     /* dir action */
+                chown_func,     /* user data */
+                0)              /* depth */
+        ) {
             retval = EXIT_FAILURE;
         }
@@ -77 +108 @@
     return retval;
 }
+
+/*
+Testcase. Run in empty directory.
+
+#!/bin/sh
+t1="/tmp/busybox chown"
+t2="/usr/bin/chown"
+create() {
+    rm -rf $1; mkdir $1
+    (
+    cd $1 || exit 1
+    mkdir dir dir2
+    >up
+    >file
+    >dir/file
+    >dir2/file
+    ln -s dir linkdir
+    ln -s file linkfile
+    ln -s ../up dir/linkup
+    ln -s ../dir2 dir/linkupdir2
+    )
+    chown -R 0:0 $1
+}
+tst() {
+    create test1
+    create test2
+    echo "[$1]" >>test1.out
+    echo "[$1]" >>test2.out
+    (cd test1; $t1 $1) >>test1.out 2>&1
+    (cd test2; $t2 $1) >>test2.out 2>&1
+    (cd test1; ls -lnR) >out1
+    (cd test2; ls -lnR) >out2
+    echo "chown $1" >out.diff
+    if ! diff -u out1 out2 >>out.diff; then exit 1; fi
+    rm out.diff
+}
+tst_for_each() {
+    tst "$1 1:1 file"
+    tst "$1 1:1 dir"
+    tst "$1 1:1 linkdir"
+    tst "$1 1:1 linkfile"
+}
+echo "If script produced 'out.diff' file, then at least one testcase failed"
+>test1.out
+>test2.out
+# These match coreutils 6.8:
+tst_for_each "-v"
+tst_for_each "-vR"
+tst_for_each "-vRP"
+tst_for_each "-vRL"
+tst_for_each "-vRH"
+tst_for_each "-vh"
+tst_for_each "-vhR"
+tst_for_each "-vhRP"
+tst_for_each "-vhRL"
+tst_for_each "-vhRH"
+# Fix `name' in coreutils output
+sed 's/`/'"'"'/g' -i test2.out
+# Compare us with coreutils output
+diff -u test1.out test2.out
+
+*/