diff options
author | Pere Orga <gotrunks@gmail.com> | 2011-04-11 03:29:49 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-04-11 03:29:49 +0200 |
commit | 5bc8c005a8e15c43285bc595a8d404de67a482ac (patch) | |
tree | 98f2d35d1db26f4d8cba5f095ff63bf8e2e8d980 /sysklogd | |
parent | 73ef15cf3894716c1393ed21dee6e6bb2cdbc90f (diff) | |
download | busybox-w32-5bc8c005a8e15c43285bc595a8d404de67a482ac.tar.gz busybox-w32-5bc8c005a8e15c43285bc595a8d404de67a482ac.tar.bz2 busybox-w32-5bc8c005a8e15c43285bc595a8d404de67a482ac.zip |
move remaining help text from include/usage.src.h
Signed-off-by: Pere Orga <gotrunks@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'sysklogd')
-rw-r--r-- | sysklogd/klogd.c | 8 | ||||
-rw-r--r-- | sysklogd/logger.c | 12 | ||||
-rw-r--r-- | sysklogd/logread.c | 7 | ||||
-rw-r--r-- | sysklogd/syslogd.c | 27 |
4 files changed, 54 insertions, 0 deletions
diff --git a/sysklogd/klogd.c b/sysklogd/klogd.c index db32065fb..3992081ca 100644 --- a/sysklogd/klogd.c +++ b/sysklogd/klogd.c | |||
@@ -17,6 +17,14 @@ | |||
17 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 17 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
18 | */ | 18 | */ |
19 | 19 | ||
20 | //usage:#define klogd_trivial_usage | ||
21 | //usage: "[-c N] [-n]" | ||
22 | //usage:#define klogd_full_usage "\n\n" | ||
23 | //usage: "Kernel logger\n" | ||
24 | //usage: "\nOptions:" | ||
25 | //usage: "\n -c N Only messages with level < N are printed to console" | ||
26 | //usage: "\n -n Run in foreground" | ||
27 | |||
20 | #include "libbb.h" | 28 | #include "libbb.h" |
21 | #include <syslog.h> | 29 | #include <syslog.h> |
22 | 30 | ||
diff --git a/sysklogd/logger.c b/sysklogd/logger.c index 120f6a718..0fabd97ca 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c | |||
@@ -7,6 +7,18 @@ | |||
7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
8 | */ | 8 | */ |
9 | 9 | ||
10 | //usage:#define logger_trivial_usage | ||
11 | //usage: "[OPTIONS] [MESSAGE]" | ||
12 | //usage:#define logger_full_usage "\n\n" | ||
13 | //usage: "Write MESSAGE (or stdin) to syslog\n" | ||
14 | //usage: "\nOptions:" | ||
15 | //usage: "\n -s Log to stderr as well as the system log" | ||
16 | //usage: "\n -t TAG Log using the specified tag (defaults to user name)" | ||
17 | //usage: "\n -p PRIO Priority (numeric or facility.level pair)" | ||
18 | //usage: | ||
19 | //usage:#define logger_example_usage | ||
20 | //usage: "$ logger \"hello\"\n" | ||
21 | |||
10 | /* | 22 | /* |
11 | * Done in syslogd_and_logger.c: | 23 | * Done in syslogd_and_logger.c: |
12 | #include "libbb.h" | 24 | #include "libbb.h" |
diff --git a/sysklogd/logread.c b/sysklogd/logread.c index 52c97aa77..ae0b2194b 100644 --- a/sysklogd/logread.c +++ b/sysklogd/logread.c | |||
@@ -9,6 +9,13 @@ | |||
9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 9 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
10 | */ | 10 | */ |
11 | 11 | ||
12 | //usage:#define logread_trivial_usage | ||
13 | //usage: "[-f]" | ||
14 | //usage:#define logread_full_usage "\n\n" | ||
15 | //usage: "Show messages in syslogd's circular buffer\n" | ||
16 | //usage: "\nOptions:" | ||
17 | //usage: "\n -f Output data as log grows" | ||
18 | |||
12 | #include "libbb.h" | 19 | #include "libbb.h" |
13 | #include <sys/ipc.h> | 20 | #include <sys/ipc.h> |
14 | #include <sys/sem.h> | 21 | #include <sys/sem.h> |
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index f179dc5ac..7ddd3e4c3 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
@@ -13,6 +13,33 @@ | |||
13 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. | 13 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | //usage:#define syslogd_trivial_usage | ||
17 | //usage: "[OPTIONS]" | ||
18 | //usage:#define syslogd_full_usage "\n\n" | ||
19 | //usage: "System logging utility.\n" | ||
20 | //usage: "This version of syslogd ignores /etc/syslog.conf\n" | ||
21 | //usage: "\nOptions:" | ||
22 | //usage: "\n -n Run in foreground" | ||
23 | //usage: "\n -O FILE Log to given file (default:/var/log/messages)" | ||
24 | //usage: "\n -l N Set local log level" | ||
25 | //usage: "\n -S Smaller logging output" | ||
26 | //usage: IF_FEATURE_ROTATE_LOGFILE( | ||
27 | //usage: "\n -s SIZE Max size (KB) before rotate (default:200KB, 0=off)" | ||
28 | //usage: "\n -b N N rotated logs to keep (default:1, max=99, 0=purge)") | ||
29 | //usage: IF_FEATURE_REMOTE_LOG( | ||
30 | //usage: "\n -R HOST[:PORT] Log to IP or hostname on PORT (default PORT=514/UDP)" | ||
31 | //usage: "\n -L Log locally and via network (default is network only if -R)") | ||
32 | //usage: IF_FEATURE_SYSLOGD_DUP( | ||
33 | //usage: "\n -D Drop duplicates") | ||
34 | //usage: IF_FEATURE_IPC_SYSLOG( | ||
35 | //usage: "\n -C[size(KiB)] Log to shared mem buffer (read it using logread)") | ||
36 | /* NB: -Csize shouldn't have space (because size is optional) */ | ||
37 | /* //usage: "\n -m MIN Minutes between MARK lines (default:20, 0=off)" */ | ||
38 | //usage: | ||
39 | //usage:#define syslogd_example_usage | ||
40 | //usage: "$ syslogd -R masterlog:514\n" | ||
41 | //usage: "$ syslogd -R 192.168.1.1:601\n" | ||
42 | |||
16 | /* | 43 | /* |
17 | * Done in syslogd_and_logger.c: | 44 | * Done in syslogd_and_logger.c: |
18 | #include "libbb.h" | 45 | #include "libbb.h" |