summaryrefslogtreecommitdiff
path: root/sysklogd/logger.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-06-11 15:43:19 +0000
committerDenis Vlasenko2008-06-11 15:43:19 +0000
commitbd1aeeb850e441e3fa4f9e1f8aedd804a48b9cb1 (patch)
treebcd130850cb83d83b7fa2860f741b8451ae3fdcb /sysklogd/logger.c
parent87f40bac149dcaf1025abd745decafb3a8ac4e0c (diff)
downloadbusybox-bd1aeeb850e441e3fa4f9e1f8aedd804a48b9cb1.zip
busybox-bd1aeeb850e441e3fa4f9e1f8aedd804a48b9cb1.tar.gz
logger: "clean up" a dirty hack a bit
Diffstat (limited to 'sysklogd/logger.c')
-rw-r--r--sysklogd/logger.c31
1 files changed, 6 insertions, 25 deletions
diff --git a/sysklogd/logger.c b/sysklogd/logger.c
index 0907501..6258113 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -7,34 +7,13 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
+/*
+ * Done in syslogd_and_logger.c:
#include "libbb.h"
-#ifndef CONFIG_SYSLOGD
#define SYSLOG_NAMES
#define SYSLOG_NAMES_CONST
#include <syslog.h>
-#else
-/* brokenness alert. Everybody except dietlibc get's this wrong by neither
- * providing a typedef nor an extern for facilitynames and prioritynames
- * in syslog.h.
- */
-# include <syslog.h>
-# ifndef __dietlibc__
-/* We have to do this since the header file does neither provide a sane type
- * for this structure nor extern definitions. Argh.... bad libc, bad, bad...
- */
-typedef struct _code {
- char *c_name; /* FIXME: this should be const char *const c_name ! */
- int c_val;
-} CODE;
-# ifdef __UCLIBC__
-extern const CODE prioritynames[];
-extern const CODE facilitynames[];
-# else
-extern CODE prioritynames[];
-extern CODE facilitynames[];
-# endif
-# endif
-#endif
+*/
/* Decode a symbolic name to a numeric value
* this function is based on code
@@ -87,6 +66,7 @@ static int pencode(char *s)
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
}
+#define strbuf bb_common_bufsiz1
int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int logger_main(int argc, char **argv)
@@ -113,7 +93,6 @@ int logger_main(int argc, char **argv)
argc -= optind;
argv += optind;
if (!argc) {
-#define strbuf bb_common_bufsiz1
while (fgets(strbuf, COMMON_BUFSIZE, stdin)) {
if (strbuf[0]
&& NOT_LONE_CHAR(strbuf, '\n')
@@ -139,6 +118,8 @@ int logger_main(int argc, char **argv)
return EXIT_SUCCESS;
}
+/* Clean up. Needed because we are included from syslogd_and_logger.c */
+#undef strbuf
/*-
* Copyright (c) 1983, 1993