Fix the pwd and group functions. The bb_ stuff was a leftover from

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index 4217c362f140f5f6a8d2e3923faf921cfdc6e64d..8eb74c69f3353d9b24634aad156babb38d34511f 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>
@@ -34,6 +34,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 +42,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__
@@ -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;
 
@@ -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) {
@@ -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);