/*
* Mini logger implementation for busybox
*
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
*
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <ctype.h>
+#include "libbb.h"
-#if !defined BB_SYSLOGD
+#if !defined CONFIG_SYSLOGD
#define SYSLOG_NAMES
#include <sys/syslog.h>
#else
-/* We have to do this since the header file defines static
- * structures. Argh.... bad libc, bad, bad...
- */
#include <sys/syslog.h>
-typedef struct _code {
- char *c_name;
- int c_val;
-} CODE;
-extern CODE prioritynames[];
-extern CODE facilitynames[];
+# 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
-/* Decode a symbolic name to a numeric value
+/* Decode a symbolic name to a numeric value
* this function is based on code
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
- *
+ *
* Original copyright notice is retained at the end of this file.
*/
static int decode(char *name, CODE * codetab)
CODE *c;
if (isdigit(*name))
- return (atoi(name));
+ return atoi(name);
for (c = codetab; c->c_name; c++) {
if (!strcasecmp(name, c->c_name)) {
- return (c->c_val);
+ return c->c_val;
}
}
- return (-1);
+ return -1;
}
-/* Decode a symbolic name to a numeric value
+/* Decode a symbolic name to a numeric value
* this function is based on code
* Copyright (c) 1983, 1993
* The Regents of the University of California. All rights reserved.
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)
- error_msg_and_die("unknown facility name: %s\n", save);
+ bb_error_msg_and_die("unknown %s name: %s", "facility", save);
*s++ = '.';
} else {
s = save;
}
lev = decode(s, prioritynames);
if (lev < 0)
- error_msg_and_die("unknown priority name: %s\n", save);
+ bb_error_msg_and_die("unknown %s name: %s", "priority", save);
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
}
-extern int logger_main(int argc, char **argv)
+int logger_main(int argc, char **argv);
+int logger_main(int argc, char **argv)
{
- int pri = LOG_USER | LOG_NOTICE;
- int option = 0;
- int c, i, len, opt;
- char *message=NULL, buf[1024], name[128];
+ char *str_p, *str_t;
+ int i = 0;
+ char name[80];
/* Fill out the name string early (may be overwritten later) */
- my_getpwuid(name, geteuid());
+ bb_getpwuid(name, geteuid(), sizeof(name));
+ str_t = name;
/* Parse any options */
- while ((opt = getopt(argc, argv, "p:st:")) > 0) {
- switch (opt) {
- case 's':
- option |= LOG_PERROR;
- break;
- case 'p':
- pri = pencode(optarg);
- break;
- case 't':
- strncpy(name, optarg, sizeof(name));
- break;
- default:
- usage(logger_usage);
+ getopt32(argc, argv, "p:st:", &str_p, &str_t);
+
+ if (option_mask32 & 0x2) /* -s */
+ i |= LOG_PERROR;
+ //if (option_mask32 & 0x4) /* -t */
+ openlog(str_t, i, 0);
+ i = LOG_USER | LOG_NOTICE;
+ if (option_mask32 & 0x1) /* -p */
+ i = pencode(str_p);
+
+ argc -= optind;
+ argv += optind;
+ if (!argc) {
+#define strbuf bb_common_bufsiz1
+ while (fgets(strbuf, BUFSIZ, stdin)) {
+ if (strbuf[0]
+ && NOT_LONE_CHAR(strbuf, '\n')
+ ) {
+ /* Neither "" nor "\n" */
+ syslog(i, "%s", strbuf);
+ }
}
- }
-
- if (optind == argc) {
- /* read from stdin */
- i = 0;
- while ((c = getc(stdin)) != EOF && i < sizeof(buf)) {
- buf[i++] = c;
- }
- message = buf;
} else {
- len = 1; /* for the '\0' */
- message=xcalloc(1, 1);
- for (i = optind; i < argc; i++) {
- len += strlen(argv[i]);
- len += 1; /* for the space between the args */
+ char *message = NULL;
+ int len = 1; /* for NUL */
+ int pos = 0;
+ do {
+ len += strlen(*argv) + 1;
message = xrealloc(message, len);
- strcat(message, argv[i]);
- strcat(message, " ");
- }
- message[strlen(message)-1] = '\0';
+ sprintf(message + pos, " %s", *argv),
+ pos = len;
+ } while (*++argv);
+ syslog(i, "%s", message + 1); /* skip leading " " */
}
- openlog(name, option, (pri | LOG_FACMASK));
- syslog(pri, "%s", message);
closelog();
-
return EXIT_SUCCESS;
}
* 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
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-
-
-
projects / oweals / busybox.git / blobdiff