diff options
-rw-r--r-- | ui-snapshot.c | 38 |
1 files changed, 37 insertions, 1 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index eb5f1cd..649569f 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -8,13 +8,49 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | static int write_tar_gzip_archive(struct archiver_args *args) | ||
12 | { | ||
13 | int rw[2]; | ||
14 | pid_t gzpid; | ||
15 | int stdout2; | ||
16 | int status; | ||
17 | int rv; | ||
18 | |||
19 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); | ||
20 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); | ||
21 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); | ||
22 | if(gzpid==0) { | ||
23 | /* child */ | ||
24 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); | ||
25 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); | ||
26 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); | ||
27 | execlp("gzip","gzip",NULL); | ||
28 | _exit(-1); | ||
29 | } | ||
30 | /* parent */ | ||
31 | chk_zero(close(rw[0]), "Closing read end of pipe"); | ||
32 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); | ||
33 | |||
34 | rv = write_tar_archive(args); | ||
35 | |||
36 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | ||
37 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | ||
38 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | ||
39 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | ||
40 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | ||
41 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | ||
42 | cgit_print_error("Failed to compress archive"); | ||
43 | |||
44 | return rv; | ||
45 | } | ||
46 | |||
11 | static const struct snapshot_archive_t { | 47 | static const struct snapshot_archive_t { |
12 | const char *suffix; | 48 | const char *suffix; |
13 | const char *mimetype; | 49 | const char *mimetype; |
14 | write_archive_fn_t write_func; | 50 | write_archive_fn_t write_func; |
15 | } snapshot_archives[] = { | 51 | } snapshot_archives[] = { |
16 | { ".zip", "application/x-zip", write_zip_archive }, | 52 | { ".zip", "application/x-zip", write_zip_archive }, |
17 | { ".tar.gz", "application/x-gzip", write_tar_archive } | 53 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive } |
18 | }; | 54 | }; |
19 | 55 | ||
20 | void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 56 | void cgit_print_snapshot(struct cacheitem *item, const char *hex, |