From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: util-linux-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:48481 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002Ab2GZNw3 (ORCPT ); Thu, 26 Jul 2012 09:52:29 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6QDqTXM027348 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 26 Jul 2012 09:52:29 -0400 From: Milan Broz To: util-linux@vger.kernel.org Cc: Milan Broz Subject: [PATCH 2/5] lsblk: support -o + for adding attribute to output fields. Date: Thu, 26 Jul 2012 15:52:05 +0200 Message-Id: <1343310728-16624-2-git-send-email-mbroz@redhat.com> In-Reply-To: <1343310728-16624-1-git-send-email-mbroz@redhat.com> References: <1343304884-14297-1-git-send-email-mbroz@redhat.com> <1343310728-16624-1-git-send-email-mbroz@redhat.com> Sender: util-linux-owner@vger.kernel.org List-ID: Signed-off-by: Milan Broz --- misc-utils/lsblk.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c index cb2b768..19c8edd 100644 --- a/misc-utils/lsblk.c +++ b/misc-utils/lsblk.c @@ -1213,6 +1213,7 @@ int main(int argc, char *argv[]) struct lsblk _ls; int tt_flags = TT_FL_TREE; int i, c, status = EXIT_FAILURE; + char *outarg = NULL; enum { EXCL_NONE, @@ -1290,11 +1291,7 @@ int main(int argc, char *argv[]) tt_flags |= TT_FL_NOHEADINGS; break; case 'o': - ncolumns = string_to_idarray(optarg, - columns, ARRAY_SIZE(columns), - column_name_to_id); - if (ncolumns < 0) - return EXIT_FAILURE; + outarg = optarg; break; case 'P': exclusive_option(&excl_rlP, EXCL_PAIRS, "--{raw,list,pairs}"); @@ -1363,6 +1360,10 @@ int main(int argc, char *argv[]) columns[ncolumns++] = COL_TARGET; } + if (outarg && string_add_to_idarray(outarg, columns, ARRAY_SIZE(columns), + &ncolumns, column_name_to_id) < 0) + return EXIT_FAILURE; + if (nexcludes == 0 && nincludes == 0) excludes[nexcludes++] = 1; /* default: ignore RAM disks */ -- 1.7.10.4