diff options
| author | Karel Zak | 2015-07-01 11:52:25 +0200 |
|---|---|---|
| committer | Karel Zak | 2015-07-20 11:48:09 +0200 |
| commit | c8b47062abdb69fe76af32e449f47f0597254eeb (patch) | |
| tree | 331c3a8bd355d5fa063deb18a98018a38f603b31 /sys-utils/lsipc.c | |
| parent | lsipc: cleanup -o usage (diff) | |
| download | kernel-qcow2-util-linux-c8b47062abdb69fe76af32e449f47f0597254eeb.tar.gz kernel-qcow2-util-linux-c8b47062abdb69fe76af32e449f47f0597254eeb.tar.xz kernel-qcow2-util-linux-c8b47062abdb69fe76af32e449f47f0597254eeb.zip | |
lsipc: fix ID parsing, use full time for pretty print
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/lsipc.c')
| -rw-r--r-- | sys-utils/lsipc.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys-utils/lsipc.c b/sys-utils/lsipc.c index 2cc93aa30..a013b0d13 100644 --- a/sys-utils/lsipc.c +++ b/sys-utils/lsipc.c @@ -48,7 +48,7 @@ enum { TIME_INVALID = 0, TIME_SHORT, TIME_FULL, - TIME_ISO, + TIME_ISO }; /* @@ -1061,7 +1061,7 @@ int main(int argc, char *argv[]) textdomain(PACKAGE); atexit(close_stdout); - ctl->time_mode = TIME_SHORT; + ctl->time_mode = 0; while ((opt = getopt_long(argc, argv, "bceghi:Jmno:PqrstuVz", longopts, NULL)) != -1) { @@ -1072,7 +1072,7 @@ int main(int argc, char *argv[]) ctl->bytes = 1; break; case 'i': - id = atoi (optarg); + id = strtos32_or_err(optarg, _("failed to parse IPC identifier")); outmode = OUT_PRETTY; break; case OPT_COLON: @@ -1179,6 +1179,9 @@ int main(int argc, char *argv[]) if (global && msg + shm + sem == 0) msg = shm = sem = 1; + if (!ctl->time_mode) + ctl->time_mode = outmode == OUT_PRETTY ? TIME_FULL : TIME_SHORT; + if (outmode == OUT_PRETTY && !optarg) { /* all columns for lsipc --<RESOURCE> --id <ID> */ for (ncolumns = 0, i = 0; i < ARRAY_SIZE(coldescs); i++) |