diff options
| author | Erik Andersen <andersen@codepoet.org> | 1999-12-16 20:59:36 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 1999-12-16 20:59:36 +0000 |
| commit | 1c5b2589d1287008899c07f45541286fe8c37508 (patch) | |
| tree | 6c9772d2bb9b54f6508ff77a8dd30982e227ab83 /sysklogd | |
| parent | 6f23cec5d081fac63a7a0c493d6caff77e55dfb1 (diff) | |
| download | busybox-w32-1c5b2589d1287008899c07f45541286fe8c37508.tar.gz busybox-w32-1c5b2589d1287008899c07f45541286fe8c37508.tar.bz2 busybox-w32-1c5b2589d1287008899c07f45541286fe8c37508.zip | |
Fix bugs in logger and syslogd. Add fbset.
-Erik
Diffstat (limited to 'sysklogd')
| -rw-r--r-- | sysklogd/logger.c | 9 | ||||
| -rw-r--r-- | sysklogd/syslogd.c | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sysklogd/logger.c b/sysklogd/logger.c index dfbc557ec..5ef622dc3 100644 --- a/sysklogd/logger.c +++ b/sysklogd/logger.c | |||
| @@ -120,6 +120,7 @@ extern int logger_main(int argc, char **argv) | |||
| 120 | int fd, pri = LOG_USER|LOG_NOTICE; | 120 | int fd, pri = LOG_USER|LOG_NOTICE; |
| 121 | int fromStdinFlag=FALSE; | 121 | int fromStdinFlag=FALSE; |
| 122 | int toStdErrFlag=FALSE; | 122 | int toStdErrFlag=FALSE; |
| 123 | int stopLookingAtMeLikeThat=FALSE; | ||
| 123 | char *message, buf[1024], buf1[1024]; | 124 | char *message, buf[1024], buf1[1024]; |
| 124 | time_t now; | 125 | time_t now; |
| 125 | size_t addrLength; | 126 | size_t addrLength; |
| @@ -129,7 +130,8 @@ extern int logger_main(int argc, char **argv) | |||
| 129 | if (*((*argv)+1) == '\0') { | 130 | if (*((*argv)+1) == '\0') { |
| 130 | fromStdinFlag=TRUE; | 131 | fromStdinFlag=TRUE; |
| 131 | } | 132 | } |
| 132 | while (*(++(*argv))) { | 133 | stopLookingAtMeLikeThat=FALSE; |
| 134 | while (*(++(*argv)) && stopLookingAtMeLikeThat==FALSE) { | ||
| 133 | switch (**argv) { | 135 | switch (**argv) { |
| 134 | case 's': | 136 | case 's': |
| 135 | toStdErrFlag = TRUE; | 137 | toStdErrFlag = TRUE; |
| @@ -139,10 +141,7 @@ extern int logger_main(int argc, char **argv) | |||
| 139 | usage(logger_usage); | 141 | usage(logger_usage); |
| 140 | } | 142 | } |
| 141 | pri = pencode(*(++argv)); | 143 | pri = pencode(*(++argv)); |
| 142 | if (--argc == 0) { | 144 | stopLookingAtMeLikeThat=TRUE; |
| 143 | usage(logger_usage); | ||
| 144 | } | ||
| 145 | ++argv; | ||
| 146 | break; | 145 | break; |
| 147 | default: | 146 | default: |
| 148 | usage(logger_usage); | 147 | usage(logger_usage); |
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c index 24c721f8e..43e83b191 100644 --- a/sysklogd/syslogd.c +++ b/sysklogd/syslogd.c | |||
| @@ -164,7 +164,6 @@ static void domark(int sig) | |||
| 164 | { | 164 | { |
| 165 | if (MarkInterval > 0) { | 165 | if (MarkInterval > 0) { |
| 166 | logMessage(LOG_SYSLOG|LOG_INFO, "-- MARK --"); | 166 | logMessage(LOG_SYSLOG|LOG_INFO, "-- MARK --"); |
| 167 | signal(SIGALRM, domark); | ||
| 168 | alarm(MarkInterval); | 167 | alarm(MarkInterval); |
| 169 | } | 168 | } |
| 170 | } | 169 | } |