emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipcs: further code shrink

Browse Source 
function                                             old     new   delta
packed_usage                                       32543   32547      +4
ipcs_main                                           1014     980     -34
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/1 up/down: 4/-34)             Total: -30 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-03-08 13:23:06 +01:00
parent f7fa8001b7
commit 7798282db2
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
util-linux/ipcs.c
View File

@ -565,7 +565,7 @@ static void print_sem(int semid)
//usage:#define ipcs_trivial_usage //usage:#define ipcs_trivial_usage
//usage: "[[-smq] -i SHMID] | [[-asmq] [-tcplu]]" //usage: "[[-smq] -i SHMID] | [[-asmq] [-tcplu]]"
//usage:#define ipcs_full_usage "\n\n" //usage:#define ipcs_full_usage "\n\n"
//usage: " -i Show specific resource" //usage: " -i ID Show specific resource"
//usage: "\nResource specification:" //usage: "\nResource specification:"
//usage: "\n -m Shared memory segments" //usage: "\n -m Shared memory segments"
//usage: "\n -q Message queues" //usage: "\n -q Message queues"
@ -582,56 +582,55 @@ int ipcs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int ipcs_main(int argc UNUSED_PARAM, char **argv) int ipcs_main(int argc UNUSED_PARAM, char **argv)
{ {
int format = 0; int format = 0;
unsigned flags = 0;
unsigned opt; unsigned opt;
char *opt_i; char *opt_i;
#define flag_msg (1<<0)
#define flag_sem (1<<1)
#define flag_shm (1<<2)
opt = getopt32(argv, "i:aqsmtcplu", &opt_i); opt = getopt32(argv, "i:aqsmtcplu", &opt_i);
if (opt & 0x2) flags |= flag_msg | flag_sem | flag_shm; // -a #define flag_msg (1<<2)
if (opt & 0x4) flags |= flag_msg; // -q #define flag_sem (1<<3)
if (opt & 0x8) flags |= flag_sem; // -s #define flag_shm (1<<4)
if (opt & 0x10) flags |= flag_shm; // -m if (opt & (1<<5)) format = TIME; // -t
if (opt & 0x20) format = TIME; // -t if (opt & (1<<6)) format = CREATOR; // -c
if (opt & 0x40) format = CREATOR; // -c if (opt & (1<<7)) format = PID; // -p
if (opt & 0x80) format = PID; // -p if (opt & (1<<8)) format = LIMITS; // -l
if (opt & 0x100) format = LIMITS; // -l if (opt & (1<<9)) format = STATUS; // -u
if (opt & 0x200) format = STATUS; // -u
if (opt & 1) { // -i if (opt & (1<<0)) { // -i
int id; int id;
id = xatoi(opt_i); id = xatoi(opt_i);
if (flags & flag_shm) { if (opt & flag_shm) {
print_shm(id); print_shm(id);
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }
if (flags & flag_sem) { if (opt & flag_sem) {
print_sem(id); print_sem(id);
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }
if (flags & flag_msg) { if (opt & flag_msg) {
print_msg(id); print_msg(id);
fflush_stdout_and_exit(EXIT_SUCCESS); fflush_stdout_and_exit(EXIT_SUCCESS);
} }
bb_show_usage(); bb_show_usage();
} }
if (!(flags & (flag_shm | flag_msg | flag_sem))) if ((opt & (1<<1)) // -a
flags |= flag_msg | flag_shm | flag_sem; || !(opt & (flag_msg | flag_sem | flag_shm)) // none of -q,-s,-m == all
) {
opt |= flag_msg | flag_sem | flag_shm;
}
bb_putchar('\n'); bb_putchar('\n');
if (flags & flag_msg) { if (opt & flag_msg) {
do_msg(format); do_msg(format);
bb_putchar('\n'); bb_putchar('\n');
} }
if (flags & flag_shm) { if (opt & flag_shm) {
do_shm(format); do_shm(format);
bb_putchar('\n'); bb_putchar('\n');
} }
if (flags & flag_sem) { if (opt & flag_sem) {
do_sem(format); do_sem(format);
bb_putchar('\n'); bb_putchar('\n');
} }