ifplugd: simplify run_script()

[oweals/busybox.git] / include / usage.h

diff --git a/include/usage.h b/include/usage.h
index 2eb5c007a90da97df432cecdf2321b7731da3918..8c5a2dbc5c957631efd30e581ec7da915a070737 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -130,7 +130,7 @@
        "Options:" \
      "\n       -v VAR=VAL      Set variable" \
      "\n       -F SEP          Use SEP as field separator" \
-     "\n       -f FILE         Read program from file" \
+     "\n       -f FILE         Read program from FILE" \
 
 #define basename_trivial_usage \
        "FILE [SUFFIX]"
@@ -291,7 +291,7 @@
        "chat '' ATZ OK ATD123456 CONNECT '' ogin: pppuser word: ppppass '~'" \
 
 #define chattr_trivial_usage \
-       "[-R] [-+=AacDdijsStTu] [-v version] files..."
+       "[-R] [-+=AacDdijsStTu] [-v VERSION] [FILE]..."
 #define chattr_full_usage "\n\n" \
        "Change file attributes on an ext2 fs\n" \
      "\nModifiers:" \
@@ -1232,13 +1232,13 @@
      "\n       -type X         File type is X (X is one of: f,d,l,b,c,...)") \
        IF_FEATURE_FIND_PERM( \
      "\n       -perm NNN       Permissions match any of (+NNN), all of (-NNN)," \
-     "\n                       or exactly (NNN)") \
+     "\n                       or exactly NNN") \
        IF_FEATURE_FIND_MTIME( \
      "\n       -mtime DAYS     Modified time is greater than (+N), less than (-N)," \
-     "\n                       or exactly (N) days") \
+     "\n                       or exactly N days") \
        IF_FEATURE_FIND_MMIN( \
      "\n       -mmin MINS      Modified time is greater than (+N), less than (-N)," \
-     "\n                       or exactly (N) minutes") \
+     "\n                       or exactly N minutes") \
        IF_FEATURE_FIND_NEWER( \
      "\n       -newer FILE     Modified time is more recent than FILE's") \
        IF_FEATURE_FIND_INUM( \
@@ -1252,6 +1252,9 @@
        IF_FEATURE_FIND_SIZE( \
      "\n       -size N[bck]    File size is N (c:bytes,k:kbytes,b:512 bytes(def.))." \
      "\n                       +/-N: file size is bigger/smaller than N") \
+       IF_FEATURE_FIND_LINKS( \
+     "\n       -links N        Number of links is greater than (+N), less than (-N)," \
+     "\n                       or exactly N") \
      "\n       -print          Print (default and assumed)" \
        IF_FEATURE_FIND_PRINT0( \
      "\n       -print0         Delimit output with null characters rather than" \
@@ -2502,6 +2505,17 @@
 #define lsmod_full_usage "\n\n" \
        "List the currently loaded kernel modules"
 
+#define lspci_trivial_usage \
+       "[-mk]"
+#define lspci_full_usage "\n\n" \
+       "List all PCI devices" \
+     "\n" \
+     "\n       -m      Parseable output" \
+     "\n       -k      Show driver" \
+
+#define lsusb_trivial_usage NOUSAGE_STR
+#define lsusb_full_usage ""
+
 #if ENABLE_FEATURE_MAKEDEVS_LEAF
 #define makedevs_trivial_usage \
        "NAME TYPE MAJOR MINOR FIRST LAST [s]"
@@ -2656,7 +2670,7 @@
        "       -s      Scan /sys and populate /dev during system boot\n" \
        "\n" \
        "It can be run by kernel as a hotplug helper. To activate it:\n" \
-       " echo /bin/mdev >/proc/sys/kernel/hotplug\n" \
+       " echo /sbin/mdev > /proc/sys/kernel/hotplug\n" \
        IF_FEATURE_MDEV_CONF( \
        "It uses /etc/mdev.conf with lines\n" \
        "[-]DEVNAME UID:GID PERM" \
@@ -3212,7 +3226,7 @@
        "Address:    127.0.0.1\n"
 
 #define ntpd_trivial_usage \
-       "[-dngql] [-p PEER]..."
+       "[-dnqwl] [-p PEER]..."
 #define ntpd_full_usage "\n\n" \
        "NTP client/server\n" \
      "\nOptions:" \
@@ -3222,6 +3236,7 @@
 /* -N exists for mostly compat reasons, thus not essential to inform */ \
 /* the user that it exists: user may use nice as well */ \
 /*   "\n       -N      Run at high priority" */ \
+     "\n       -w      Do not set time (only query peers), implies -n" \
      "\n       -l      Run as server on port 123" \
      "\n       -p PEER Obtain time from PEER (may be repeated)" \
 
@@ -4762,9 +4777,9 @@
      "\n       -H,-h,--hostname=HOSTNAME       Client hostname" \
      "\n       -c,--clientid=CLIENTID  Client identifier" \
      "\n       -C,--clientid-none      Suppress default client identifier" \
-     "\n       -p,--pidfile=file       Create pidfile" \
+     "\n       -p,--pidfile=FILE       Create pidfile" \
      "\n       -r,--request=IP         IP address to request" \
-     "\n       -s,--script=file        Run file at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+     "\n       -s,--script=FILE        Run FILE at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
      "\n       -t,--retries=N          Send up to N discover packets" \
      "\n       -T,--timeout=N          Pause between packets (default 3 seconds)" \
      "\n       -A,--tryagain=N         Wait N seconds (default 20) after failure" \
@@ -4791,9 +4806,9 @@
      "\n       -H,-h HOSTNAME  Client hostname" \
      "\n       -c CLIENTID     Client identifier" \
      "\n       -C              Suppress default client identifier" \
-     "\n       -p file         Create pidfile" \
+     "\n       -p FILE         Create pidfile" \
      "\n       -r IP           IP address to request" \
-     "\n       -s file         Run file at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
+     "\n       -s FILE         Run FILE at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")" \
      "\n       -t N            Send up to N request packets" \
      "\n       -T N            Try to get a lease for N seconds (default 3)" \
      "\n       -A N            Wait N seconds (default 20) after failure" \