|
diff --git a/shared.c b/shared.c index cce0af4..288cfa2 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -342,16 +342,51 @@ int cgit_parse_snapshots_mask(const char *str) |
342 | str += strspn(str,delim); |
342 | str += strspn(str,delim); |
343 | tl = strcspn(str,delim); |
343 | tl = strcspn(str,delim); |
344 | if (!tl) |
344 | if (!tl) |
345 | break; |
345 | break; |
346 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
346 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
347 | sl = strlen(f->suffix); |
347 | sl = strlen(f->suffix); |
348 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
348 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
349 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
349 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
350 | rv |= f->bit; |
350 | rv |= f->bit; |
351 | break; |
351 | break; |
352 | } |
352 | } |
353 | } |
353 | } |
354 | str += tl; |
354 | str += tl; |
355 | } |
355 | } |
356 | return rv; |
356 | return rv; |
357 | } |
357 | } |
| |
358 | |
| |
359 | int cgit_open_filter(struct cgit_filter *filter) |
| |
360 | { |
| |
361 | |
| |
362 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), |
| |
363 | "Unable to duplicate STDOUT"); |
| |
364 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); |
| |
365 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); |
| |
366 | if (filter->pid == 0) { |
| |
367 | close(filter->pipe_fh[1]); |
| |
368 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), |
| |
369 | "Unable to use pipe as STDIN"); |
| |
370 | execvp(filter->cmd, filter->argv); |
| |
371 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, |
| |
372 | strerror(errno), errno); |
| |
373 | } |
| |
374 | close(filter->pipe_fh[0]); |
| |
375 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), |
| |
376 | "Unable to use pipe as STDOUT"); |
| |
377 | close(filter->pipe_fh[1]); |
| |
378 | return 0; |
| |
379 | } |
| |
380 | |
| |
381 | int cgit_close_filter(struct cgit_filter *filter) |
| |
382 | { |
| |
383 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), |
| |
384 | "Unable to restore STDOUT"); |
| |
385 | close(filter->old_stdout); |
| |
386 | if (filter->pid < 0) |
| |
387 | return 0; |
| |
388 | waitpid(filter->pid, &filter->exitstatus, 0); |
| |
389 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) |
| |
390 | return 0; |
| |
391 | die("Subprocess %s exited abnormally", filter->cmd); |
| |
392 | } |
|