Commit 63972db

nsxiv63972db

add -0 for outputting null-terminated list (#68)

* add -0 for outputting null-terminated list

this doesn't add much, if any, additional complexity to the codebase and
can be quite handy for scripting purposes.

Closes: https://github.com/nsxiv/nsxiv/issues/67

* Fix typo

Author: N-R-K
Date: 2021-09-21 05:11 +0600
Committer: GitHub · 2021-09-20 23:11 +0000
Parent: 3234b0e
Commit: 63972db743398a4c2f0159110f5e14fb1effb6d5

+8 −2

3 files changed

Browse files Patch

−Context 3+

M commands.c +1 −1
M nsxiv.h +1 −0
M options.c +6 −1

M commands.c View

M nsxiv.h View

M options.c View

		@@ -59,7 +59,7 @@ bool cg_quit(arg_t _)
59	59		if (options->to_stdout && markcnt > 0) {
60	60		for (i = 0; i < filecnt; i++) {
61	61		if (files[i].flags & FF_MARK)
62		−	printf("%s\n", files[i].name);
	62	+	printf("%s%c", files[i].name, options->stdout_separator);
63	63		}
64	64		}
65	65		exit(EXIT_SUCCESS);

		@@ -268,6 +268,7 @@ struct opt {
268	268		char **filenames;
269	269		bool from_stdin;
270	270		bool to_stdout;
	271	+	char stdout_separator;
271	272		bool recursive;
272	273		int filecnt;
273	274		int startnum;

		@@ -52,6 +52,7 @@ void parse_options(int argc, char **argv)
52	52
53	53		_options.from_stdin = false;
54	54		_options.to_stdout = false;
	55	+	_options.stdout_separator = '\n';
55	56		_options.recursive = false;
56	57		_options.startnum = 0;
57	58
		@@ -75,7 +76,7 @@ void parse_options(int argc, char **argv)
75	76		_options.clean_cache = false;
76	77		_options.private_mode = false;
77	78
78		−	while ((opt = getopt(argc, argv, "A:abce:fG:g:hin:N:opqrS:s:T:tvZz:")) != -1) {
	79	+	while ((opt = getopt(argc, argv, "A:abce:fG:g:hin:N:0opqrS:s:T:tvZz:")) != -1) {
79	80		switch (opt) {
80	81		case '?':
81	82		print_usage();
		@@ -128,6 +129,10 @@ void parse_options(int argc, char **argv)
128	129		case 'N':
129	130		_options.res_name = optarg;
130	131		break;
	132	+	case '0':
	133	+	_options.stdout_separator = '\0';
	134	+	/* -0 implies -o */
	135	+	/* fall through */
131	136		case 'o':
132	137		_options.to_stdout = true;
133	138		break;

nsxiv/63972db

add -0 for outputting null-terminated list (#68)

nsxiv63972db