Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/procps/sysctl.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/procps/sysctl.c (modified) (6 diffs)

branches/3.2/mindi-busybox/procps/sysctl.c

@@ -12 +12 @@
  */
 
+//usage:#define sysctl_trivial_usage
+//usage:       "[OPTIONS] [KEY[=VALUE]]..."
+//usage:#define sysctl_full_usage "\n\n"
+//usage:       "Show/set kernel parameters\n"
+//usage:     "\n    -e  Don't warn about unknown keys"
+//usage:     "\n    -n  Don't show key names"
+//usage:     "\n    -a  Show all values"
+/* Same as -a, no need to show it */
+/* //usage:     "\n -A  Show all values in table form" */
+//usage:     "\n    -w  Set values"
+//usage:     "\n    -p FILE Set values from FILE (default /etc/sysctl.conf)"
+//usage:     "\n    -q      Set values silently"
+//usage:
+//usage:#define sysctl_example_usage
+//usage:       "sysctl [-n] [-e] variable...\n"
+//usage:       "sysctl [-n] [-e] [-q] -w variable=value...\n"
+//usage:       "sysctl [-n] [-e] -a\n"
+//usage:       "sysctl [-n] [-e] [-q] -p file   (default /etc/sysctl.conf)\n"
+//usage:       "sysctl [-n] [-e] -A\n"
+
 #include "libbb.h"
 
@@ -20 +40 @@
     FLAG_SHOW_ALL        = 1 << 3,
     FLAG_PRELOAD_FILE    = 1 << 4,
+/* TODO: procps 3.2.8 seems to not require -w for KEY=VAL to work: */
     FLAG_WRITE           = 1 << 5,
+    FLAG_QUIET           = 1 << 6,
 };
-#define OPTION_STR "neAapw"
+#define OPTION_STR "neAapwq"
 
 static void sysctl_dots_to_slashes(char *name)
@@ -127 +149 @@
         xwrite_str(fd, value);
         close(fd);
-        if (option_mask32 & FLAG_SHOW_KEYS)
-            printf("%s = ", outname);
-        puts(value);
+        if (!(option_mask32 & FLAG_QUIET)) {
+            if (option_mask32 & FLAG_SHOW_KEYS)
+                printf("%s = ", outname);
+            puts(value);
+        }
     } else {
         char c;
@@ -182 +206 @@
             /* if path was ".", drop "./" prefix: */
             retval |= sysctl_act_recursive((next[0] == '.' && next[1] == '/') ?
-                        next + 2 : next);
+                    next + 2 : next);
             free(next);
         }
@@ -207 +231 @@
     /* Must do it _after_ config_open(): */
     xchdir("/proc/sys");
-    /* xchroot(".") - if you are paranoid */
+    /* xchroot("/proc/sys") - if you are paranoid */
 
 //TODO: ';' is comment char too
@@ -243 +267 @@
     }
     xchdir("/proc/sys");
-    /* xchroot(".") - if you are paranoid */
+    /* xchroot("/proc/sys") - if you are paranoid */
     if (opt & (FLAG_TABLE_FORMAT | FLAG_SHOW_ALL)) {
         return sysctl_act_recursive(".");