1 files changed, 11 insertions, 5 deletions

diff --git a/sysklogd/logread.c b/sysklogd/logread.c
index 2b6415f47..bea73d932 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -49,6 +49,7 @@ struct globals {
         memcpy(SMrup, init_sem, sizeof(init_sem)); \
 } while (0)
 
+#if 0
 static void error_exit(const char *str) NORETURN;
 static void error_exit(const char *str)
 {
@@ -56,6 +57,10 @@ static void error_exit(const char *str)
         shmdt(shbuf);
         bb_perror_msg_and_die(str);
 }
+#else
+/* On Linux, shmdt is not mandatory on exit */
+# define error_exit(str) bb_perror_msg_and_die(str)
+#endif
 
 /*
  * sem_up - up()'s a semaphore.
@@ -68,7 +73,7 @@ static void sem_up(int semid)
 
 static void interrupted(int sig)
 {
-        shmdt(shbuf);
+        /* shmdt(shbuf); - on Linux, shmdt is not mandatory on exit */
         kill_myself_with_sig(sig);
 }
 
@@ -84,12 +89,12 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
 
         log_shmid = shmget(KEY_ID, 0, 0);
         if (log_shmid == -1)
-                bb_perror_msg_and_die("can't find syslogd buffer");
+                bb_perror_msg_and_die("can't %s syslogd buffer", "find");
 
         /* Attach shared memory to our char* */
         shbuf = shmat(log_shmid, NULL, SHM_RDONLY);
         if (shbuf == NULL)
-                bb_perror_msg_and_die("can't access syslogd buffer");
+                bb_perror_msg_and_die("can't %s syslogd buffer", "access");
 
         log_semid = semget(KEY_ID, 0, 0);
         if (log_semid == -1)
@@ -121,7 +126,7 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                 shbuf_data = shbuf->data; /* pointer! */
 
                 if (DEBUG)
-                        printf("cur:%d tail:%i size:%i\n",
+                        printf("cur:%u tail:%u size:%u\n",
                                         cur, shbuf_tail, shbuf_size);
 
                 if (!follow) {
@@ -182,9 +187,10 @@ int logread_main(int argc UNUSED_PARAM, char **argv)
                 }
                 free(copy);
 #endif
+                fflush_all();
         } while (follow);
 
-        shmdt(shbuf);
+        /* shmdt(shbuf); - on Linux, shmdt is not mandatory on exit */
 
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }