From: Milan Broz <mbroz@redhat.com>
Date: Thu, 26 Jul 2012 13:52:07 +0000 (+0200)
Subject: findmnt: support -o +<attr> for adding attribute to output fields.
X-Git-Tag: v2.22-rc2~66
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c57dca6877d431095ff1d3c4158ffe4352766b7e;p=thirdparty%2Futil-linux.git

findmnt: support -o +<attr> for adding attribute to output fields.

Signed-off-by: Milan Broz <mbroz@redhat.com>
---

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index f32a4b92d5..db40323e36 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;