Merge branch 'output-all' of https://github.com/kerolasa/lelux-utilit…

…eetit

* '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

bash-completion/findmnt

@@ -118,6 +118,7 @@ _findmnt_module()
 				--notruncate
 				--options
 				--output
+				--output-all
 				--pairs
 				--raw
 				--types

bash-completion/losetup

@@ -63,6 +63,7 @@ _losetup_module()
 				--list
 				--noheadings
 				--output
+				--output-all
 				--raw
 				--help
 				--version"

bash-completion/lscpu

@@ -37,6 +37,7 @@ _lscpu_module()
 				--sysroot
 				--hex
 				--physical
+				--output-all
 				--help
 				--version"
 			COMPREPLY=( $(compgen -W "${OPTS_ALL[*]}" -- $cur) )

bash-completion/lslocks

@@ -36,6 +36,7 @@ _lslocks_module()
 		--noinaccessible
 		--noheadings
 		--output
+		--output-all
 		--pid
 		--raw
 		--notruncate

bash-completion/lslogins

@@ -59,6 +59,7 @@ _lslogins_module()
 			--noheadings
 			--notruncate
 			--output
+			--output-all
 			--pwd
 			--raw
 			--system-accs

bash-completion/lsmem

@@ -40,6 +40,7 @@ _lsmem_module()
 		--bytes
 		--noheadings
 		--output
+		--output-all
 		--raw
 		--sysroot
 		--summary

bash-completion/lsns

@@ -40,6 +40,7 @@ _lsns_module()
 					--list
 					--noheadings
 					--output
+					--output-all
 					--task
 					--raw
 					--notruncate

bash-completion/partx

@@ -45,6 +45,7 @@ _partx_module()
 				--noheadings
 				--nr
 				--output
+				--output-all
 				--pairs
 				--raw
 				--sector-size

bash-completion/rfkill

@@ -36,6 +36,7 @@ _rfkill_module()
 		--json
 		--noheadings
 		--output
+		--output-all
 		--raw
 		--help
 		--version

bash-completion/swapon

@@ -50,6 +50,7 @@ _swapon_module()
 				--priority
 				--summary
 				--show
+				--output-all
 				--noheadings
 				--raw
 				--bytes

bash-completion/zramctl

@@ -41,6 +41,7 @@ _zramctl_module()
 				--find
 				--noheadings
 				--output
+				--output-all
 				--raw
 				--reset
 				--size

disk-utils/partx.8

@@ -106,6 +106,9 @@ or
 .B \-\-list
 options.
 .TP
+.B \-\-output\-all
+Output all available columns.
+.TP
 .BR \-P , " \-\-pairs"
 List the partitions using the KEY="value" format.
 .TP

disk-utils/partx.c

@@ -765,6 +765,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -g, --noheadings     don't print headings for --show\n"), out);
 	fputs(_(" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"), out);
 	fputs(_(" -o, --output <list>  define which output columns to use\n"), out);
+	fputs(_("     --output-all     output all columns\n"), out);
 	fputs(_(" -P, --pairs          use key=\"value\" output format\n"), out);
 	fputs(_(" -r, --raw            use raw output format\n"), out);
 	fputs(_(" -S, --sector-size <num>  overwrite sector size\n"), out);
@@ -796,7 +797,8 @@ int main(int argc, char **argv)
 	unsigned int sector_size = 0;
 
 	enum {
-		OPT_LIST_TYPES = CHAR_MAX + 1
+		OPT_LIST_TYPES = CHAR_MAX + 1,
+		OPT_OUTPUT_ALL
 	};
 	static const struct option long_opts[] = {
 		{ "bytes",	no_argument,       NULL, 'b' },
@@ -811,6 +813,7 @@ int main(int argc, char **argv)
 		{ "list-types", no_argument,       NULL, OPT_LIST_TYPES },
 		{ "nr",		required_argument, NULL, 'n' },
 		{ "output",	required_argument, NULL, 'o' },
+		{ "output-all", no_argument,       NULL, OPT_OUTPUT_ALL },
 		{ "pairs",      no_argument,       NULL, 'P' },
 		{ "sector-size",required_argument, NULL, 'S' },
 		{ "help",	no_argument,       NULL, 'h' },
@@ -858,6 +861,10 @@ int main(int argc, char **argv)
 		case 'o':
 			outarg = optarg;
 			break;
+		case OPT_OUTPUT_ALL:
+			for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++)
+				columns[ncolumns] = ncolumns;
+			break;
 		case 'P':
 			scols_flags |= PARTX_EXPORT;
 			what = ACT_SHOW;

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

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;

misc-utils/findmnt.8

@@ -150,6 +150,11 @@ options are not specified.
 The default list of columns may be extended if \fIlist\fP is
 specified in the format \fI+list\fP (e.g. \fBfindmnt \-o +PROPAGATION\fP).
 .TP
+.B \-\-output\-all
+Output almost all available columns.  The columns that require
+.B \-\-poll
+are not included.
+.TP
 .BR \-P , " \-\-pairs"
 Use key="value" output format.  All potentially unsafe characters are hex-escaped (\\x<code>).
 .TP

misc-utils/findmnt.c

@@ -1227,6 +1227,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -n, --noheadings       don't print column headings\n"), out);
 	fputs(_(" -O, --options <list>   limit the set of filesystems by mount options\n"), out);
 	fputs(_(" -o, --output <list>    the output columns to be shown\n"), out);
+	fputs(_("     --output-all       output all available columns\n"), out);
 	fputs(_(" -P, --pairs            use key=\"value\" output format\n"), out);
 	fputs(_(" -R, --submounts        print all submounts for the matching filesystems\n"), out);
 	fputs(_(" -r, --raw              use raw output format\n"), out);
@@ -1272,7 +1273,8 @@ int main(int argc, char *argv[])
 
 	enum {
                 FINDMNT_OPT_VERBOSE = CHAR_MAX + 1,
-		FINDMNT_OPT_TREE
+		FINDMNT_OPT_TREE,
+		FINDMNT_OPT_OUTPUT_ALL
 	};
 
 	static const struct option longopts[] = {
@@ -1296,6 +1298,7 @@ int main(int argc, char *argv[])
 		{ "notruncate",	    no_argument,       NULL, 'u'		 },
 		{ "options",	    required_argument, NULL, 'O'		 },
 		{ "output",	    required_argument, NULL, 'o'		 },
+		{ "output-all",	    no_argument,       NULL, FINDMNT_OPT_OUTPUT_ALL },
 		{ "poll",	    optional_argument, NULL, 'p'		 },
 		{ "pairs",	    no_argument,       NULL, 'P'		 },
 		{ "raw",	    no_argument,       NULL, 'r'		 },
@@ -1396,6 +1399,13 @@ int main(int argc, char *argv[])
 		case 'o':
 			outarg = optarg;
 			break;
+		case FINDMNT_OPT_OUTPUT_ALL:
+			for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++) {
+				if (is_tabdiff_column(ncolumns))
+					continue;
+				columns[ncolumns] = ncolumns;
+			}
+			break;
 		case 'O':
 			set_match(COL_OPTIONS, optarg);
 			break;

misc-utils/lslocks.8

@@ -40,6 +40,9 @@ to get a list of all supported columns.
 The default list of columns may be extended if \fIlist\fP is
 specified in the format \fI+list\fP (e.g. \fBlslocks -o +BLOCKER\fP).
 .TP
+.B \-\-output\-all
+Output all available columns.
+.TP
 .BR \-p , " \-\-pid " \fIpid\fP
 Display only the locks held by the process with this \fIpid\fR.
 .TP

misc-utils/lslocks.c

@@ -536,6 +536,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -i, --noinaccessible   ignore locks without read permissions\n"), out);
 	fputs(_(" -n, --noheadings       don't print headings\n"), out);
 	fputs(_(" -o, --output <list>    define which output columns to use\n"), out);
+	fputs(_("     --output-all       output all columns\n"), out);
 	fputs(_(" -p, --pid <pid>        display only locks held by this process\n"), out);
 	fputs(_(" -r, --raw              use the raw output format\n"), out);
 	fputs(_(" -u, --notruncate       don't truncate text in columns\n"), out);
@@ -558,12 +559,16 @@ int main(int argc, char *argv[])
 	int c, rc = 0;
 	struct list_head locks;
 	char *outarg = NULL;
+	enum {
+		OPT_OUTPUT_ALL = CHAR_MAX + 1
+	};
 	static const struct option long_opts[] = {
 		{ "bytes",      no_argument,       NULL, 'b' },
 		{ "json",       no_argument,       NULL, 'J' },
 		{ "pid",	required_argument, NULL, 'p' },
 		{ "help",	no_argument,       NULL, 'h' },
 		{ "output",     required_argument, NULL, 'o' },
+		{ "output-all",	no_argument,       NULL, OPT_OUTPUT_ALL },
 		{ "notruncate", no_argument,       NULL, 'u' },
 		{ "version",    no_argument,       NULL, 'V' },
 		{ "noheadings", no_argument,       NULL, 'n' },
@@ -603,6 +608,10 @@ int main(int argc, char *argv[])
 		case 'o':
 			outarg = optarg;
 			break;
+		case OPT_OUTPUT_ALL:
+			for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++)
+				columns[ncolumns] = ncolumns;
+			break;
 		case 'V':
 			printf(UTIL_LINUX_VERSION);
 			return EXIT_SUCCESS;

sys-utils/losetup.8

@@ -145,6 +145,9 @@ print info about all devices.  See also \fB\-\-output\fP, \fB\-\-noheadings\fP,
 Specify the columns that are to be printed for the \fB\-\-list\fP output.
 Use \fB\-\-help\fR to get a list of all supported columns.
 .TP
+.B \-\-output\-all
+Output all available columns.
+.TP
 .BR \-n , " \-\-noheadings"
 Don't print headings for \fB\-\-list\fP output format.
 .IP "\fB\-\-raw\fP"

sys-utils/losetup.c

@@ -430,6 +430,7 @@ static void __attribute__((__noreturn__)) usage(void)
 	fputs(_(" -l, --list                    list info about all or specified (default)\n"), out);
 	fputs(_(" -n, --noheadings              don't print headings for --list output\n"), out);
 	fputs(_(" -O, --output <cols>           specify columns to output for --list\n"), out);
+	fputs(_("     --output-all              output all columns\n"), out);
 	fputs(_("     --raw                     use raw --list output format\n"), out);
 
 	fputs(USAGE_SEPARATOR, out);
@@ -590,7 +591,8 @@ int main(int argc, char **argv)
 		OPT_SIZELIMIT = CHAR_MAX + 1,
 		OPT_SHOW,
 		OPT_RAW,
-		OPT_DIO
+		OPT_DIO,
+		OPT_OUTPUT_ALL
 	};
 	static const struct option longopts[] = {
 		{ "all",          no_argument,       NULL, 'a'           },
@@ -607,6 +609,7 @@ int main(int argc, char **argv)
 		{ "noheadings",   no_argument,       NULL, 'n'           },
 		{ "offset",       required_argument, NULL, 'o'           },
 		{ "output",       required_argument, NULL, 'O'           },
+		{ "output-all",   no_argument,       NULL, OPT_OUTPUT_ALL },
 		{ "sizelimit",    required_argument, NULL, OPT_SIZELIMIT },
 		{ "partscan",     no_argument,       NULL, 'P'           },
 		{ "read-only",    no_argument,       NULL, 'r'           },
@@ -701,6 +704,10 @@ int main(int argc, char **argv)
 			outarg = optarg;
 			list = 1;
 			break;
+		case OPT_OUTPUT_ALL:
+			for (ncolumns = 0; ncolumns < ARRAY_SIZE(infos); ncolumns++)
+				columns[ncolumns] = ncolumns;
+			break;
 		case 'P':
 			lo_flags |= LO_FLAGS_PARTSCAN;
 			break;

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.

sys-utils/lscpu.c

@@ -1935,6 +1935,9 @@ int main(int argc, char *argv[])
 	int cpu_modifier_specified = 0;
 	size_t setsize;
 
+	enum {
+		OPT_OUTPUT_ALL = CHAR_MAX + 1,
+	};
 	static const struct option longopts[] = {
 		{ "all",        no_argument,       NULL, 'a' },
 		{ "online",     no_argument,       NULL, 'b' },
@@ -1947,6 +1950,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 }
 	};
 
@@ -2011,6 +2015,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);
 		}

sys-utils/lsmem.1

@@ -57,6 +57,9 @@ to get a list of all supported columns.
 The default list of columns may be extended if \fIlist\fP is
 specified in the format \fB+\fIlist\fP (e.g. \fBlsmem \-o +NODE\fP).
 .TP
+.B \-\-output\-all
+Output all available columns.
+.TP
 .BR \-P , " \-\-pairs"
 Produce output in the form of key="value" pairs.
 All potentially unsafe characters are hex-escaped (\\x<code>).