Thought of another janitorial item for the list.

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index 7501380f607907e29809e54b3b617df08f788dca..8049fc5d1675777c5b599b1631808f03f21e491e 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -2,7 +2,7 @@
 /*
  * Mini syslogd 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>
  *
  * Copyright (C) 2000 by Karl M. Hegbloom <karlheg@debian.org>
@@ -23,7 +23,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -34,6 +33,7 @@
 #include <signal.h>
 #include <stdarg.h>
 #include <time.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/types.h>
@@ -41,7 +41,8 @@
 #include <sys/param.h>
 
 #if ! defined __GLIBC__ && ! defined __UCLIBC__
-
+#include <sys/syscall.h>
+#include <linux/unistd.h>
 typedef unsigned int socklen_t;
 
 #ifndef __alpha__
@@ -54,6 +55,7 @@ static inline _syscall3(int, klogctl, int, type, char *, b, int, len);
 #else
 # include <sys/klog.h>
 #endif
+#include "busybox.h"
 
 
 
@@ -143,7 +145,7 @@ static void logMessage (int pri, char *msg)
                                c_fac->c_name && !(c_fac->c_val == LOG_FAC(pri) << 3); c_fac++);
                for (c_pri = prioritynames;
                                c_pri->c_name && !(c_pri->c_val == LOG_PRI(pri)); c_pri++);
-               if (*c_fac->c_name == '\0' || *c_pri->c_name == '\0')
+               if (c_fac->c_name == NULL || c_pri->c_name == NULL)
                        snprintf(res, sizeof(res), "<%d>", pri);
                else
                        snprintf(res, sizeof(res), "%s.%s", c_fac->c_name, c_pri->c_name);
@@ -165,7 +167,7 @@ static void logMessage (int pri, char *msg)
 #ifdef BB_FEATURE_REMOTE_LOG
        /* send message to remote logger */
        if ( -1 != remotefd){
-#define IOV_COUNT 2
+static const int IOV_COUNT = 2;
                struct iovec iov[IOV_COUNT];
                struct iovec *v = iov;
 
@@ -180,7 +182,7 @@ static void logMessage (int pri, char *msg)
 
                if ( -1 == writev(remotefd,iov, IOV_COUNT)){
                        error_msg_and_die("syslogd: cannot write to remote file handle on" 
-                                       "%s:%d\n",RemoteHost,RemotePort);
+                                       "%s:%d",RemoteHost,RemotePort);
                }
        }
        if (local_logging == TRUE)
@@ -206,10 +208,10 @@ static void domark(int sig)
        }
 }
 
-#define BUFSIZE 1023
+static const int BUFSIZE = 1023;
 static int serveConnection (int conn)
 {
-       char   buf[ BUFSIZE + 1 ];
+       RESERVE_BB_BUFFER(buf, BUFSIZE + 1);
        int    n_read;
 
        while ((n_read = read (conn, buf, BUFSIZE )) > 0) {
@@ -262,13 +264,13 @@ static void init_RemoteLog (void){
   remotefd = socket(AF_INET, SOCK_DGRAM, 0);
 
   if (remotefd < 0) {
-    error_msg_and_die("syslogd: cannot create socket\n");
+    error_msg_and_die("syslogd: cannot create socket");
   }
 
   hostinfo = (struct hostent *) gethostbyname(RemoteHost);
 
   if (!hostinfo) {
-    error_msg_and_die("syslogd: cannot resolve remote host name [%s]\n", RemoteHost);
+    error_msg_and_die("syslogd: cannot resolve remote host name [%s]", RemoteHost);
   }
 
   remoteaddr.sin_family = AF_INET;
@@ -280,7 +282,7 @@ static void init_RemoteLog (void){
      for future operations
   */
   if ( 0 != (connect(remotefd, (struct sockaddr *) &remoteaddr, len))){
-    error_msg_and_die("syslogd: cannot connect to remote host %s:%d\n", RemoteHost, RemotePort);
+    error_msg_and_die("syslogd: cannot connect to remote host %s:%d", RemoteHost, RemotePort);
   }
 
 }
@@ -296,7 +298,7 @@ static void doSyslogd (void)
        int sock_fd;
        fd_set fds;
 
-       char lfile[BUFSIZ];
+       RESERVE_BB_BUFFER(lfile, BUFSIZ);
 
        /* Set up signal handlers. */
        signal (SIGINT,  quit_signal);
@@ -313,7 +315,7 @@ static void doSyslogd (void)
        /* Create the syslog file so realpath() can work. */
        close (open (_PATH_LOG, O_RDWR | O_CREAT, 0644));
        if (realpath (_PATH_LOG, lfile) == NULL)
-               error_msg_and_die ("Could not resolve path to " _PATH_LOG ": %s\n", strerror (errno));
+               perror_msg_and_die ("Could not resolve path to " _PATH_LOG);
 
        unlink (lfile);
 
@@ -321,14 +323,14 @@ static void doSyslogd (void)
        sunx.sun_family = AF_UNIX;
        strncpy (sunx.sun_path, lfile, sizeof (sunx.sun_path));
        if ((sock_fd = socket (AF_UNIX, SOCK_STREAM, 0)) < 0)
-               error_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG ": %s\n", strerror (errno));
+               perror_msg_and_die ("Couldn't obtain descriptor for socket " _PATH_LOG);
 
        addrLength = sizeof (sunx.sun_family) + strlen (sunx.sun_path);
        if ((bind (sock_fd, (struct sockaddr *) &sunx, addrLength)) || (listen (sock_fd, 5)))
-               error_msg_and_die ("Could not connect to socket " _PATH_LOG ": %s\n", strerror (errno));
+               perror_msg_and_die ("Could not connect to socket " _PATH_LOG);
 
        if (chmod (lfile, 0666) < 0)
-               error_msg_and_die ("Could not set permission on " _PATH_LOG ": %s\n", strerror (errno));
+               perror_msg_and_die ("Could not set permission on " _PATH_LOG);
 
        FD_ZERO (&fds);
        FD_SET (sock_fd, &fds);
@@ -351,7 +353,7 @@ static void doSyslogd (void)
 
                if ((n_ready = select (FD_SETSIZE, &readfds, NULL, NULL, NULL)) < 0) {
                        if (errno == EINTR) continue; /* alarm may have happened. */
-                       error_msg_and_die ("select error: %s\n", strerror (errno));
+                       perror_msg_and_die ("select error");
                }
 
                for (fd = 0; (n_ready > 0) && (fd < FD_SETSIZE); fd++) {
@@ -365,7 +367,7 @@ static void doSyslogd (void)
                                        pid_t pid;
 
                                        if ((conn = accept (sock_fd, (struct sockaddr *) &sunx, &addrLength)) < 0) {
-                                               error_msg_and_die ("accept error: %s\n", strerror (errno));
+                                               perror_msg_and_die ("accept error");
                                        }
 
                                        pid = fork();
@@ -517,7 +519,7 @@ extern int syslogd_main(int argc, char **argv)
                                break;
 #endif
                        default:
-                               usage(syslogd_usage);
+                               show_usage();
                }
        }