ls: add support for -H

[oweals/busybox.git] / coreutils / chmod.c

diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index 4abae2d515f42ca34e7786962494c6f8d07fdd67..f07a49bd3b0922efae9865d98fa875aefcb8123e 100644 (file)
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -7,20 +7,23 @@
  * Reworked by (C) 2002 Vladimir Oleynik <dzo@simtreas.ru>
  *  to correctly parse '-rwxgoa'
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* BB_AUDIT GNU defects - unsupported long options. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */
 
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOEXEC applet. Be very careful! */
+
 
 #define OPT_RECURSE (option_mask32 & 1)
-#define OPT_VERBOSE (USE_DESKTOP(option_mask32 & 2) SKIP_DESKTOP(0))
-#define OPT_CHANGED (USE_DESKTOP(option_mask32 & 4) SKIP_DESKTOP(0))
-#define OPT_QUIET   (USE_DESKTOP(option_mask32 & 8) SKIP_DESKTOP(0))
-#define OPT_STR     "R" USE_DESKTOP("vcf")
+#define OPT_VERBOSE (IF_DESKTOP(option_mask32 & 2) IF_NOT_DESKTOP(0))
+#define OPT_CHANGED (IF_DESKTOP(option_mask32 & 4) IF_NOT_DESKTOP(0))
+#define OPT_QUIET   (IF_DESKTOP(option_mask32 & 8) IF_NOT_DESKTOP(0))
+#define OPT_STR     "R" IF_DESKTOP("vcf")
 
 /* coreutils:
  * chmod never changes the permissions of symbolic links; the chmod
@@ -31,7 +34,7 @@
  * symbolic links encountered during recursive directory traversals.
  */
 
-static int fileAction(const char *fileName, struct stat *statbuf, void* junk, int depth)
+static int FAST_FUNC fileAction(const char *fileName, struct stat *statbuf, void* param, int depth)
 {
        mode_t newmode;
 
@@ -46,8 +49,8 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk, in
        }
        newmode = statbuf->st_mode;
 
-       if (!bb_parse_mode((char *)junk, &newmode))
-               bb_error_msg_and_die("invalid mode: %s", (char *)junk);
+       if (!bb_parse_mode((char *)param, &newmode))
+               bb_error_msg_and_die("invalid mode '%s'", (char *)param);
 
        if (chmod(fileName, newmode) == 0) {
                if (OPT_VERBOSE
@@ -60,11 +63,12 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk, in
        }
  err:
        if (!OPT_QUIET)
-               bb_perror_msg("%s", fileName);
+               bb_simple_perror_msg(fileName);
        return FALSE;
 }
 
-int chmod_main(int argc, char **argv)
+int chmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chmod_main(int argc UNUSED_PARAM, char **argv)
 {
        int retval = EXIT_SUCCESS;
        char *arg, **argp;
@@ -87,9 +91,9 @@ int chmod_main(int argc, char **argv)
                }
        }
 
-       /* Paerse options */
+       /* Parse options */
        opt_complementary = "-2";
-       getopt32(argc, argv, ("-"OPT_STR) + 1); /* Reuse string */
+       getopt32(argv, ("-"OPT_STR) + 1); /* Reuse string */
        argv += optind;
 
        /* Restore option-like mode if needed */
@@ -99,13 +103,11 @@ int chmod_main(int argc, char **argv)
        smode = *argv++;
        do {
                if (!recursive_action(*argv,
-                               OPT_RECURSE,    // recurse
-                               FALSE,          // follow links: GNU doesn't
-                               FALSE,          // depth first
-                               fileAction,     // file action
-                               fileAction,     // dir action
-                               smode,          // user data
-                               0)              // depth
+                       OPT_RECURSE,    // recurse
+                       fileAction,     // file action
+                       fileAction,     // dir action
+                       smode,          // user data
+                       0)              // depth
                ) {
                        retval = EXIT_FAILURE;
                }
@@ -117,10 +119,12 @@ int chmod_main(int argc, char **argv)
 /*
 Security: chmod is too important and too subtle.
 This is a test script (busybox chmod versus coreutils).
-Run it in empty dir. Probably requires bash.
+Run it in empty directory.
 
 #!/bin/sh
-function create() {
+t1="/tmp/busybox chmod"
+t2="/usr/bin/chmod"
+create() {
     rm -rf $1; mkdir $1
     (
     cd $1 || exit 1
@@ -133,17 +137,16 @@ function create() {
     ln -s ../up dir/up
     )
 }
-function tst() {
+tst() {
     (cd test1; $t1 $1)
     (cd test2; $t2 $1)
     (cd test1; ls -lR) >out1
     (cd test2; ls -lR) >out2
     echo "chmod $1" >out.diff
     if ! diff -u out1 out2 >>out.diff; then exit 1; fi
-    mv out.diff out1.diff
+    rm out.diff
 }
-t1="/tmp/busybox chmod"
-t2="/usr/bin/chmod"
+echo "If script produced 'out.diff' file, then at least one testcase failed"
 create test1; create test2
 tst "a+w file"
 tst "a-w dir"