1 files changed, 21 insertions, 21 deletions

diff --git a/util-linux/ipcs.c b/util-linux/ipcs.c
index 1404930d4..7092ecd92 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -15,26 +15,10 @@
 //config:       The ipcs utility is used to provide information on the currently
 //config:       allocated System V interprocess (IPC) objects in the system.
 
-//applet:IF_IPCS(APPLET(ipcs, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_IPCS(APPLET_NOEXEC(ipcs, ipcs, BB_DIR_USR_BIN, BB_SUID_DROP, ipcs))
 
 //kbuild:lib-$(CONFIG_IPCS) += ipcs.o
 
-//usage:#define ipcs_trivial_usage
-//usage:       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
-//usage:#define ipcs_full_usage "\n\n"
-//usage:       "        -i      Show specific resource"
-//usage:     "\nResource specification:"
-//usage:     "\n        -m      Shared memory segments"
-//usage:     "\n        -q      Message queues"
-//usage:     "\n        -s      Semaphore arrays"
-//usage:     "\n        -a      All (default)"
-//usage:     "\nOutput format:"
-//usage:     "\n        -t      Time"
-//usage:     "\n        -c      Creator"
-//usage:     "\n        -p      Pid"
-//usage:     "\n        -l      Limits"
-//usage:     "\n        -u      Summary"
-
 /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
 /* X/OPEN tells us to use <sys/{types,ipc,msg}.h> for msgctl() */
 /* X/OPEN tells us to use <sys/{types,ipc,shm}.h> for shmctl() */
@@ -585,6 +569,22 @@ static void print_sem(int semid)
         bb_putchar('\n');
 }
 
+//usage:#define ipcs_trivial_usage
+//usage:       "[[-smq] -i shmid] | [[-asmq] [-tcplu]]"
+//usage:#define ipcs_full_usage "\n\n"
+//usage:       "        -i      Show specific resource"
+//usage:     "\nResource specification:"
+//usage:     "\n        -m      Shared memory segments"
+//usage:     "\n        -q      Message queues"
+//usage:     "\n        -s      Semaphore arrays"
+//usage:     "\n        -a      All (default)"
+//usage:     "\nOutput format:"
+//usage:     "\n        -t      Time"
+//usage:     "\n        -c      Creator"
+//usage:     "\n        -p      Pid"
+//usage:     "\n        -l      Limits"
+//usage:     "\n        -u      Summary"
+
 int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int ipcs_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -632,6 +632,10 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
                 flags |= flag_msg | flag_shm | flag_sem;
         bb_putchar('\n');
 
+        if (flags & flag_msg) {
+                do_msg();
+                bb_putchar('\n');
+        }
         if (flags & flag_shm) {
                 do_shm();
                 bb_putchar('\n');
@@ -640,9 +644,5 @@ int ipcs_main(int argc UNUSED_PARAM, char **argv)
                 do_sem();
                 bb_putchar('\n');
         }
-        if (flags & flag_msg) {
-                do_msg();
-                bb_putchar('\n');
-        }
         fflush_stdout_and_exit(EXIT_SUCCESS);
 }