diff options
| author | Milan Broz | 2012-07-26 15:52:07 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-07-27 09:56:54 +0200 |
| commit | c57dca6877d431095ff1d3c4158ffe4352766b7e (patch) | |
| tree | 6a29a0d76ad3165acb11af4ea183d1ab7155d5e7 /misc-utils/findmnt.c | |
| parent | tests: update non-lib build tests (diff) | |
| download | kernel-qcow2-util-linux-c57dca6877d431095ff1d3c4158ffe4352766b7e.tar.gz kernel-qcow2-util-linux-c57dca6877d431095ff1d3c4158ffe4352766b7e.tar.xz kernel-qcow2-util-linux-c57dca6877d431095ff1d3c4158ffe4352766b7e.zip | |
findmnt: support -o +<attr> for adding attribute to output fields.
Signed-off-by: Milan Broz <mbroz@redhat.com>
Diffstat (limited to 'misc-utils/findmnt.c')
| -rw-r--r-- | misc-utils/findmnt.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index f32a4b92d..db40323e3 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -1041,6 +1041,7 @@ int main(int argc, char *argv[]) int direction = MNT_ITER_FORWARD; int i, c, rc = -1, timeout = -1; int ntabfiles = 0, tabtype = 0; + char *outarg = NULL; struct tt *tt = NULL; @@ -1144,11 +1145,7 @@ int main(int argc, char *argv[]) disable_columns_truncate(); break; case 'o': - ncolumns = string_to_idarray(optarg, - columns, ARRAY_SIZE(columns), - column_name_to_id); - if (ncolumns < 0) - exit(EXIT_FAILURE); + outarg = optarg; break; case 'O': set_match(COL_OPTIONS, optarg); @@ -1245,6 +1242,10 @@ int main(int argc, char *argv[]) columns[ncolumns++] = COL_OPTIONS; } + if (outarg && string_add_to_idarray(outarg, columns, ARRAY_SIZE(columns), + &ncolumns, column_name_to_id) < 0) + return EXIT_FAILURE; + if (!tabtype) tabtype = TABTYPE_KERNEL; |