gz_open and gz_close were left in, even when BB_FEATURE_TAR_GZIP was disabled.
[oweals/busybox.git] / logger.c
index 85c63b8a5a13a57306fccdc53225204c27b68329..b8aae3d28d9b0bf518c3dc492db3e98954f8dca0 100644 (file)
--- a/logger.c
+++ b/logger.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/types.h>
@@ -30,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include "busybox.h"
 #if !defined BB_SYSLOGD
 
 #define SYSLOG_NAMES
@@ -40,6 +40,7 @@
  * structures.  Argh.... bad libc, bad, bad...
  */
 #include <sys/syslog.h>
+
 typedef struct _code {
        char *c_name;
        int c_val;
@@ -122,7 +123,7 @@ extern int logger_main(int argc, char **argv)
                                strncpy(name, optarg, sizeof(name));
                                break;
                        default:
-                               usage(logger_usage);
+                               show_usage();
                }
        }
 
@@ -147,9 +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;
 }