summaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenys Vlasenko2011-06-05 03:58:28 +0200
committerDenys Vlasenko2011-06-05 03:58:28 +0200
commit66426760beef7e87c4735f433d123daf911b5b4a (patch)
tree7aa341ba4d1b01b69feeb878d1b78f974207abb0 /miscutils
parent9f7780250ce4bbee9c0a8f1044875e303479e196 (diff)
downloadbusybox-66426760beef7e87c4735f433d123daf911b5b4a.zip
busybox-66426760beef7e87c4735f433d123daf911b5b4a.tar.gz
*: remove "Options:" string from help texts
function old new delta packed_usage 28706 28623 -83 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/adjtimex.c1
-rw-r--r--miscutils/beep.c3
-rw-r--r--miscutils/chrt.c1
-rw-r--r--miscutils/conspy.c1
-rw-r--r--miscutils/devfsd.c1
-rw-r--r--miscutils/eject.c1
-rw-r--r--miscutils/fbsplash.c3
-rw-r--r--miscutils/flash_eraseall.c1
-rw-r--r--miscutils/flashcp.c1
-rw-r--r--miscutils/hdparm.c3
-rw-r--r--miscutils/ionice.c1
-rw-r--r--miscutils/last.c1
-rw-r--r--miscutils/less.c1
-rw-r--r--miscutils/man.c3
-rw-r--r--miscutils/microcom.c1
-rw-r--r--miscutils/mountpoint.c1
-rw-r--r--miscutils/nandwrite.c2
-rw-r--r--miscutils/setserial.c4
-rw-r--r--miscutils/strings.c1
-rw-r--r--miscutils/taskset.c1
-rw-r--r--miscutils/time.c1
-rw-r--r--miscutils/ubi_tools.c10
-rw-r--r--miscutils/watchdog.c1
23 files changed, 8 insertions, 36 deletions
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index e1edbbe..98b6ccf 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -15,7 +15,6 @@
//usage: "[-q] [-o OFF] [-f FREQ] [-p TCONST] [-t TICK]"
//usage:#define adjtimex_full_usage "\n\n"
//usage: "Read and optionally set system timebase parameters. See adjtimex(2)\n"
-//usage: "\nOptions:"
//usage: "\n -q Quiet"
//usage: "\n -o OFF Time offset, microseconds"
//usage: "\n -f FREQ Frequency adjust, integer kernel units (65536 is 1ppm)"
diff --git a/miscutils/beep.c b/miscutils/beep.c
index c7699ff..910e03e 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -11,8 +11,7 @@
//usage:#define beep_trivial_usage
//usage: "-f FREQ -l LEN -d DELAY -r COUNT -n"
//usage:#define beep_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -f Frequency in Hz"
+//usage: " -f Frequency in Hz"
//usage: "\n -l Length in ms"
//usage: "\n -d Delay in ms"
//usage: "\n -r Repetitions"
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index 7e40b9f..91b5397 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -10,7 +10,6 @@
//usage: "[-prfom] [PRIO] [PID | PROG ARGS]"
//usage:#define chrt_full_usage "\n\n"
//usage: "Change scheduling priority and class for a process\n"
-//usage: "\nOptions:"
//usage: "\n -p Operate on PID"
//usage: "\n -r Set SCHED_RR class"
//usage: "\n -f Set SCHED_FIFO class"
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 90ef91c..433c3e8 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -30,7 +30,6 @@
//usage: "A text-mode VNC like program for Linux virtual consoles."
//usage: "\nTo exit, quickly press ESC 3 times."
//usage: "\n"
-//usage: "\nOptions:"
//usage: "\n -v Don't send keystrokes to the console"
//usage: "\n -c Create missing devices in /dev"
//usage: "\n -s Open a SHELL session"
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 7062760..6493fe4 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -58,7 +58,6 @@
//usage: "mntpnt [-v]" IF_DEVFSD_FG_NP("[-fg][-np]")
//usage:#define devfsd_full_usage "\n\n"
//usage: "Manage devfs permissions and old device name symlinks\n"
-//usage: "\nOptions:"
//usage: "\n mntpnt The mount point where devfs is mounted"
//usage: "\n -v Print the protocol version numbers for devfsd"
//usage: "\n and the kernel-side protocol version and exit"
diff --git a/miscutils/eject.c b/miscutils/eject.c
index 184ccc5..a20e04b 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -17,7 +17,6 @@
//usage: "[-t] [-T] [DEVICE]"
//usage:#define eject_full_usage "\n\n"
//usage: "Eject DEVICE or default /dev/cdrom\n"
-//usage: "\nOptions:"
//usage: IF_FEATURE_EJECT_SCSI(
//usage: "\n -s SCSI device"
//usage: )
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index c761a88..51ba472 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -24,8 +24,7 @@
//usage:#define fbsplash_trivial_usage
//usage: "-s IMGFILE [-c] [-d DEV] [-i INIFILE] [-f CMD]"
//usage:#define fbsplash_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -s Image"
+//usage: " -s Image"
//usage: "\n -c Hide cursor"
//usage: "\n -d Framebuffer device (default /dev/fb0)"
//usage: "\n -i Config file (var=value):"
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 33803f8..0598371 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -14,7 +14,6 @@
//usage: "[-jq] MTD_DEVICE"
//usage:#define flash_eraseall_full_usage "\n\n"
//usage: "Erase an MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -j Format the device for jffs2"
//usage: "\n -q Don't display progress messages"
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index e4bb3a9..790f9c0 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -11,7 +11,6 @@
//usage: "-v FILE MTD_DEVICE"
//usage:#define flashcp_full_usage "\n\n"
//usage: "Copy an image to MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -v Verbose"
#include "libbb.h"
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index 7608408..f30e7de 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -15,8 +15,7 @@
//usage:#define hdparm_trivial_usage
//usage: "[OPTIONS] [DEVICE]"
//usage:#define hdparm_full_usage "\n\n"
-//usage: "Options:"
-//usage: "\n -a Get/set fs readahead"
+//usage: " -a Get/set fs readahead"
//usage: "\n -A Set drive read-lookahead flag (0/1)"
//usage: "\n -b Get/set bus state (0 == off, 1 == on, 2 == tristate)"
//usage: "\n -B Set Advanced Power Management setting (1-255)"
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 2bc83c5..bd30060 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -11,7 +11,6 @@
//usage: "[-c 1-3] [-n 0-7] [-p PID] [PROG]"
//usage:#define ionice_full_usage "\n\n"
//usage: "Change I/O priority and class\n"
-//usage: "\nOptions:"
//usage: "\n -c Class. 1:realtime 2:best-effort 3:idle"
//usage: "\n -n Priority"
diff --git a/miscutils/last.c b/miscutils/last.c
index 27f5a35..d527803 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -12,7 +12,6 @@
//usage:#define last_full_usage "\n\n"
//usage: "Show listing of the last users that logged into the system"
//usage: IF_FEATURE_LAST_FANCY( "\n"
-//usage: "\nOptions:"
/* //usage: "\n -H Show header line" */
//usage: "\n -W Display with no host column truncation"
//usage: "\n -f FILE Read from FILE instead of /var/log/wtmp"
diff --git a/miscutils/less.c b/miscutils/less.c
index 77fd5a8..46024f9 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -25,7 +25,6 @@
//usage: "[-EMNmh~I?] [FILE]..."
//usage:#define less_full_usage "\n\n"
//usage: "View FILE (or stdin) one screenful at a time\n"
-//usage: "\nOptions:"
//usage: "\n -E Quit once the end of a file is reached"
//usage: "\n -M,-m Display status line with line numbers"
//usage: "\n and percentage through the file"
diff --git a/miscutils/man.c b/miscutils/man.c
index 2c6b25c..3bf7e84 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -7,8 +7,7 @@
//usage: "[-aw] [MANPAGE]..."
//usage:#define man_full_usage "\n\n"
//usage: "Format and display manual page\n"
-//usage: "\nOptions:"
-//usage: "\n -a Display all pages"
+//usage: "\n -a Display all pages"
//usage: "\n -w Show page locations"
#include "libbb.h"
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index edaeb6f..5e29a1a 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -12,7 +12,6 @@
//usage: "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
//usage:#define microcom_full_usage "\n\n"
//usage: "Copy bytes for stdin to TTY and from TTY to stdout\n"
-//usage: "\nOptions:"
//usage: "\n -d Wait up to DELAY ms for TTY output before sending every"
//usage: "\n next byte to it"
//usage: "\n -t Exit if both stdin and TTY are silent for TIMEOUT ms"
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index a1a5b39..7041f7c 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -13,7 +13,6 @@
//usage: "[-q] <[-dn] DIR | -x DEVICE>"
//usage:#define mountpoint_full_usage "\n\n"
//usage: "Check if the directory is a mountpoint\n"
-//usage: "\nOptions:"
//usage: "\n -q Quiet"
//usage: "\n -d Print major/minor device number of the filesystem"
//usage: "\n -n Print device name of the filesystem"
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index c7fbe7d..768aed1 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -32,7 +32,6 @@
//usage: "[-p] [-s ADDR] MTD_DEVICE [FILE]"
//usage:#define nandwrite_full_usage "\n\n"
//usage: "Write to the specified MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -p Pad to page size"
//usage: "\n -s ADDR Start address"
@@ -40,7 +39,6 @@
//usage: "[-o] [-b] [-s ADDR] [-f FILE] MTD_DEVICE"
//usage:#define nanddump_full_usage "\n\n"
//usage: "Dump the sepcified MTD device\n"
-//usage: "\nOptions:"
//usage: "\n -o Omit oob data"
//usage: "\n -b Omit bad block from the dump"
//usage: "\n -s ADDR Start address"
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 2951b98..1574e3a 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -212,8 +212,8 @@ struct serial_struct {
//usage:#define setserial_trivial_usage
//usage: "[-gabGvzV] DEVICE [PARAMETER [ARG]]..."
//usage:#define setserial_full_usage "\n\n"
-//usage: "Request or set Linux serial port information\n\n"
-//usage: "Options:\n"
+//usage: "Request or set Linux serial port information\n"
+//usage: "\n"
//usage: " -g Interpret parameters as list of devices for reporting"
//usage: " -a Print all available information\n"
//usage: " -b Print summary information\n"
diff --git a/miscutils/strings.c b/miscutils/strings.c
index 6e8b9ae..9f50182 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -11,7 +11,6 @@
//usage: "[-afo] [-n LEN] [FILE]..."
//usage:#define strings_full_usage "\n\n"
//usage: "Display printable strings in a binary file\n"
-//usage: "\nOptions:"
//usage: "\n -a Scan whole file (default)"
//usage: "\n -f Precede strings with filenames"
//usage: "\n -n LEN At least LEN characters form a string (default 4)"
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 77fc864..4a9e323 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -10,7 +10,6 @@
//usage: "[-p] [MASK] [PID | PROG ARGS]"
//usage:#define taskset_full_usage "\n\n"
//usage: "Set or get CPU affinity\n"
-//usage: "\nOptions:"
//usage: "\n -p Operate on an existing PID"
//usage:
//usage:#define taskset_example_usage
diff --git a/miscutils/time.c b/miscutils/time.c
index dcd89f8..945f15f 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -13,7 +13,6 @@
//usage: "[-v] PROG ARGS"
//usage:#define time_full_usage "\n\n"
//usage: "Run PROG, display resource usage when it exits\n"
-//usage: "\nOptions:"
//usage: "\n -v Verbose"
#include "libbb.h"
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index fc7f38c..2a426db 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -81,7 +81,6 @@
//usage: "-m MTD_NUM [-d UBI_NUM] UBI_CTRL_DEV"
//usage:#define ubiattach_full_usage "\n\n"
//usage: "Attach MTD device to UBI\n"
-//usage: "\nOptions:"
//usage: "\n -m MTD_NUM MTD device number to attach"
//usage: "\n -d UBI_NUM UBI device number to assign"
//usage:
@@ -89,14 +88,12 @@
//usage: "-d UBI_NUM UBI_CTRL_DEV"
//usage:#define ubidetach_full_usage "\n\n"
//usage: "Detach MTD device from UBI\n"
-//usage: "\nOptions:"
//usage: "\n -d UBI_NUM UBI device number"
//usage:
//usage:#define ubimkvol_trivial_usage
//usage: "UBI_DEVICE -N NAME -s SIZE"
//usage:#define ubimkvol_full_usage "\n\n"
//usage: "Create UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -a ALIGNMENT Volume alignment (default 1)"
//usage: "\n -n VOLID Volume ID, if not specified, it"
//usage: "\n will be assigned automatically"
@@ -108,14 +105,12 @@
//usage: "UBI_DEVICE -n VOLID"
//usage:#define ubirmvol_full_usage "\n\n"
//usage: "Remove UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -n VOLID Volume ID"
//usage:
//usage:#define ubirsvol_trivial_usage
//usage: "UBI_DEVICE -n VOLID -s SIZE"
//usage:#define ubirsvol_full_usage "\n\n"
//usage: "Resize UBI volume\n"
-//usage: "\nOptions:"
//usage: "\n -n VOLID Volume ID to resize"
//usage: "\n -s SIZE Size in bytes"
//usage:
@@ -123,9 +118,8 @@
//usage: "UBI_DEVICE [IMG_FILE]"
//usage:#define ubiupdatevol_full_usage "\n\n"
//usage: "Update UBI volume\n"
-//usage: "\nOptions:"
-//usage: "\n -t Truncate UBI volume"
-//usage: "\n -s SIZE Bytes in input (if reading stdin)"
+//usage: "\n -t Truncate UBI volume"
+//usage: "\n -s SIZE Bytes in input (if reading stdin)"
int ubi_tools_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index b24dd4b..ee28dc3 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -13,7 +13,6 @@
//usage: "[-t N[ms]] [-T N[ms]] [-F] DEV"
//usage:#define watchdog_full_usage "\n\n"
//usage: "Periodically write to watchdog device DEV\n"
-//usage: "\nOptions:"
//usage: "\n -T N Reboot after N seconds if not reset (default 60)"
//usage: "\n -t N Reset every N seconds (default 30)"
//usage: "\n -F Run in foreground"