diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-18 23:33:19 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-12-18 23:33:19 +0100 |
| commit | b164cdb854e6722ab39aa62dbfad84ea37a29a30 (patch) | |
| tree | df83e79cdd5c53cb0846ab886b5c519553b1d731 | |
| parent | 8cc3a744fbe39152b6554e2a8c029f23dc39a3f9 (diff) | |
| download | busybox-w32-b164cdb854e6722ab39aa62dbfad84ea37a29a30.tar.gz busybox-w32-b164cdb854e6722ab39aa62dbfad84ea37a29a30.tar.bz2 busybox-w32-b164cdb854e6722ab39aa62dbfad84ea37a29a30.zip | |
help text tweaks, mainly expanding one for route
function old new delta
packed_usage 33485 33527 +42
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | networking/ping.c | 8 | ||||
| -rw-r--r-- | networking/pscan.c | 10 | ||||
| -rw-r--r-- | networking/route.c | 21 | ||||
| -rw-r--r-- | networking/tftp.c | 2 |
4 files changed, 22 insertions, 19 deletions
diff --git a/networking/ping.c b/networking/ping.c index 318d561bb..bbf9f0db1 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
| @@ -58,16 +58,16 @@ | |||
| 58 | //usage:# define ping_trivial_usage | 58 | //usage:# define ping_trivial_usage |
| 59 | //usage: "HOST" | 59 | //usage: "HOST" |
| 60 | //usage:# define ping_full_usage "\n\n" | 60 | //usage:# define ping_full_usage "\n\n" |
| 61 | //usage: "Send ICMP ECHO_REQUEST packets to network hosts" | 61 | //usage: "Send ICMP ECHO_REQUESTs to HOST" |
| 62 | //usage:# define ping6_trivial_usage | 62 | //usage:# define ping6_trivial_usage |
| 63 | //usage: "HOST" | 63 | //usage: "HOST" |
| 64 | //usage:# define ping6_full_usage "\n\n" | 64 | //usage:# define ping6_full_usage "\n\n" |
| 65 | //usage: "Send ICMP ECHO_REQUEST packets to network hosts" | 65 | //usage: "Send ICMP ECHO_REQUESTs to HOST" |
| 66 | //usage:#else | 66 | //usage:#else |
| 67 | //usage:# define ping_trivial_usage | 67 | //usage:# define ping_trivial_usage |
| 68 | //usage: "[OPTIONS] HOST" | 68 | //usage: "[OPTIONS] HOST" |
| 69 | //usage:# define ping_full_usage "\n\n" | 69 | //usage:# define ping_full_usage "\n\n" |
| 70 | //usage: "Send ICMP ECHO_REQUEST packets to network hosts\n" | 70 | //usage: "Send ICMP ECHO_REQUESTs to HOST\n" |
| 71 | //usage: IF_PING6( | 71 | //usage: IF_PING6( |
| 72 | //usage: "\n -4,-6 Force IP or IPv6 name resolution" | 72 | //usage: "\n -4,-6 Force IP or IPv6 name resolution" |
| 73 | //usage: ) | 73 | //usage: ) |
| @@ -88,7 +88,7 @@ | |||
| 88 | //usage:# define ping6_trivial_usage | 88 | //usage:# define ping6_trivial_usage |
| 89 | //usage: "[OPTIONS] HOST" | 89 | //usage: "[OPTIONS] HOST" |
| 90 | //usage:# define ping6_full_usage "\n\n" | 90 | //usage:# define ping6_full_usage "\n\n" |
| 91 | //usage: "Send ICMP ECHO_REQUEST packets to network hosts\n" | 91 | //usage: "Send ICMP ECHO_REQUESTs to HOST\n" |
| 92 | //usage: "\n -c CNT Send only CNT pings" | 92 | //usage: "\n -c CNT Send only CNT pings" |
| 93 | //usage: "\n -s SIZE Send SIZE data bytes in packets (default 56)" | 93 | //usage: "\n -s SIZE Send SIZE data bytes in packets (default 56)" |
| 94 | //usage: "\n -i SECS Interval" | 94 | //usage: "\n -i SECS Interval" |
diff --git a/networking/pscan.c b/networking/pscan.c index e114e55d2..816178bbc 100644 --- a/networking/pscan.c +++ b/networking/pscan.c | |||
| @@ -18,13 +18,13 @@ | |||
| 18 | //usage:#define pscan_trivial_usage | 18 | //usage:#define pscan_trivial_usage |
| 19 | //usage: "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST" | 19 | //usage: "[-cb] [-p MIN_PORT] [-P MAX_PORT] [-t TIMEOUT] [-T MIN_RTT] HOST" |
| 20 | //usage:#define pscan_full_usage "\n\n" | 20 | //usage:#define pscan_full_usage "\n\n" |
| 21 | //usage: "Scan a host, print all open ports\n" | 21 | //usage: "Scan HOST, print all open ports\n" |
| 22 | //usage: "\n -c Show closed ports too" | 22 | //usage: "\n -c Show closed ports too" |
| 23 | //usage: "\n -b Show blocked ports too" | 23 | //usage: "\n -b Show blocked ports too" |
| 24 | //usage: "\n -p Scan from this port (default 1)" | 24 | //usage: "\n -p PORT Scan from this port (default 1)" |
| 25 | //usage: "\n -P Scan up to this port (default 1024)" | 25 | //usage: "\n -P PORT Scan up to this port (default 1024)" |
| 26 | //usage: "\n -t Timeout (default 5000 ms)" | 26 | //usage: "\n -t MS Timeout (default 5000 ms)" |
| 27 | //usage: "\n -T Minimum rtt (default 5 ms, increase for congested hosts)" | 27 | //usage: "\n -T MS Minimum rtt (default 5 ms)" |
| 28 | 28 | ||
| 29 | #include "libbb.h" | 29 | #include "libbb.h" |
| 30 | 30 | ||
diff --git a/networking/route.c b/networking/route.c index 4901109f1..b08ab5c68 100644 --- a/networking/route.c +++ b/networking/route.c | |||
| @@ -34,14 +34,6 @@ | |||
| 34 | 34 | ||
| 35 | //kbuild:lib-$(CONFIG_ROUTE) += route.o | 35 | //kbuild:lib-$(CONFIG_ROUTE) += route.o |
| 36 | 36 | ||
| 37 | //usage:#define route_trivial_usage | ||
| 38 | //usage: "[{add|del|delete}]" | ||
| 39 | //usage:#define route_full_usage "\n\n" | ||
| 40 | //usage: "Edit kernel routing tables\n" | ||
| 41 | //usage: "\n -n Don't resolve names" | ||
| 42 | //usage: "\n -e Display other/more information" | ||
| 43 | //usage: "\n -A inet" IF_FEATURE_IPV6("{6}") " Select address family" | ||
| 44 | |||
| 45 | #include <net/route.h> | 37 | #include <net/route.h> |
| 46 | #include <net/if.h> | 38 | #include <net/if.h> |
| 47 | 39 | ||
| @@ -208,7 +200,7 @@ static NOINLINE void INET_setroute(int action, char **args) | |||
| 208 | /* Default netmask. */ | 200 | /* Default netmask. */ |
| 209 | netmask = "default"; | 201 | netmask = "default"; |
| 210 | } | 202 | } |
| 211 | /* Prefer hostname lookup is -host flag (xflag==1) was given. */ | 203 | /* Prefer hostname lookup if -host flag (xflag==1) was given. */ |
| 212 | isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst, | 204 | isnet = INET_resolve(target, (struct sockaddr_in *) &rt->rt_dst, |
| 213 | (xflag & HOST_FLAG)); | 205 | (xflag & HOST_FLAG)); |
| 214 | if (isnet < 0) { | 206 | if (isnet < 0) { |
| @@ -653,6 +645,17 @@ static void INET6_displayroutes(void) | |||
| 653 | 645 | ||
| 654 | #endif | 646 | #endif |
| 655 | 647 | ||
| 648 | //usage:#define route_trivial_usage | ||
| 649 | ///////: "[-ne]"IF_FEATURE_IPV6(" [-A inet[6]]")" [{add|del|delete} [-net|-host] TARGET [netmask MASK] [gw GATEWAY] [metric N] [mss BYTES] [window BYTES] [irtt MSEC] [reject] [mod] [dyn] [reinstate] [[dev] IFACE]]" | ||
| 650 | ///////too wordy | ||
| 651 | //usage: "[-ne]"IF_FEATURE_IPV6(" [-A inet[6]]")" [{add|del} TARGET [netmask MASK]\n" | ||
| 652 | //usage: " [gw GATEWAY] [metric N] [mss BYTES] [window BYTES] [reject] [IFACE]]" | ||
| 653 | //usage:#define route_full_usage "\n\n" | ||
| 654 | //usage: "Show or edit kernel routing tables\n" | ||
| 655 | //usage: "\n -n Don't resolve names" | ||
| 656 | //usage: "\n -e Display other/more information" | ||
| 657 | //usage: "\n -A inet" IF_FEATURE_IPV6("[6]") " Select address family" | ||
| 658 | |||
| 656 | #define ROUTE_OPT_A 0x01 | 659 | #define ROUTE_OPT_A 0x01 |
| 657 | #define ROUTE_OPT_n 0x02 | 660 | #define ROUTE_OPT_n 0x02 |
| 658 | #define ROUTE_OPT_e 0x04 | 661 | #define ROUTE_OPT_e 0x04 |
diff --git a/networking/tftp.c b/networking/tftp.c index 60fdff232..7c2c84bed 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
| @@ -104,7 +104,7 @@ | |||
| 104 | //usage: "\n -p Put file" | 104 | //usage: "\n -p Put file" |
| 105 | //usage: ) | 105 | //usage: ) |
| 106 | //usage: IF_FEATURE_TFTP_BLOCKSIZE( | 106 | //usage: IF_FEATURE_TFTP_BLOCKSIZE( |
| 107 | //usage: "\n -b SIZE Transfer blocks of SIZE octets" | 107 | //usage: "\n -b SIZE Transfer blocks in bytes" |
| 108 | //usage: ) | 108 | //usage: ) |
| 109 | ///////: "\n -m STR Accepted and ignored ('-m binary' compat with tftp-hpa 5.2)" | 109 | ///////: "\n -m STR Accepted and ignored ('-m binary' compat with tftp-hpa 5.2)" |
| 110 | //usage: | 110 | //usage: |