X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/2abce4300b90fa80845193c14d4b6849720007b1..ed3497b0de6634350cd17b320538fba918d4084c:/shared.c

diff --git a/shared.c b/shared.c
index 1f6310a..4626148 100644
--- a/shared.c
+++ b/shared.c
@@ -404,28 +404,29 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn, const char *prefix)
 
 int cgit_parse_snapshots_mask(const char *str)
 {
+	struct string_list tokens = STRING_LIST_INIT_DUP;
+	struct string_list_item *item;
 	const struct cgit_snapshot_format *f;
-	static const char *delim = " ";
-	int tl, sl, rv = 0;
+	int rv = 0;
 
 	/* favor legacy setting */
 	if (atoi(str))
 		return 1;
-	for (;;) {
-		str += strspn(str, delim);
-		tl = strcspn(str, delim);
-		if (!tl)
-			break;
+
+	string_list_split(&tokens, str, ' ', -1);
+	string_list_remove_empty_items(&tokens, 0);
+
+	for_each_string_list_item(item, &tokens) {
 		for (f = cgit_snapshot_formats; f->suffix; f++) {
-			sl = strlen(f->suffix);
-			if ((tl == sl && !strncmp(f->suffix, str, tl)) ||
-			   (tl == sl - 1 && !strncmp(f->suffix + 1, str, tl - 1))) {
+			if (!strcmp(item->string, f->suffix) ||
+			    !strcmp(item->string, f->suffix + 1)) {
 				rv |= f->bit;
 				break;
 			}
 		}
-		str += tl;
 	}
+
+	string_list_clear(&tokens, 0);
 	return rv;
 }
 
@@ -456,40 +457,6 @@ void cgit_prepare_repo_env(struct cgit_repo * repo)
 			fprintf(stderr, warn, p->name, p->value);
 }
 
-int cgit_open_filter(struct cgit_filter *filter)
-{
-
-	filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
-		"Unable to duplicate STDOUT");
-	chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
-	filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
-	if (filter->pid == 0) {
-		close(filter->pipe_fh[1]);
-		chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
-			"Unable to use pipe as STDIN");
-		execvp(filter->cmd, filter->argv);
-		die_errno("Unable to exec subprocess %s", filter->cmd);
-	}
-	close(filter->pipe_fh[0]);
-	chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
-		"Unable to use pipe as STDOUT");
-	close(filter->pipe_fh[1]);
-	return 0;
-}
-
-int cgit_close_filter(struct cgit_filter *filter)
-{
-	chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
-		"Unable to restore STDOUT");
-	close(filter->old_stdout);
-	if (filter->pid < 0)
-		return 0;
-	waitpid(filter->pid, &filter->exitstatus, 0);
-	if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus))
-		return 0;
-	die("Subprocess %s exited abnormally", filter->cmd);
-}
-
 /* Read the content of the specified file into a newly allocated buffer,
  * zeroterminate the buffer and return 0 on success, errno otherwise.
  */