/*
* Mini logger implementation for busybox
*
- * Copyright (C) 1999 by Lineo, inc.
+ * 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
*
*/
-#include "internal.h"
+#include "busybox.h"
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>
#else
/* We have to do this since the header file defines static
- * structues. Argh.... bad libc, bad, bad...
+ * structures. Argh.... bad libc, bad, bad...
*/
#include <sys/syslog.h>
typedef struct _code {
extern CODE facilitynames[];
#endif
-static const char logger_usage[] =
- "logger [OPTION]... [MESSAGE]\n\n"
- "Write MESSAGE to the system log. If MESSAGE is '-', log stdin.\n\n"
- "Options:\n"
- "\t-s\tLog to stderr as well as the system log.\n"
- "\t-t\tLog using the specified tag (defaults to user name).\n"
-
- "\t-p\tEnter the message with the specified priority.\n"
- "\t\tThis may be numerical or a ``facility.level'' pair.\n";
-
-
/* 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)
{
* 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 pencode(char *s)
{
if (*s) {
*s = '\0';
fac = decode(save, facilitynames);
- if (fac < 0) {
- fprintf(stderr, "unknown facility name: %s\n", save);
- exit(FALSE);
- }
+ if (fac < 0)
+ error_msg_and_die("unknown facility name: %s\n", save);
*s++ = '.';
} else {
s = save;
}
lev = decode(s, prioritynames);
- if (lev < 0) {
- fprintf(stderr, "unknown priority name: %s\n", save);
- exit(FALSE);
- }
+ if (lev < 0)
+ error_msg_and_die("unknown priority name: %s\n", save);
return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
}
int option = 0;
int fromStdinFlag = FALSE;
int stopLookingAtMeLikeThat = FALSE;
- char *message, buf[1024], name[128];
+ char *message=NULL, buf[1024], name[128];
/* Fill out the name string early (may be overwritten later */
my_getpwuid(name, geteuid());
if (fromStdinFlag == TRUE) {
/* read from stdin */
- int c, i = 0;
+ int c;
+ unsigned int i = 0;
while ((c = getc(stdin)) != EOF && i < sizeof(buf)) {
buf[i++] = c;
message = buf;
} else {
if (argc >= 1) {
- message = *argv;
+ int len = 1; /* for the '\0' */
+ for (; *argv != NULL; argv++) {
+ len += strlen(*argv);
+ len += 1; /* for the space between the args */
+ message = xrealloc(message, len);
+ strcat(message, *argv);
+ strcat(message, " ");
+ }
+ message[strlen(message)-1] = '\0';
} else {
- fprintf(stderr, "No message\n");
- exit(FALSE);
+ error_msg_and_die("No message\n");
}
}
openlog(name, option, (pri | LOG_FACMASK));
- syslog(pri, message);
+ syslog(pri, "%s", message);
closelog();
- exit(TRUE);
+ return EXIT_SUCCESS;
}
+
+
+/*-
+ * Copyright (c) 1983, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This is the original license statement for the decode and pencode functions.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * 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>
+ *
+ * 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
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+
+
projects / oweals / busybox.git / blobdiff