update the changelog, prepatory to the 0.51 release. Please review

[oweals/busybox.git] / syslogd.c

diff --git a/syslogd.c b/syslogd.c
index cc42c29426208bdadcd3e8f3cd2890016379cb7c..6aec78b4ef8ceab59e3d3dd3a6e7ef3da2aa2795 100644 (file)
--- a/syslogd.c
+++ b/syslogd.c
@@ -119,7 +119,7 @@ static inline void sem_up(int semid)
  */
 static inline void sem_down(int semid)
 {
-       if ( semop(semid, SMwdn, 2) == -1 )
+       if ( semop(semid, SMwdn, 3) == -1 )
                perror_msg_and_die("semop[SMwdn]");
 }
 
@@ -155,6 +155,8 @@ void ipcsyslog_init(void){
                    perror_msg_and_die("semget");
                }else
                        perror_msg_and_die("semget");
+           } else {
+                   sem_up(s_semid);
            }
        }else{
                printf("Buffer already allocated just grab the semaphore?");
@@ -514,6 +516,12 @@ static void doSyslogd (void)
        FD_ZERO (&fds);
        FD_SET (sock_fd, &fds);
 
+#ifdef BB_FEATURE_IPC_SYSLOG
+       if (circular_logging == TRUE ){
+          ipcsyslog_init();
+       }
+#endif
+
         #ifdef BB_FEATURE_REMOTE_LOG
         if (doRemoteLog == TRUE){
           init_RemoteLog();
@@ -562,18 +570,9 @@ static void doSyslogd (void)
        } /* for main loop */
 }
 
-static void daemon_init (char **argv, char *dz, void fn (void))
-{
-       setsid();
-       chdir ("/");
-       strncpy(argv[0], dz, strlen(argv[0]));
-       fn();
-       exit(0);
-}
-
 extern int syslogd_main(int argc, char **argv)
 {
-       int opt, pid;
+       int opt;
        int doFork = TRUE;
 
        char *p;
@@ -628,22 +627,11 @@ extern int syslogd_main(int argc, char **argv)
 
        umask(0);
 
-#ifdef BB_FEATURE_IPC_SYSLOG
-       if (circular_logging == TRUE ){
-          ipcsyslog_init();
-       }
-#endif
-
        if (doFork == TRUE) {
-               pid = fork();
-               if (pid < 0)
-                       exit(pid);
-               else if (pid == 0) {
-                       daemon_init (argv, "syslogd", doSyslogd);
-               }
-       } else {
-               doSyslogd();
+               if (daemon(0, 1) < 0)
+                       perror_msg_and_die("daemon");
        }
+       doSyslogd();
 
        return EXIT_SUCCESS;
 }