gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.

[oweals/busybox.git] / logger.c

diff --git a/logger.c b/logger.c
index 21906401f502c7df5cf7bc1c29902d41ce81efc9..b8aae3d28d9b0bf518c3dc492db3e98954f8dca0 100644 (file)
--- a/logger.c
+++ b/logger.c
@@ -2,7 +2,7 @@
 /*
  * Mini logger implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 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
@@ -21,13 +21,15 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
 
+#include "busybox.h"
 #if !defined BB_SYSLOGD
 
 #define SYSLOG_NAMES
@@ -38,6 +40,7 @@
  * structures.  Argh.... bad libc, bad, bad...
  */
 #include <sys/syslog.h>
+
 typedef struct _code {
        char *c_name;
        int c_val;
@@ -85,14 +88,14 @@ static int pencode(char *s)
                *s = '\0';
                fac = decode(save, facilitynames);
                if (fac < 0)
-                       error_msg_and_die("unknown facility name: %s\n", save);
+                       error_msg_and_die("unknown facility name: %s", save);
                *s++ = '.';
        } else {
                s = save;
        }
        lev = decode(s, prioritynames);
        if (lev < 0)
-               error_msg_and_die("unknown priority name: %s\n", save);
+               error_msg_and_die("unknown priority name: %s", save);
        return ((lev & LOG_PRIMASK) | (fac & LOG_FACMASK));
 }
 
@@ -120,7 +123,7 @@ extern int logger_main(int argc, char **argv)
                                strncpy(name, optarg, sizeof(name));
                                break;
                        default:
-                               usage(logger_usage);
+                               show_usage();
                }
        }
 
@@ -130,6 +133,7 @@ extern int logger_main(int argc, char **argv)
                while ((c = getc(stdin)) != EOF && i < sizeof(buf)) {
                        buf[i++] = c;
                }
+               buf[i++] = '\0';
                message = buf;
        } else {
                len = 1; /* for the '\0' */
@@ -144,10 +148,10 @@ extern int logger_main(int argc, char **argv)
                message[strlen(message)-1] = '\0';
        }
 
-       openlog(name, option, (pri | LOG_FACMASK));
+       /*openlog(name, option, (pri | LOG_FACMASK));
        syslog(pri, "%s", message);
-       closelog();
-
+       closelog();*/
+       syslog_msg_with_name(name,(pri | LOG_FACMASK),pri,message);
        return EXIT_SUCCESS;
 }