Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/selinux/chcon.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/selinux/chcon.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/selinux/chcon.c

@@ -5 +5 @@
  *
  * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include <getopt.h>
@@ -29 +31 @@
 static char *specified_context = NULL;
 
-static int change_filedir_context(const char *fname, struct stat *stbuf, void *userData, int depth)
+static int FAST_FUNC change_filedir_context(
+        const char *fname,
+        struct stat *stbuf UNUSED_PARAM,
+        void *userData UNUSED_PARAM,
+        int depth UNUSED_PARAM)
 {
     context_t context = NULL;
@@ -44 +50 @@
     if (status < 0 && errno != ENODATA) {
         if ((option_mask32 & OPT_QUIET) == 0)
-            bb_error_msg("cannot obtain security context: %s", fname);
+            bb_error_msg("can't obtain security context: %s", fname);
         goto skip;
     }
 
     if (file_context == NULL && specified_context == NULL) {
-        bb_error_msg("cannot apply partial context to unlabeled file %s", fname);
+        bb_error_msg("can't apply partial context to unlabeled file %s", fname);
         goto skip;
     }
@@ -57 +63 @@
                              user, role, type, range);
         if (!context) {
-            bb_error_msg("cannot compute security context from %s", file_context);
+            bb_error_msg("can't compute security context from %s", file_context);
             goto skip;
         }
@@ -70 +76 @@
     context_string = context_str(context);
     if (!context_string) {
-        bb_error_msg("cannot obtain security context in text expression");
+        bb_error_msg("can't obtain security context in text expression");
         goto skip;
     }
@@ -85 +91 @@
             printf(!fail
                    ? "context of %s changed to %s\n"
-                   : "failed to change context of %s to %s\n",
+                   : "can't change context of %s to %s\n",
                    fname, context_string);
         }
@@ -91 +97 @@
             rc = TRUE;
         } else if ((option_mask32 & OPT_QUIET) == 0) {
-            bb_error_msg("failed to change context of %s to %s",
+            bb_error_msg("can't change context of %s to %s",
                      fname, context_string);
         }
@@ -121 +127 @@
 #endif
 
-int chcon_main(int argc, char **argv);
-int chcon_main(int argc, char **argv)
+int chcon_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chcon_main(int argc UNUSED_PARAM, char **argv)
 {
     char *reference_file;