Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/selinux/setfiles.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/selinux/setfiles.c (modified) (5 diffs)

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

@@ -18 +18 @@
 //usage:     "\n    -d  Show which specification matched each file"
 //usage:     "\n    -l  Log changes in file labels to syslog"
+//TODO: log to syslog is not yet implemented, it goes to stdout only now
 //usage:     "\n    -n  Don't change any file labels"
 //usage:     "\n    -q  Suppress warnings"
@@ -77 +78 @@
     struct edir excludeArray[MAX_EXCLUDES];
 } FIX_ALIASING;
-#define G (*(struct globals*)&bb_common_bufsiz1)
+#define G (*(struct globals*)bb_common_bufsiz1)
 void BUG_setfiles_globals_too_big(void);
 #define INIT_G() do { \
+    setup_common_bufsiz(); \
     if (sizeof(G) > COMMON_BUFSIZE) \
         BUG_setfiles_globals_too_big(); \
@@ -252 +254 @@
             if (excludeCtr > 0 && exclude(name))
                 goto err;
-
         } else {
             char *p;
@@ -385 +386 @@
          * same.  For "-vv", emit everything. */
         if (verbose > 1 || !user_only_changed) {
-            bb_info_msg("%s: reset %s context %s->%s",
+            printf("%s: reset %s context %s->%s\n",
                 applet_name, my_file, context ? context : "", newcon);
         }
@@ -392 +393 @@
     if (FLAG_l_take_log && !user_only_changed) {
         if (context)
-            bb_info_msg("relabeling %s from %s to %s", my_file, context, newcon);
+            printf("relabeling %s from %s to %s\n", my_file, context, newcon);
         else
-            bb_info_msg("labeling %s to %s", my_file, newcon);
+            printf("labeling %s to %s\n", my_file, newcon);
     }