diff options
| author | Ruediger Meier | 2016-03-21 14:04:45 +0100 |
|---|---|---|
| committer | Karel Zak | 2016-03-21 21:03:42 +0100 |
| commit | fcae406394af6e1a5b298638fe017053c22ef9e8 (patch) | |
| tree | 3c2e379605d596f519b459d20867ea93806bfbae /sys-utils/ipcs.c | |
| parent | tests: skip ipcs test which require /proc (diff) | |
| download | kernel-qcow2-util-linux-fcae406394af6e1a5b298638fe017053c22ef9e8.tar.gz kernel-qcow2-util-linux-fcae406394af6e1a5b298638fe017053c22ef9e8.tar.xz kernel-qcow2-util-linux-fcae406394af6e1a5b298638fe017053c22ef9e8.zip | |
ipcs: consolidate output header printing
Print a warning (instead of header) if --limits fails, like we did
it in past (2.20.1) and like we are still doing for --summary. Note
in past we were printing the same message like for --summary
"kernel not configured for ...", but actually this message is not
really correct.
This patch simply consolidates the current behavior. Probably we
should refactor it regarding warnings (stderr) and exit codes.
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
Diffstat (limited to 'sys-utils/ipcs.c')
| -rw-r--r-- | sys-utils/ipcs.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 0ebcc4c62..10ce23883 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -199,9 +199,11 @@ static void do_shm (char format, int unit) { struct ipc_limits lim; - printf (_("------ Shared Memory Limits --------\n")); - if (ipc_shm_get_limits(&lim)) + if (ipc_shm_get_limits(&lim)) { + printf (_("unable to fetch shared memory limits\n")); return; + } + printf (_("------ Shared Memory Limits --------\n")); printf (_("max number of segments = %ju\n"), lim.shmmni); ipc_print_size(unit == IPC_UNIT_DEFAULT ? IPC_UNIT_KB : unit, _("max seg size"), lim.shmmax, "\n", 0); @@ -351,9 +353,11 @@ static void do_sem (char format) { struct ipc_limits lim; - printf (_("------ Semaphore Limits --------\n")); - if (ipc_sem_get_limits(&lim)) + if (ipc_sem_get_limits(&lim)) { + printf (_("unable to fetch semaphore limits\n")); return; + } + printf (_("------ Semaphore Limits --------\n")); printf (_("max number of arrays = %d\n"), lim.semmni); printf (_("max semaphores per array = %d\n"), lim.semmsl); printf (_("max semaphores system wide = %d\n"), lim.semmns); @@ -451,8 +455,10 @@ static void do_msg (char format, int unit) { struct ipc_limits lim; - if (ipc_msg_get_limits(&lim)) + if (ipc_msg_get_limits(&lim)) { + printf (_("unable to fetch message limits\n")); return; + } printf (_("------ Messages Limits --------\n")); printf (_("max queues system wide = %d\n"), lim.msgmni); ipc_print_size(unit == IPC_UNIT_DEFAULT ? IPC_UNIT_BYTES : unit, |