lscpu: add --output-all option

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

3 files changed, 16 insertions, 0 deletions

diff --git a/bash-completion/lscpu b/bash-completion/lscpu
index 69337acef..4d3582fd4 100644
--- a/bash-completion/lscpu
+++ b/bash-completion/lscpu
@@ -37,6 +37,7 @@ _lscpu_module()
 				--sysroot
 				--hex
 				--physical
+				--output-all
 				--help
 				--version"
 			COMPREPLY=( $(compgen -W "${OPTS_ALL[*]}" -- $cur) )
diff --git a/sys-utils/lscpu.1 b/sys-utils/lscpu.1
index b70f2e151..fa7a475ba 100644
--- a/sys-utils/lscpu.1
+++ b/sys-utils/lscpu.1
@@ -161,6 +161,10 @@ The CPU logical numbers are not affected by this option.
 .TP
 .BR \-V , " \-\-version"
 Display version information and exit.
+.TP
+.B \-\-output\-all
+Output all available columns.  This option must be combined with either
+.BR \-\-extended " or " \-\-parse .
 .SH BUGS
 The basic overview of CPU family, model, etc. is always based on the first
 CPU only.
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
index 2132511a5..f260fe7ca 100644
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@ -1932,6 +1932,9 @@ int main(int argc, char *argv[])
 	int columns[ARRAY_SIZE(coldescs)], ncolumns = 0;
 	int cpu_modifier_specified = 0;
 
+	enum {
+		OPT_OUTPUT_ALL = CHAR_MAX + 1,
+	};
 	static const struct option longopts[] = {
 		{ "all",        no_argument,       NULL, 'a' },
 		{ "online",     no_argument,       NULL, 'b' },
@@ -1944,6 +1947,7 @@ int main(int argc, char *argv[])
 		{ "physical",	no_argument,	   NULL, 'y' },
 		{ "hex",	no_argument,	   NULL, 'x' },
 		{ "version",	no_argument,	   NULL, 'V' },
+		{ "output-all",	no_argument,	   NULL, OPT_OUTPUT_ALL },
 		{ NULL,		0, NULL, 0 }
 	};
 
@@ -2008,6 +2012,13 @@ int main(int argc, char *argv[])
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;
+		case OPT_OUTPUT_ALL:
+		{
+			size_t sz;
+			for (sz = 0; sz < ARRAY_SIZE(coldescs); sz++)
+				columns[sz] = 1;
+			break;
+		}
 		default:
 			errtryhelp(EXIT_FAILURE);
 		}