Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/util-linux/ipcs.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/util-linux/ipcs.c (modified) (8 diffs)

branches/2.2.9/mindi-busybox/util-linux/ipcs.c

@@ -6 +6 @@
  * Adapted for busybox from util-linux-2.12a.
  *
- * 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.
  */
 
@@ -69 +69 @@
     int val;
     struct semid_ds *buf;
-    unsigned short int *array;
+    unsigned short *array;
     struct seminfo *__buf;
 };
@@ -100 +100 @@
     printf("%-10d %-10o", id, ipcp->mode & 0777);
 
-    if ((pw = getpwuid(ipcp->cuid)))
-        printf(" %-10s", pw->pw_name);
-    else
-        printf(" %-10d", ipcp->cuid);
-    if ((gr = getgrgid(ipcp->cgid)))
-        printf(" %-10s", gr->gr_name);
-    else
-        printf(" %-10d", ipcp->cgid);
-
-    if ((pw = getpwuid(ipcp->uid)))
-        printf(" %-10s", pw->pw_name);
-    else
-        printf(" %-10d", ipcp->uid);
-    if ((gr = getgrgid(ipcp->gid)))
-        printf(" %-10s\n", gr->gr_name);
-    else
-        printf(" %-10d\n", ipcp->gid);
-}
-
-
-static void do_shm(void)
+    pw = getpwuid(ipcp->cuid);
+    if (pw) printf(" %-10s", pw->pw_name);
+    else    printf(" %-10d", ipcp->cuid);
+    gr = getgrgid(ipcp->cgid);
+    if (gr) printf(" %-10s", gr->gr_name);
+    else    printf(" %-10d", ipcp->cgid);
+
+    pw = getpwuid(ipcp->uid);
+    if (pw) printf(" %-10s", pw->pw_name);
+    else    printf(" %-10d", ipcp->uid);
+    gr = getgrgid(ipcp->gid);
+    if (gr) printf(" %-10s\n", gr->gr_name);
+    else    printf(" %-10d\n", ipcp->gid);
+}
+
+
+static NOINLINE void do_shm(void)
 {
     int maxid, shmid, id;
@@ -247 +243 @@
 
 
-static void do_sem(void)
+static NOINLINE void do_sem(void)
 {
     int maxid, semid, id;
@@ -353 +349 @@
 
 
-static void do_msg(void)
+static NOINLINE void do_msg(void)
 {
     int maxid, msqid, id;
@@ -560 +556 @@
         printf("%-10d %-10d %-10d %-10d %-10d\n", i, val, ncnt, zcnt, pid);
     }
-    puts("");
-}
-
-int ipcs_main(int argc, char **argv);
-int ipcs_main(int argc, char **argv)
+    bb_putchar('\n');
+}
+
+int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipcs_main(int argc UNUSED_PARAM, char **argv)
 {
     int id = 0;
@@ -593 +589 @@
         if (flags & flag_shm) {
             print_shm(id);
-            fflush_stdout_and_exit(0);
+            fflush_stdout_and_exit(EXIT_SUCCESS);
         }
         if (flags & flag_sem) {
             print_sem(id);
-            fflush_stdout_and_exit(0);
+            fflush_stdout_and_exit(EXIT_SUCCESS);
         }
         if (flags & flag_msg) {
             print_msg(id);
-            fflush_stdout_and_exit(0);
+            fflush_stdout_and_exit(EXIT_SUCCESS);
         }
         bb_show_usage();
@@ -608 +604 @@
     if (!(flags & (flag_shm | flag_msg | flag_sem)))
         flags |= flag_msg | flag_shm | flag_sem;
-    puts("");
+    bb_putchar('\n');
 
     if (flags & flag_shm) {
         do_shm();
-        puts("");
+        bb_putchar('\n');
     }
     if (flags & flag_sem) {
         do_sem();
-        puts("");
+        bb_putchar('\n');
     }
     if (flags & flag_msg) {
         do_msg();
-        puts("");
-    }
-    fflush_stdout_and_exit(0);
-}
+        bb_putchar('\n');
+    }
+    fflush_stdout_and_exit(EXIT_SUCCESS);
+}