Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/selinux/setfiles.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/setfiles.c (modified) (14 diffs)

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

@@ -36 +36 @@
     int nerr;
     struct edir excludeArray[MAX_EXCLUDES];
-};
-
+} FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 void BUG_setfiles_globals_too_big(void);
@@ -100 +99 @@
 
 
-static void qprintf(const char *fmt, ...)
+static void qprintf(const char *fmt UNUSED_PARAM, ...)
 {
     /* quiet, do nothing */
@@ -113 +112 @@
 }
 
-static void add_exclude(const char *const directory)
+static void add_exclude(const char *directory)
 {
     struct stat sb;
@@ -120 +119 @@
     if (directory == NULL || directory[0] != '/') {
         bb_error_msg_and_die("full path required for exclude: %s", directory);
-
     }
     if (lstat(directory, &sb)) {
@@ -285 +283 @@
             count = (count % (80*0x400));
             if (count == 0)
-                fputc('\n', stdout);
-            fputc('*', stdout);
-            fflush(stdout);
+                bb_putchar('\n');
+            bb_putchar('*');
+            fflush_all();
         }
     }
@@ -348 +346 @@
         if (verbose > 1 || !user_only_changed) {
             bb_info_msg("%s: reset %s context %s->%s",
-                applet_name, my_file, context ?: "", newcon);
+                applet_name, my_file, context ? context : "", newcon);
         }
     }
@@ -392 +390 @@
  * the directory traversal.
  */
-static int apply_spec(const char *file,
-              struct stat *sb, void *userData, int depth)
+static int FAST_FUNC apply_spec(
+        const char *file,
+        struct stat *sb,
+        void *userData UNUSED_PARAM,
+        int depth UNUSED_PARAM)
 {
     if (!follow_mounts) {
@@ -487 +488 @@
 }
 
-int setfiles_main(int argc, char **argv);
-int setfiles_main(int argc, char **argv)
+int setfiles_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int setfiles_main(int argc UNUSED_PARAM, char **argv)
 {
     struct stat sb;
@@ -542 +543 @@
     } else { /* setfiles */
         flags = getopt32(argv, "de:f:ilnpqr:svo:FW"
-                USE_FEATURE_SETFILES_CHECK_OPTION("c:"),
+                IF_FEATURE_SETFILES_CHECK_OPTION("c:"),
             &exclude_dir, &input_filename, &rootpath, &out_filename,
-                 USE_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
+                 IF_FEATURE_SETFILES_CHECK_OPTION(&policyfile,)
             &verbose);
     }
+    argv += optind;
 
 #if ENABLE_FEATURE_SETFILES_CHECK_OPTION
@@ -552 +554 @@
         FILE *policystream;
 
-        policystream = xfopen(policyfile, "r");
+        policystream = xfopen_for_read(policyfile);
         if (sepol_set_policydb_from_file(policystream) < 0) {
             bb_error_msg_and_die("sepol_set_policydb_from_file on %s", policyfile);
@@ -573 +575 @@
         outfile = stdout;
         if (NOT_LONE_CHAR(out_filename, '-')) {
-            outfile = xfopen(out_filename, "w");
+            outfile = xfopen_for_write(out_filename);
         }
     }
@@ -593 +595 @@
            checking against a binary policy file. */
         set_matchpathcon_canoncon(&canoncon);
-        if (argc == 1)
+        if (!argv[0])
             bb_show_usage();
-        if (stat(argv[optind], &sb) < 0) {
-            bb_perror_msg_and_die("%s", argv[optind]);
-        }
+        xstat(argv[0], &sb);
         if (!S_ISREG(sb.st_mode)) {
-            bb_error_msg_and_die("spec file %s is not a regular file", argv[optind]);
+            bb_error_msg_and_die("spec file %s is not a regular file", argv[0]);
         }
         /* Load the file contexts configuration and check it. */
-        rc = matchpathcon_init(argv[optind]);
+        rc = matchpathcon_init(argv[0]);
         if (rc < 0) {
-            bb_perror_msg_and_die("%s", argv[optind]);
-        }
-
-        optind++;
-
+            bb_simple_perror_msg_and_die(argv[0]);
+        }
         if (nerr)
-            exit(1);
+            exit(EXIT_FAILURE);
+        argv++;
     }
 
@@ -618 +616 @@
 
         if (NOT_LONE_CHAR(input_filename, '-'))
-            f = xfopen(input_filename, "r");
+            f = xfopen_for_read(input_filename);
         while ((len = getline(&buf, &buf_len, f)) > 0) {
             buf[len - 1] = '\0';
@@ -626 +624 @@
             fclose_if_not_stdin(f);
     } else {
-        if (optind >= argc)
+        if (!argv[0])
             bb_show_usage();
-        for (i = optind; i < argc; i++) {
+        for (i = 0; argv[i]; i++) {
             errors |= process_one(argv[i]);
         }