X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fusage.h;h=2fb8112b0a5dde0a7ac99d22667f618894272182;hb=f5294e1f4c56afb377ada95a7757b28ad3c89086;hp=bab14f5c3835ef90753b38547a6326bb177100dc;hpb=992e05b6f070562d83f9238b227e1ddbf951c9af;p=oweals%2Fbusybox.git diff --git a/include/usage.h b/include/usage.h index bab14f5c3..2fb8112b0 100644 --- a/include/usage.h +++ b/include/usage.h @@ -12,9 +12,9 @@ #define __BB_USAGE_H__ #define addgroup_trivial_usage \ - "[-g GID] group_name [user_name]" + "[-g GID]"USE_FEATURE_ADDUSER_TO_GROUP(" [user_name]")" group_name" #define addgroup_full_usage \ - "Add a group to the system" \ + "Add a group to the system"USE_FEATURE_ADDUSER_TO_GROUP(" or add an user to a group") \ "\n\nOptions:\n" \ " -g GID Specify gid" @@ -37,7 +37,7 @@ "Read and optionally set system timebase parameters.\n" \ "See adjtimex(2)." \ "\n\nOptions:\n" \ - " -q Quiet mode - do not print\n" \ + " -q Quiet\n" \ " -o offset Time offset, microseconds\n" \ " -f frequency Frequency adjust, integer kernel units (65536 is 1ppm)\n" \ " (positive values make the system clock run fast)\n" \ @@ -53,7 +53,7 @@ " -p Extract to stdout\n" \ " -t List\n" \ " -x Extract\n" \ - " -v Verbosely list files processed" + " -v Verbose" #define arp_trivial_usage \ "\n" \ @@ -81,7 +81,7 @@ "Ping hosts by ARP requests/replies" \ "\n\nOptions:\n" \ " -f Quit on first ARP reply\n" \ - " -q Be quiet\n" \ + " -q Quiet\n" \ " -b Keep broadcasting, don't go unicast\n" \ " -D Duplicated address detection mode\n" \ " -U Unsolicited ARP mode, update your neighbours\n" \ @@ -383,7 +383,7 @@ "\n\nOptions:\n" \ " -l Write the byte numbers (decimal) and values (octal)\n" \ " for all differing bytes\n" \ - " -s Quiet mode - do not print" + " -s Quiet" #define comm_trivial_usage \ "[-123] FILE1 FILE2" @@ -777,7 +777,7 @@ " -y Assume 'yes' to all questions\n" \ " -c Check for bad blocks and add them to the badblock list\n" \ " -f Force checking even if filesystem is marked clean\n" \ - " -v Be verbose\n" \ + " -v Verbose\n" \ " -b superblock Use alternative superblock\n" \ " -B blocksize Force blocksize when looking for superblock\n" \ " -j journal Set location of the external journal\n" \ @@ -958,10 +958,22 @@ ) USE_FEATURE_FIND_EXEC( \ "\n -exec CMD Execute CMD with all instances of {} replaced by the" \ "\n files matching EXPRESSION" \ - ) USE_DESKTOP( \ + ) USE_FEATURE_FIND_USER( \ + "\n -user NAME File is owned by user NAME (numeric user ID allowed)" \ + ) USE_FEATURE_FIND_GROUP( \ + "\n -group NAME File belongs to group NAME (numeric group ID allowed)" \ + ) USE_FEATURE_FIND_DEPTH( \ + "\n -depth Process directory after traversing it" \ + ) USE_FEATURE_FIND_SIZE( \ "\n -size N File size is N" \ + ) USE_FEATURE_FIND_PRUNE( \ "\n -prune Stop traversing current subtree" \ - "\n (expr) Group" \ + ) USE_FEATURE_FIND_DELETE( \ + "\n -delete Delete files; Turns on -depth option" \ + ) USE_FEATURE_FIND_PATH( \ + "\n -path Path matches PATTERN" \ + ) USE_FEATURE_FIND_PAREN( \ + "\n (EXPR) Group an expression" \ ) #define find_example_usage \ @@ -1131,7 +1143,7 @@ "\n -l List names of files that match" \ "\n -L List names of files that do not match" \ "\n -n Print line number with output lines" \ - "\n -q Be quiet. Returns 0 if PATTERN was found, 1 otherwise" \ + "\n -q Quiet. Returns 0 if PATTERN was found, 1 otherwise" \ "\n -v Select non-matching lines" \ "\n -s Suppress file open/read error messages" \ "\n -c Only print count of matching lines" \ @@ -1548,8 +1560,8 @@ "\n\nOptions:\n" \ " -f Force module to load into the wrong kernel version\n" \ " -k Make module autoclean-able\n" \ - " -v Verbose output\n" \ - " -q Quiet output\n" \ + " -v Verbose\n" \ + " -q Quiet\n" \ " -L Lock to prevent simultaneous loads of a module\n" \ USE_FEATURE_INSMOD_LOAD_MAP( \ " -m Output load map to stdout\n") \ @@ -1571,12 +1583,24 @@ USE_SELINUX( \ "\n -Z Set security context of copy" \ ) - +/* would need to make the " | " optional depending on more than one selected */ #define ip_trivial_usage \ - "[OPTIONS] {address | link | route | tunnel | rule} {COMMAND}" + "[OPTIONS] {" \ + USE_FEATURE_IP_ADDRESS("address | ") \ + USE_FEATURE_IP_ROUTE("route | ") \ + USE_FEATURE_IP_LINK("link | ") \ + USE_FEATURE_IP_TUNNEL("tunnel | ") \ + USE_FEATURE_IP_RULE("rule") \ + "} {COMMAND}" #define ip_full_usage \ "ip [OPTIONS] OBJECT {COMMAND}\n" \ - "where OBJECT := {link | addr | route | tunnel |rule}\n" \ + "where OBJECT := {" \ + USE_FEATURE_IP_ADDRESS("address | ") \ + USE_FEATURE_IP_ROUTE("route | ") \ + USE_FEATURE_IP_LINK("link | ") \ + USE_FEATURE_IP_TUNNEL("tunnel | ") \ + USE_FEATURE_IP_RULE("rule") \ + "}\n" \ "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }" #define ipaddr_trivial_usage \ @@ -2069,11 +2093,11 @@ " -N num Number of inodes to create\n" \ " -o os Set the 'creator os' field\n" \ " -O features Dir_index/filetype/has_journal/journal_dev/sparse_super\n" \ - " -q Quiet execution\n" \ + " -q Quiet\n" \ " -r rev Set filesystem revision\n" \ " -S Write superblock and group descriptors only\n" \ " -T fs-type Set usage type (news/largefile/largefile4)\n" \ - " -v Verbose execution" + " -v Verbose" #define mkfifo_trivial_usage \ "[OPTIONS] name" @@ -2144,10 +2168,10 @@ "Options:\n" \ " -k Make module autoclean-able\n" \ " -n Just show what would be done\n" \ - " -q Quiet output\n" \ + " -q Quiet\n" \ " -r Remove module (stacks) or do autoclean\n" \ " -s Report via syslog instead of stderr\n" \ - " -v Verbose output" + " -v Verbose" #define modprobe_notes_usage \ "modprobe can (un)load a stack of modules, passing each module options (when\n" \ "loading). modprobe uses a configuration file to determine what option(s) to\n" \ @@ -2269,7 +2293,7 @@ #define mountpoint_full_usage \ "mountpoint checks if the directory is a mountpoint" \ "\n\nOptions:\n" \ - " -q Be more quiet\n" \ + " -q Quiet\n" \ " -d Print major/minor device number of the filesystem\n" \ " -x Print major/minor device number of the blockdevice" #define mountpoint_example_usage \ @@ -2312,6 +2336,8 @@ " or\n" \ "$ nameif -c /etc/my_mactab_file\n" \ +#if !ENABLE_DESKTOP + #if ENABLE_NC_SERVER || ENABLE_NC_EXTRA #define NC_OPTIONS_STR "\n\nOptions:" #else @@ -2354,6 +2380,35 @@ "quit\n" \ "221 foobar closing connection\n" +#else /* DESKTOP nc - much more compatible with nc 1.10 */ + +#define nc_trivial_usage \ + "[-options] hostname port - connect" \ + USE_NC_SERVER("\nnc [-options] -l -p port [hostname] [port] - listen") +#define nc_full_usage \ + USE_NC_SERVER( \ + "-l Listen mode, for inbound connects\n" \ + ) \ + "-n Do not do DNS resolution" \ + "\n-s addr Local address" \ + "\n-p port Local port" \ + "\n-u UDP mode" \ + "\n-v Verbose (cumulative: -vv)" \ + "\n-w secs Timeout for connects and final net reads" \ + USE_NC_EXTRA( \ + "\n-i sec Delay interval for lines sent" /* ", ports scanned" */ \ + "\n-o file Hex dump of traffic" \ + "\n-z Zero-I/O mode (scanning)" \ + ) \ + "\n-e prog [args] Program to exec after connect (must be last)" \ +/* "\n-r Randomize local and remote ports" */ +/* "\n-g gateway Source-routing hop point[s], up to 8" */ +/* "\n-G num Source-routing pointer: 4, 8, 12, ..." */ +/* "\nport numbers can be individual or ranges: lo-hi [inclusive]" */ + +#endif + + #define netstat_trivial_usage \ "[-laenrtuwx]" #define netstat_full_usage \ @@ -2500,7 +2555,7 @@ " -c CNT Send only CNT pings\n" \ " -s SIZE Send SIZE data bytes in packets (default=56)\n" \ " -I iface/IP Use interface or IP address as source\n" \ - " -q Quiet mode, only displays output at start\n" \ + " -q Quiet, only displays output at start\n" \ " and when finished" #define ping6_trivial_usage \ "[OPTION]... host" @@ -2510,7 +2565,7 @@ " -c CNT Send only CNT pings\n" \ " -s SIZE Send SIZE data bytes in packets (default=56)\n" \ " -I iface/IP Use interface or IP address as source\n" \ - " -q Quiet mode, only displays output at start\n" \ + " -q Quiet, only displays output at start\n" \ " and when finished" #endif #define ping_example_usage \ @@ -2649,7 +2704,7 @@ " -p (Default: /proc/profile)\n" \ " -M Set the profiling multiplier to \n" \ " -i Print only info about the sampling step\n" \ - " -v Print verbose data\n" \ + " -v Verbose\n" \ " -a Print all symbols, even if count is 0\n" \ " -b Print individual histogram-bin counts\n" \ " -s Print individual counters within functions\n" \ @@ -2992,10 +3047,10 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when "\n -m|--make-pidfile Create the -p file and enter pid in it" \ "\n -n|--name Stop processes with this name" \ "\n -p|--pidfile Save or load pid using a pid-file" \ - "\n -q|--quiet Be quiet" \ + "\n -q|--quiet Quiet" \ USE_FEATURE_START_STOP_DAEMON_FANCY( \ "\n -o|--oknodo Exit status 0 if nothing done" \ - "\n -v|--verbose Be verbose" \ + "\n -v|--verbose Verbose" \ "\n -N|--nicelevel Add N to process's nice level" \ ) \ "\n -s|--signal Signal to send (default TERM)" \ @@ -3054,7 +3109,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " %i File System ID in hex\n" \ " %l Maximum length of filenames\n" \ " %n File name\n" \ - " %s Block size (for faster transfers)\n" \ + " %s Block size (for faster transfer)\n" \ " %S Fundamental block size (for block counts)\n" \ " %t Type in hex\n" \ " %T Type in human readable form" \ @@ -3238,7 +3293,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " exclude File to exclude\n" \ " X File with names to exclude\n") \ " C Change to directory DIR before operation\n" \ - " v Verbosely list files processed" + " v Verbose" #define tar_example_usage \ "$ zcat /tmp/tarball.tar.gz | tar -xf -\n" \ "$ tar -cf /tmp/tarball.tar /usr/local\n" @@ -3330,8 +3385,8 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when /* with not-implemented options: */ /* "[-hpEvv] [-c n] [-C n:msg] [-b n] [-u user] [-l name] [-i dir|-x cdb] [ -t sec] ip port prog..." */ #define tcpsvd_full_usage \ - "Creates TCP socket, binds it to host:port and listens on in\n" \ - "for incoming connections. For each connection it runs prog" \ + "Creates TCP socket, binds it to ip:port and listens on it\n" \ + "for incoming connections. For each connection it runs prog." \ "\n" \ "\nip IP to listen on. '0' = all" \ "\nport Port to listen on" \ @@ -3339,27 +3394,29 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when "\n-l name Local hostname (else looks up local hostname in DNS)" \ "\n-u user[:group] Change to user/group after bind" \ "\n-c n Handle up to n connections simultaneously" \ + "\n-b n Allow a backlog of approximately n TCP SYNs" \ "\n-C n[:msg] Allow only up to n connections from the same IP" \ "\n New connections from this IP address are closed" \ "\n immediately. 'msg' is written to the peer before close" \ "\n-h Look up peer's hostname" \ - "\n-b n Allow a backlog of approximately n TCP SYNs" \ - "\n-E Do not set up TCP-related environment variables" \ + "\n-E Do not set up environment variables" \ "\n-v Verbose" #define udpsvd_trivial_usage \ - "[-hv] [-u user] [-l name] host port prog" + "[-hEv] [-c n] [-u user] [-l name] ip port prog" #define udpsvd_full_usage \ - "Creates UDP socket, binds it to host:port and listens on in\n" \ - "for incoming packets. When packet arrives it runs prog.\n" \ - "When prog exits, it start to listen on the socket again" \ + "Creates UDP socket, binds it to ip:port and listens on it\n" \ + "for incoming packets. For each packet it runs prog\n" \ + "(redirecting all further packets with same peer ip:port to it)." \ "\n" \ "\nip IP to listen on. '0' = all" \ "\nport Port to listen on" \ "\nprog [arg] Program to run" \ "\n-l name Local hostname (else looks up local hostname in DNS)" \ "\n-u user[:group] Change to user/group after bind" \ + "\n-c n Handle up to n connections simultaneously" \ "\n-h Look up peer's hostname" \ + "\n-E Do not set up environment variables" \ "\n-v Verbose" #define tftp_trivial_usage \ @@ -3384,7 +3441,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when "Run the program COMMAND with arguments ARGS. When COMMAND finishes,\n" \ "COMMAND's resource usage information is displayed." \ "\n\nOptions:\n" \ - " -v Display verbose resource usage information" + " -v Verbose" #define top_trivial_usage \ "[-b] [-n count] [-d seconds]" @@ -3432,18 +3489,16 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " -d Set SO_DEBUG options to socket\n" \ " -n Print hop addresses numerically rather than symbolically\n" \ " -r Bypass the normal routing tables and send directly to a host\n" \ - " -v Verbose output\n" \ - " -m max_ttl Set the max time-to-live (max number of hops)\n" \ - " -p port# Set the base UDP port number used in probes\n" \ + " -v Verbose\n" \ + " -m max_ttl Max time-to-live (max number of hops)\n" \ + " -p port# Base UDP port number used in probes\n" \ " (default is 33434)\n" \ - " -q nqueries Set the number of probes per 'ttl' to nqueries\n" \ - " (default is 3)\n" \ - " -s src_addr Use the following IP address as the source address\n" \ - " -t tos Set the type-of-service in probe packets to the following value\n" \ - " (default 0)\n" \ - " -w wait Set the time (in seconds) to wait for a response to a probe\n" \ + " -q nqueries Number of probes per 'ttl' (default 3)\n" \ + " -s src_addr IP address to use as the source address\n" \ + " -t tos Type-of-service in probe packets (default 0)\n" \ + " -w wait Time in seconds to wait for a response to a probe\n" \ " (default 3 sec)\n" \ - " -g Specify a loose source route gateway (8 maximum)" + " -g Specify a loose source route gateway (8 max)" #define true_trivial_usage \ @@ -3564,7 +3619,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when #define unix2dos_full_usage \ "Convert FILE from unix format to dos format. When no option\n" \ "is given, the input is converted to the opposite output format.\n" \ - "When no file is given, use stdin for input and stdout for output." \ + "When no file is given, use stdin/stdout." \ "\n\nOptions:\n" \ " -u Output will be in UNIX format\n" \ " -d Output will be in DOS format" @@ -3578,7 +3633,7 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " -n Never overwrite existing files (default)\n" \ " -o Overwrite files without prompting\n" \ " -p Send output to stdout\n" \ - " -q Be quiet\n" \ + " -q Quiet\n" \ " -x Exclude these files\n" \ " -d Extract files into this directory" @@ -3684,14 +3739,15 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when " 31 46 1365 /etc/passwd\n" #define wget_trivial_usage \ - "[-c|--continue] [-q|--quiet] [-O|--output-document file]\n" \ + "[-c|--continue] [-s|--spider] [-q|--quiet] [-O|--output-document file]\n" \ " [--header 'header: value'] [-Y|--proxy on/off] [-P DIR]\n" \ " [-U|--user-agent agent] url" #define wget_full_usage \ "Retrieve files via HTTP or FTP" \ "\n\nOptions:\n" \ - " -c Continue retrieval of aborted transfers\n" \ - " -q Quiet mode - do not print\n" \ + " -s Spider mode - only check file existence\n" \ + " -c Continue retrieval of aborted transfer\n" \ + " -q Quiet\n" \ " -P Set directory prefix to DIR\n" \ " -O Save to filename ('-' for stdout)\n" \ " -U Adjust 'User-Agent' field\n" \