diff options
author | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 13:46:01 +0200 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-09 13:46:01 +0200 |
commit | db6303b58883c4417f5bcc0c1ee34fed6553dca3 (patch) | |
tree | ef7775ade9eef57c5a878f9588fe545a7da2c952 /ui-snapshot.c | |
parent | Merge branch 'lh/mimetypes' (diff) | |
parent | cgit.c: allow repo.*-filter options to unset the current default (diff) | |
download | cgit-pink-db6303b58883c4417f5bcc0c1ee34fed6553dca3.tar.gz cgit-pink-db6303b58883c4417f5bcc0c1ee34fed6553dca3.zip |
Merge branch 'lh/plugins'
Conflicts: cgit.c cgit.h
Diffstat (limited to '')
-rw-r--r-- | ui-snapshot.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 5372f5d..4136b3e 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -12,37 +12,16 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) { - int rw[2]; - pid_t gzpid; - int stdout2; - int status; int rv; + struct cgit_filter f; - stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); - chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); - gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); - if(gzpid==0) { - /* child */ - chk_zero(close(rw[1]), "Closing write end of pipe in child"); - chk_zero(close(STDIN_FILENO), "Closing STDIN"); - chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); - execlp(filter,filter,NULL); - _exit(-1); - } - /* parent */ - chk_zero(close(rw[0]), "Closing read end of pipe"); - chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); - + f.cmd = xstrdup(filter); + f.argv = malloc(2 * sizeof(char *)); + f.argv[0] = f.cmd; + f.argv[1] = NULL; + cgit_open_filter(&f); rv = write_tar_archive(args); - - chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); - chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); - chk_zero(close(stdout2), "Closing uncompressed STDOUT"); - chk_zero(close(rw[1]), "Closing write end of pipe in parent"); - chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); - if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) - cgit_print_error("Failed to compress archive"); - + cgit_close_filter(&f); return rv; } |