Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/ipcrm.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/ipcrm.c (modified) (3 diffs)

branches/3.2/mindi-busybox/util-linux/ipcrm.c

@@ -8 +8 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+
+//usage:#define ipcrm_trivial_usage
+//usage:       "[-MQS key] [-mqs id]"
+//usage:#define ipcrm_full_usage "\n\n"
+//usage:       "Upper-case options MQS remove an object by shmkey value.\n"
+//usage:       "Lower-case options remove an object by shmid value.\n"
+//usage:     "\n    -mM Remove memory segment after last detach"
+//usage:     "\n    -qQ Remove message queue"
+//usage:     "\n    -sS Remove semaphore"
 
 #include "libbb.h"
@@ -152 +161 @@
             /* convert key to id */
             id = ((c == 'q') ? msgget(key, 0) :
-                  (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
+                (c == 'm') ? shmget(key, 0, 0) : semget(key, 0, 0));
 
             if (id < 0) {
@@ -181 +190 @@
 
         result = ((c == 'q') ? msgctl(id, IPC_RMID, NULL) :
-                  (c == 'm') ? shmctl(id, IPC_RMID, NULL) :
-                  semctl(id, 0, IPC_RMID, arg));
+                (c == 'm') ? shmctl(id, IPC_RMID, NULL) :
+                semctl(id, 0, IPC_RMID, arg));
 
         if (result) {