*
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
-#include "busybox.h"
-
-#if !defined CONFIG_SYSLOGD
+//usage:#define logger_trivial_usage
+//usage: "[OPTIONS] [MESSAGE]"
+//usage:#define logger_full_usage "\n\n"
+//usage: "Write MESSAGE (or stdin) to syslog\n"
+//usage: "\n -s Log to stderr as well as the system log"
+//usage: "\n -t TAG Log using the specified tag (defaults to user name)"
+//usage: "\n -p PRIO Priority (numeric or facility.level pair)"
+//usage:
+//usage:#define logger_example_usage
+//usage: "$ logger \"hello\"\n"
+/*
+ * Done in syslogd_and_logger.c:
+#include "libbb.h"
#define SYSLOG_NAMES
-#include <sys/syslog.h>
-
-#else
-#include <sys/syslog.h>
-# ifndef __dietlibc__
- /* We have to do this since the header file defines static
- * structures. Argh.... bad libc, bad, bad...
- */
- typedef struct _code {
- char *c_name;
- int c_val;
- } CODE;
- extern CODE prioritynames[];
- extern CODE facilitynames[];
-# endif
-#endif
+#define SYSLOG_NAMES_CONST
+#include <syslog.h>
+*/
/* Decode a symbolic name to a numeric value
* this function is based on code
*
* Original copyright notice is retained at the end of this file.
*/
-static int decode(char *name, CODE * codetab)
+static int decode(char *name, const CODE *codetab)
{
- CODE *c;
+ const CODE *c;
if (isdigit(*name))
return atoi(name);
char *save;
int lev, fac = LOG_USER;
- for (save = s; *s && *s != '.'; ++s);
+ for (save = s; *s && *s != '.'; ++s)
+ ;
if (*s) {
*s = '\0';
fac = decode(save, facilitynames);
if (fac < 0)
- bb_error_msg_and_die("unknown facility name: %s", save);
+ bb_error_msg_and_die("unknown %s name: %s", "facility", save);
*s++ = '.';
} else {
s = save;
}
lev = decode(s, prioritynames);
if (lev < 0)
- bb_error_msg_and_die("unknown priority name: %s", save);
+ bb_error_msg_and_die("unknown %s name: %s", "priority", save);
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
}
+#define strbuf bb_common_bufsiz1
-int logger_main(int argc, char **argv)
+int logger_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int logger_main(int argc UNUSED_PARAM, char **argv)
{
- unsigned opt;
- char *opt_p, *opt_t;
- int pri = LOG_USER | LOG_NOTICE;
- int option = 0;
- char name[80];
+ char *str_p, *str_t;
+ int opt;
+ int i = 0;
/* Fill out the name string early (may be overwritten later) */
- bb_getpwuid(name, geteuid(), sizeof(name));
+ str_t = uid2uname_utoa(geteuid());
/* Parse any options */
- opt = getopt32(argc, argv, "p:st:", &opt_p, &opt_t);
- argc -= optind;
+ opt = getopt32(argv, "p:st:", &str_p, &str_t);
+
+ if (opt & 0x2) /* -s */
+ i |= LOG_PERROR;
+ //if (opt & 0x4) /* -t */
+ openlog(str_t, i, 0);
+ i = LOG_USER | LOG_NOTICE;
+ if (opt & 0x1) /* -p */
+ i = pencode(str_p);
+
argv += optind;
- if (opt & 0x1) pri = pencode(opt_p); // -p
- if (opt & 0x2) option |= LOG_PERROR; // -s
- if (opt & 0x4) safe_strncpy(name, opt_t, sizeof(name)); // -t
-
- openlog(name, option, 0);
- if (!argc) {
- while (fgets(bb_common_bufsiz1, BUFSIZ, stdin)) {
- if (bb_common_bufsiz1[0]
- && NOT_LONE_CHAR(bb_common_bufsiz1, '\n')
+ if (!argv[0]) {
+ while (fgets(strbuf, COMMON_BUFSIZE, stdin)) {
+ if (strbuf[0]
+ && NOT_LONE_CHAR(strbuf, '\n')
) {
/* Neither "" nor "\n" */
- syslog(pri, "%s", bb_common_bufsiz1);
+ syslog(i, "%s", strbuf);
}
}
} else {
char *message = NULL;
- int len = 1; /* for NUL */
+ int len = 0;
int pos = 0;
do {
len += strlen(*argv) + 1;
- message = xrealloc(message, len);
+ message = xrealloc(message, len + 1);
sprintf(message + pos, " %s", *argv),
pos = len;
} while (*++argv);
- syslog(pri, "%s", message + 1); /* skip leading " " */
+ syslog(i, "%s", message + 1); /* skip leading " " */
}
closelog();
return EXIT_SUCCESS;
}
+/* Clean up. Needed because we are included from syslogd_and_logger.c */
+#undef strbuf
/*-
* Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
+ * The Regents of the University of California. All rights reserved.
*
* This is the original license statement for the decode and pencode functions.
*
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
- * 3. <BSD Advertising Clause omitted per the July 22, 1999 licensing change
- * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change>
+ * 3. BSD Advertising Clause omitted per the July 22, 1999 licensing change
+ * ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change
*
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
projects / oweals / busybox.git / blobdiff