shell: syncronize ash and hush heredoc1.tests

[oweals/busybox.git] / sysklogd / syslogd.c

diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 0ea557a6c6b57e5544baf8cdd7baa667c052f0d3..d64ff278f2b8ad5c68b9ba91c80db069a3f9cbb3 100644 (file)
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -33,7 +33,7 @@
 //config:      depends on SYSLOGD
 //config:      help
 //config:        This enables syslogd to rotate the message files
-//config:        on his own. No need to use an external rotatescript.
+//config:        on his own. No need to use an external rotate script.
 //config:
 //config:config FEATURE_REMOTE_LOG
 //config:      bool "Remote Log support"
@@ -133,10 +133,10 @@
 //usage:       IF_FEATURE_KMSG_SYSLOG(
 //usage:     "\n       -K              Log to kernel printk buffer (use dmesg to read it)"
 //usage:       )
-//usage:     "\n       -O FILE         Log to FILE (default:/var/log/messages, stdout if -)"
+//usage:     "\n       -O FILE         Log to FILE (default: /var/log/messages, stdout if -)"
 //usage:       IF_FEATURE_ROTATE_LOGFILE(
-//usage:     "\n       -s SIZE         Max size (KB) before rotation (default:200KB, 0=off)"
-//usage:     "\n       -b N            N rotated logs to keep (default:1, max=99, 0=purge)"
+//usage:     "\n       -s SIZE         Max size (KB) before rotation (default 200KB, 0=off)"
+//usage:     "\n       -b N            N rotated logs to keep (default 1, max 99, 0=purge)"
 //usage:       )
 //usage:     "\n       -l N            Log only messages more urgent than prio N (1-8)"
 //usage:     "\n       -S              Smaller output"
@@ -146,7 +146,7 @@
 //usage:       IF_FEATURE_SYSLOGD_CFG(
 //usage:     "\n       -f FILE         Use FILE as config (default:/etc/syslog.conf)"
 //usage:       )
-/* //usage:  "\n       -m MIN          Minutes between MARK lines (default:20, 0=off)" */
+/* //usage:  "\n       -m MIN          Minutes between MARK lines (default 20, 0=off)" */
 //usage:
 //usage:#define syslogd_example_usage
 //usage:       "$ syslogd -R masterlog:514\n"
@@ -342,7 +342,7 @@ enum {
 #define OPTION_STR "m:nO:l:S" \
        IF_FEATURE_ROTATE_LOGFILE("s:" ) \
        IF_FEATURE_ROTATE_LOGFILE("b:" ) \
-       IF_FEATURE_REMOTE_LOG(    "R:" ) \
+       IF_FEATURE_REMOTE_LOG(    "R:*") \
        IF_FEATURE_REMOTE_LOG(    "L"  ) \
        IF_FEATURE_IPC_SYSLOG(    "C::") \
        IF_FEATURE_SYSLOGD_DUP(   "D"  ) \
@@ -1108,8 +1108,8 @@ int syslogd_main(int argc UNUSED_PARAM, char **argv)
 
        INIT_G();
 
-       /* No non-option params, -R can occur multiple times */
-       opt_complementary = "=0" IF_FEATURE_REMOTE_LOG(":R::");
+       /* No non-option params */
+       opt_complementary = "=0";
        opts = getopt32(argv, OPTION_STR, OPTION_PARAM);
 #if ENABLE_FEATURE_REMOTE_LOG
        while (remoteAddrList) {