diff options
| author | Denys Vlasenko | 2009-11-25 14:52:47 +0100 |
|---|---|---|
| committer | Denys Vlasenko | 2009-11-25 14:52:47 +0100 |
| commit | b2e5fc35ebc127e2a1ac03c7ff0719b1e6b6cd6b (patch) | |
| tree | 21c86016df03253513c3bbe80fc7eef71b209d68 /libbb | |
| parent | 18221506e5aeb9c279b73bc9418b60c75b10399a (diff) | |
| download | busybox-b2e5fc35ebc127e2a1ac03c7ff0719b1e6b6cd6b.zip busybox-b2e5fc35ebc127e2a1ac03c7ff0719b1e6b6cd6b.tar.gz | |
ntpd: and real handling for -N, show usage w/o options; trim text
function old new delta
ntp_init 317 348 +31
bb_msg_you_must_be_root - 17 +17
xsocket 66 76 +10
changepath 195 194 -1
bb_msg_perm_denied_are_you_root 35 34 -1
send_tree 355 353 -2
count_lines 74 72 -2
must_be_root 17 - -17
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 2/4 up/down: 58/-23) Total: 35 bytes
text data bss dec hexfilename
832873 441 7548 840862 cd49ebusybox_old
832839 441 7548 840828 cd47cbusybox_unstripped
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/messages.c | 3 | ||||
| -rw-r--r-- | libbb/xfuncs_printf.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libbb/messages.c b/libbb/messages.c index 9009028..1d0e587 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -28,7 +28,8 @@ const char bb_msg_write_error[] ALIGN1 = "write error"; const char bb_msg_read_error[] ALIGN1 = "read error"; const char bb_msg_unknown[] ALIGN1 = "(unknown)"; const char bb_msg_can_not_create_raw_socket[] ALIGN1 = "can't create raw socket"; -const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied. (are you root?)"; +const char bb_msg_perm_denied_are_you_root[] ALIGN1 = "permission denied (are you root?)"; +const char bb_msg_you_must_be_root[] ALIGN1 = "you must be root"; const char bb_msg_requires_arg[] ALIGN1 = "%s requires an argument"; const char bb_msg_invalid_arg[] ALIGN1 = "invalid argument '%s' to '%s'"; const char bb_msg_standard_input[] ALIGN1 = "standard input"; diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c index 644134a..d362841 100644 --- a/libbb/xfuncs_printf.c +++ b/libbb/xfuncs_printf.c @@ -388,7 +388,7 @@ int FAST_FUNC xsocket(int domain, int type, int protocol) if (domain == AF_PACKET) s = "PACKET"; if (domain == AF_NETLINK) s = "NETLINK"; IF_FEATURE_IPV6(if (domain == AF_INET6) s = "INET6";) - bb_perror_msg_and_die("socket(AF_%s)", s); + bb_perror_msg_and_die("socket(AF_%s,%d,%d)", s, type, protocol); #else bb_perror_msg_and_die("socket"); #endif |