-rw-r--r-- | ui-snapshot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 6f09151..5f813fc 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -13,98 +13,98 @@ | |||
13 | static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) | 13 | static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) |
14 | { | 14 | { |
15 | int rw[2]; | 15 | int rw[2]; |
16 | pid_t gzpid; | 16 | pid_t gzpid; |
17 | int stdout2; | 17 | int stdout2; |
18 | int status; | 18 | int status; |
19 | int rv; | 19 | int rv; |
20 | 20 | ||
21 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); | 21 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); |
22 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); | 22 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); |
23 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); | 23 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); |
24 | if(gzpid==0) { | 24 | if(gzpid==0) { |
25 | /* child */ | 25 | /* child */ |
26 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); | 26 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); |
27 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); | 27 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); |
28 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); | 28 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); |
29 | execlp(filter,filter,NULL); | 29 | execlp(filter,filter,NULL); |
30 | _exit(-1); | 30 | _exit(-1); |
31 | } | 31 | } |
32 | /* parent */ | 32 | /* parent */ |
33 | chk_zero(close(rw[0]), "Closing read end of pipe"); | 33 | chk_zero(close(rw[0]), "Closing read end of pipe"); |
34 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); | 34 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); |
35 | 35 | ||
36 | rv = write_tar_archive(args); | 36 | rv = write_tar_archive(args); |
37 | 37 | ||
38 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | 38 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); |
39 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | 39 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); |
40 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | 40 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); |
41 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | 41 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); |
42 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | 42 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); |
43 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | 43 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) |
44 | cgit_print_error("Failed to compress archive"); | 44 | cgit_print_error("Failed to compress archive"); |
45 | 45 | ||
46 | return rv; | 46 | return rv; |
47 | } | 47 | } |
48 | 48 | ||
49 | static int write_tar_gzip_archive(struct archiver_args *args) | 49 | static int write_tar_gzip_archive(struct archiver_args *args) |
50 | { | 50 | { |
51 | return write_compressed_tar_archive(args,"gzip"); | 51 | return write_compressed_tar_archive(args,"gzip"); |
52 | } | 52 | } |
53 | 53 | ||
54 | static int write_tar_bzip2_archive(struct archiver_args *args) | 54 | static int write_tar_bzip2_archive(struct archiver_args *args) |
55 | { | 55 | { |
56 | return write_compressed_tar_archive(args,"bzip2"); | 56 | return write_compressed_tar_archive(args,"bzip2"); |
57 | } | 57 | } |
58 | 58 | ||
59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
61 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 61 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, |
62 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 62 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, |
63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
64 | {} | 64 | {} |
65 | }; | 65 | }; |
66 | 66 | ||
67 | static const struct cgit_snapshot_format *get_format(const char *filename) | 67 | static const struct cgit_snapshot_format *get_format(const char *filename) |
68 | { | 68 | { |
69 | const struct cgit_snapshot_format *fmt; | 69 | const struct cgit_snapshot_format *fmt; |
70 | int fl, sl; | 70 | int fl, sl; |
71 | 71 | ||
72 | fl = strlen(filename); | 72 | fl = strlen(filename); |
73 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { | 73 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { |
74 | sl = strlen(fmt->suffix); | 74 | sl = strlen(fmt->suffix); |
75 | if (sl >= fl) | 75 | if (sl >= fl) |
76 | continue; | 76 | continue; |
77 | if (!strcmp(fmt->suffix, filename + fl - sl)) | 77 | if (!strcmp(fmt->suffix, filename + fl - sl)) |
78 | return fmt; | 78 | return fmt; |
79 | } | 79 | } |
80 | return NULL; | 80 | return NULL; |
81 | } | 81 | } |
82 | 82 | ||
83 | static int make_snapshot(const struct cgit_snapshot_format *format, | 83 | static int make_snapshot(const struct cgit_snapshot_format *format, |
84 | const char *hex, const char *prefix, | 84 | const char *hex, const char *prefix, |
85 | const char *filename) | 85 | const char *filename) |
86 | { | 86 | { |
87 | struct archiver_args args; | 87 | struct archiver_args args; |
88 | struct commit *commit; | 88 | struct commit *commit; |
89 | unsigned char sha1[20]; | 89 | unsigned char sha1[20]; |
90 | 90 | ||
91 | if(get_sha1(hex, sha1)) { | 91 | if(get_sha1(hex, sha1)) { |
92 | cgit_print_error(fmt("Bad object id: %s", hex)); | 92 | cgit_print_error(fmt("Bad object id: %s", hex)); |
93 | return 1; | 93 | return 1; |
94 | } | 94 | } |
95 | commit = lookup_commit_reference(sha1); | 95 | commit = lookup_commit_reference(sha1); |
96 | if(!commit) { | 96 | if(!commit) { |
97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
98 | return 1; | 98 | return 1; |
99 | } | 99 | } |
100 | memset(&args, 0, sizeof(args)); | 100 | memset(&args, 0, sizeof(args)); |
101 | if (prefix) { | 101 | if (prefix) { |
102 | args.base = fmt("%s/", prefix); | 102 | args.base = fmt("%s/", prefix); |
103 | args.baselen = strlen(prefix) + 1; | 103 | args.baselen = strlen(prefix) + 1; |
104 | } else { | 104 | } else { |
105 | args.base = ""; | 105 | args.base = ""; |
106 | args.baselen = 0; | 106 | args.baselen = 0; |
107 | } | 107 | } |
108 | args.tree = commit->tree; | 108 | args.tree = commit->tree; |
109 | args.time = commit->date; | 109 | args.time = commit->date; |
110 | ctx.page.mimetype = xstrdup(format->mimetype); | 110 | ctx.page.mimetype = xstrdup(format->mimetype); |