Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/sysklogd/logread.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/sysklogd/logread.c (modified) (4 diffs)

branches/2.2.9/mindi-busybox/sysklogd/logread.c

@@ -7 +7 @@
  * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -17 +17 @@
 #define DEBUG 0
 
+/* our shared key (syslogd.c and logread.c must be in sync) */
 enum { KEY_ID = 0x414e4547 }; /* "GENA" */
 
-static struct shbuf_ds {
+struct shbuf_ds {
     int32_t size;           // size of data - 1
     int32_t tail;           // end of message list
     char data[1];           // messages
-} *shbuf;
+};
 
-// Semaphore operation structures
-static struct sembuf SMrup[1] = {{0, -1, IPC_NOWAIT | SEM_UNDO}}; // set SMrup
-static struct sembuf SMrdn[2] = {{1, 0}, {0, +1, SEM_UNDO}}; // set SMrdn
+static const struct sembuf init_sem[3] = {
+    {0, -1, IPC_NOWAIT | SEM_UNDO},
+    {1, 0}, {0, +1, SEM_UNDO}
+};
 
+struct globals {
+    struct sembuf SMrup[1]; // {0, -1, IPC_NOWAIT | SEM_UNDO},
+    struct sembuf SMrdn[2]; // {1, 0}, {0, +1, SEM_UNDO}
+    struct shbuf_ds *shbuf;
+} FIX_ALIASING;
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define SMrup (G.SMrup)
+#define SMrdn (G.SMrdn)
+#define shbuf (G.shbuf)
+#define INIT_G() do { \
+    memcpy(SMrup, init_sem, sizeof(init_sem)); \
+} while (0)
 
-static void error_exit(const char *str) ATTRIBUTE_NORETURN;
+static void error_exit(const char *str) NORETURN;
 static void error_exit(const char *str)
 {
@@ -47 +61 @@
 }
 
-static void interrupted(int sig ATTRIBUTE_UNUSED)
+static void interrupted(int sig UNUSED_PARAM)
 {
     signal(SIGINT, SIG_IGN);
     shmdt(shbuf);
-    exit(0);
+    exit(EXIT_SUCCESS);
 }
 
-int logread_main(int argc, char **argv);
-int logread_main(int argc, char **argv)
+int logread_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int logread_main(int argc UNUSED_PARAM, char **argv)
 {
-    int cur;
+    unsigned cur;
     int log_semid; /* ipc semaphore id */
     int log_shmid; /* ipc shared memory id */
     smallint follow = getopt32(argv, "f");
+
+    INIT_G();
 
     log_shmid = shmget(KEY_ID, 0, 0);
@@ -120 +136 @@
             if (cur == shbuf_tail) {
                 sem_up(log_semid);
-                fflush(stdout);
+                fflush_all();
                 sleep(1); /* TODO: replace me with a sleep_on */
                 continue;