diff options
| author | Karel Zak | 2015-07-20 11:56:44 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-07-20 11:56:44 +0200 |
| commit | 25456d5da3dac2f563c8d7e44dab0bb4143426d9 (patch) | |
| tree | 2f0c748fa6045ca38019c08a2acb74851c78ba1b /sys-utils/lsipc.c | |
| parent | lsipc: add USE% to --global (diff) | |
| download | kernel-qcow2-util-linux-25456d5da3dac2f563c8d7e44dab0bb4143426d9.tar.gz kernel-qcow2-util-linux-25456d5da3dac2f563c8d7e44dab0bb4143426d9.tar.xz kernel-qcow2-util-linux-25456d5da3dac2f563c8d7e44dab0bb4143426d9.zip | |
lsipc: default to --global
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/lsipc.c')
| -rw-r--r-- | sys-utils/lsipc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 032ba7f0a..7a648bf1f 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -1200,14 +1200,7 @@ int main(int argc, char *argv[]) break; case 'g': global = 1; - add_column(columns, ncolumns++, COL_RESOURCE); - add_column(columns, ncolumns++, COL_DESC); - add_column(columns, ncolumns++, COL_LIMIT); - add_column(columns, ncolumns++, COL_USED); - add_column(columns, ncolumns++, COL_USEPERC); - LOWER = COLDESC_IDX_SUM_FIRST; - UPPER = COLDESC_IDX_SUM_LAST; - break; + break; case 'q': msg = 1; add_column(columns, ncolumns++, COL_KEY); @@ -1284,12 +1277,19 @@ int main(int argc, char *argv[]) } } - if (msg + shm + sem != 1 && !global) - errx (EXIT_FAILURE, - _("One of --shmems, --queues, --semaphores or --glocal must be specified")); - - if (global && msg + shm + sem == 0) - msg = shm = sem = 1; + /* default is global */ + if (msg + shm + sem == 0) + msg = shm = sem = global = 1; + + if (global) { + add_column(columns, ncolumns++, COL_RESOURCE); + add_column(columns, ncolumns++, COL_DESC); + add_column(columns, ncolumns++, COL_LIMIT); + add_column(columns, ncolumns++, COL_USED); + add_column(columns, ncolumns++, COL_USEPERC); + LOWER = COLDESC_IDX_SUM_FIRST; + UPPER = COLDESC_IDX_SUM_LAST; + } if (!ctl->time_mode) ctl->time_mode = ctl->outmode == OUT_PRETTY ? TIME_FULL : TIME_SHORT; |