diff options
| author | Karel Zak | 2018-05-10 12:15:32 +0200 |
|---|---|---|
| committer | Karel Zak | 2018-05-10 12:15:32 +0200 |
| commit | c9fdebcf540147fe3108971fc9c80d505867f711 (patch) | |
| tree | 41c8567518c27e21cb371af95518a12140778469 /login-utils | |
| parent | Merge branch 'fixes' of https://github.com/yontalcar/util-linux (diff) | |
| parent | zramctl: add --output-all option (diff) | |
| download | kernel-qcow2-util-linux-c9fdebcf540147fe3108971fc9c80d505867f711.tar.gz kernel-qcow2-util-linux-c9fdebcf540147fe3108971fc9c80d505867f711.tar.xz kernel-qcow2-util-linux-c9fdebcf540147fe3108971fc9c80d505867f711.zip | |
Merge branch 'output-all' of https://github.com/kerolasa/lelux-utiliteetit
* 'output-all' of https://github.com/kerolasa/lelux-utiliteetit:
zramctl: add --output-all option
swapon: add --output-all option
rfkill: add --output-all option
partx: add --output-all option
lsns: add --output-all option
lsmem: add --output-all option
lslogins: add --output-all option
lslocks: add --output-all option
lscpu: add --output-all option
losetup: add --output-all option
findmnt: add --output-all option
Diffstat (limited to 'login-utils')
| -rw-r--r-- | login-utils/lslogins.1 | 3 | ||||
| -rw-r--r-- | login-utils/lslogins.c | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/login-utils/lslogins.1 b/login-utils/lslogins.1 index bd6955f82..b56bd57f0 100644 --- a/login-utils/lslogins.1 +++ b/login-utils/lslogins.1 @@ -67,6 +67,9 @@ Don't truncate output. .TP \fB\-o\fR, \fB\-\-output \fIlist\fP Specify which output columns to print. Use +.TP +.B \-\-output\-all +Output all available columns. .B \-\-help to get a list of all supported columns. .TP diff --git a/login-utils/lslogins.c b/login-utils/lslogins.c index 51033b01b..727b1d65b 100644 --- a/login-utils/lslogins.c +++ b/login-utils/lslogins.c @@ -1241,6 +1241,7 @@ static void __attribute__((__noreturn__)) usage(void) fputs(_(" --noheadings don't print headings\n"), out); fputs(_(" --notruncate don't truncate output\n"), out); fputs(_(" -o, --output[=<list>] define the columns to output\n"), out); + fputs(_(" --output-all output all columns\n"), out); fputs(_(" -p, --pwd display information related to login by password.\n"), out); fputs(_(" -r, --raw display in raw mode\n"), out); fputs(_(" -s, --system-accs display system accounts\n"), out); @@ -1277,6 +1278,7 @@ int main(int argc, char *argv[]) OPT_NOTRUNC, OPT_NOHEAD, OPT_TIME_FMT, + OPT_OUTPUT_ALL, }; static const struct option longopts[] = { @@ -1292,6 +1294,7 @@ int main(int argc, char *argv[]) { "notruncate", no_argument, 0, OPT_NOTRUNC }, { "noheadings", no_argument, 0, OPT_NOHEAD }, { "output", required_argument, 0, 'o' }, + { "output-all", no_argument, 0, OPT_OUTPUT_ALL }, { "last", no_argument, 0, 'L', }, { "raw", no_argument, 0, 'r' }, { "system-accs", no_argument, 0, 's' }, @@ -1385,6 +1388,10 @@ int main(int argc, char *argv[]) return EXIT_FAILURE; opt_o = 1; break; + case OPT_OUTPUT_ALL: + for (ncolumns = 0; (size_t)ncolumns < ARRAY_SIZE(coldescs); ncolumns++) + columns[ncolumns] = ncolumns; + break; case 'r': outmode = OUT_RAW; break; |