-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 | |||
@@ -1,205 +1,184 @@ | |||
1 | /* ui-snapshot.c: generate snapshot of a commit | 1 | /* ui-snapshot.c: generate snapshot of a commit |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | 10 | #include "html.h" |
11 | #include "ui-shared.h" | 11 | #include "ui-shared.h" |
12 | 12 | ||
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]; | ||
16 | pid_t gzpid; | ||
17 | int stdout2; | ||
18 | int status; | ||
19 | int rv; | 15 | int rv; |
16 | struct cgit_filter f; | ||
20 | 17 | ||
21 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); | 18 | f.cmd = xstrdup(filter); |
22 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); | 19 | f.argv = malloc(2 * sizeof(char *)); |
23 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); | 20 | f.argv[0] = f.cmd; |
24 | if(gzpid==0) { | 21 | f.argv[1] = NULL; |
25 | /* child */ | 22 | cgit_open_filter(&f); |
26 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); | ||
27 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); | ||
28 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); | ||
29 | execlp(filter,filter,NULL); | ||
30 | _exit(-1); | ||
31 | } | ||
32 | /* parent */ | ||
33 | chk_zero(close(rw[0]), "Closing read end of pipe"); | ||
34 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); | ||
35 | |||
36 | rv = write_tar_archive(args); | 23 | rv = write_tar_archive(args); |
37 | 24 | cgit_close_filter(&f); | |
38 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | ||
39 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | ||
40 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | ||
41 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | ||
42 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | ||
43 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | ||
44 | cgit_print_error("Failed to compress archive"); | ||
45 | |||
46 | return rv; | 25 | return rv; |
47 | } | 26 | } |
48 | 27 | ||
49 | static int write_tar_gzip_archive(struct archiver_args *args) | 28 | static int write_tar_gzip_archive(struct archiver_args *args) |
50 | { | 29 | { |
51 | return write_compressed_tar_archive(args,"gzip"); | 30 | return write_compressed_tar_archive(args,"gzip"); |
52 | } | 31 | } |
53 | 32 | ||
54 | static int write_tar_bzip2_archive(struct archiver_args *args) | 33 | static int write_tar_bzip2_archive(struct archiver_args *args) |
55 | { | 34 | { |
56 | return write_compressed_tar_archive(args,"bzip2"); | 35 | return write_compressed_tar_archive(args,"bzip2"); |
57 | } | 36 | } |
58 | 37 | ||
59 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 38 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
60 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 39 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
61 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, | 40 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, |
62 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, | 41 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, |
63 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, | 42 | { ".tar", "application/x-tar", write_tar_archive, 0x8 }, |
64 | {} | 43 | {} |
65 | }; | 44 | }; |
66 | 45 | ||
67 | static const struct cgit_snapshot_format *get_format(const char *filename) | 46 | static const struct cgit_snapshot_format *get_format(const char *filename) |
68 | { | 47 | { |
69 | const struct cgit_snapshot_format *fmt; | 48 | const struct cgit_snapshot_format *fmt; |
70 | int fl, sl; | 49 | int fl, sl; |
71 | 50 | ||
72 | fl = strlen(filename); | 51 | fl = strlen(filename); |
73 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { | 52 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { |
74 | sl = strlen(fmt->suffix); | 53 | sl = strlen(fmt->suffix); |
75 | if (sl >= fl) | 54 | if (sl >= fl) |
76 | continue; | 55 | continue; |
77 | if (!strcmp(fmt->suffix, filename + fl - sl)) | 56 | if (!strcmp(fmt->suffix, filename + fl - sl)) |
78 | return fmt; | 57 | return fmt; |
79 | } | 58 | } |
80 | return NULL; | 59 | return NULL; |
81 | } | 60 | } |
82 | 61 | ||
83 | static int make_snapshot(const struct cgit_snapshot_format *format, | 62 | static int make_snapshot(const struct cgit_snapshot_format *format, |
84 | const char *hex, const char *prefix, | 63 | const char *hex, const char *prefix, |
85 | const char *filename) | 64 | const char *filename) |
86 | { | 65 | { |
87 | struct archiver_args args; | 66 | struct archiver_args args; |
88 | struct commit *commit; | 67 | struct commit *commit; |
89 | unsigned char sha1[20]; | 68 | unsigned char sha1[20]; |
90 | 69 | ||
91 | if(get_sha1(hex, sha1)) { | 70 | if(get_sha1(hex, sha1)) { |
92 | cgit_print_error(fmt("Bad object id: %s", hex)); | 71 | cgit_print_error(fmt("Bad object id: %s", hex)); |
93 | return 1; | 72 | return 1; |
94 | } | 73 | } |
95 | commit = lookup_commit_reference(sha1); | 74 | commit = lookup_commit_reference(sha1); |
96 | if(!commit) { | 75 | if(!commit) { |
97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 76 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
98 | return 1; | 77 | return 1; |
99 | } | 78 | } |
100 | memset(&args, 0, sizeof(args)); | 79 | memset(&args, 0, sizeof(args)); |
101 | if (prefix) { | 80 | if (prefix) { |
102 | args.base = fmt("%s/", prefix); | 81 | args.base = fmt("%s/", prefix); |
103 | args.baselen = strlen(prefix) + 1; | 82 | args.baselen = strlen(prefix) + 1; |
104 | } else { | 83 | } else { |
105 | args.base = ""; | 84 | args.base = ""; |
106 | args.baselen = 0; | 85 | args.baselen = 0; |
107 | } | 86 | } |
108 | args.tree = commit->tree; | 87 | args.tree = commit->tree; |
109 | args.time = commit->date; | 88 | args.time = commit->date; |
110 | ctx.page.mimetype = xstrdup(format->mimetype); | 89 | ctx.page.mimetype = xstrdup(format->mimetype); |
111 | ctx.page.filename = xstrdup(filename); | 90 | ctx.page.filename = xstrdup(filename); |
112 | cgit_print_http_headers(&ctx); | 91 | cgit_print_http_headers(&ctx); |
113 | format->write_func(&args); | 92 | format->write_func(&args); |
114 | return 0; | 93 | return 0; |
115 | } | 94 | } |
116 | 95 | ||
117 | /* Try to guess the requested revision from the requested snapshot name. | 96 | /* Try to guess the requested revision from the requested snapshot name. |
118 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become | 97 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become |
119 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. | 98 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. |
120 | * Otherwise, if the snapshot name has a prefix matching the result from | 99 | * Otherwise, if the snapshot name has a prefix matching the result from |
121 | * repo_basename(), we strip the basename and any following '-' and '_' | 100 | * repo_basename(), we strip the basename and any following '-' and '_' |
122 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once | 101 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once |
123 | * more. If this still isn't a valid commit object name, we check if pre- | 102 | * more. If this still isn't a valid commit object name, we check if pre- |
124 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives | 103 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives |
125 | * us something valid. | 104 | * us something valid. |
126 | */ | 105 | */ |
127 | static const char *get_ref_from_filename(const char *url, const char *filename, | 106 | static const char *get_ref_from_filename(const char *url, const char *filename, |
128 | const struct cgit_snapshot_format *format) | 107 | const struct cgit_snapshot_format *format) |
129 | { | 108 | { |
130 | const char *reponame; | 109 | const char *reponame; |
131 | unsigned char sha1[20]; | 110 | unsigned char sha1[20]; |
132 | char *snapshot; | 111 | char *snapshot; |
133 | 112 | ||
134 | snapshot = xstrdup(filename); | 113 | snapshot = xstrdup(filename); |
135 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 114 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
136 | fprintf(stderr, "snapshot=%s\n", snapshot); | 115 | fprintf(stderr, "snapshot=%s\n", snapshot); |
137 | 116 | ||
138 | if (get_sha1(snapshot, sha1) == 0) | 117 | if (get_sha1(snapshot, sha1) == 0) |
139 | return snapshot; | 118 | return snapshot; |
140 | 119 | ||
141 | reponame = cgit_repobasename(url); | 120 | reponame = cgit_repobasename(url); |
142 | fprintf(stderr, "reponame=%s\n", reponame); | 121 | fprintf(stderr, "reponame=%s\n", reponame); |
143 | if (prefixcmp(snapshot, reponame) == 0) { | 122 | if (prefixcmp(snapshot, reponame) == 0) { |
144 | snapshot += strlen(reponame); | 123 | snapshot += strlen(reponame); |
145 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | 124 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) |
146 | snapshot++; | 125 | snapshot++; |
147 | } | 126 | } |
148 | 127 | ||
149 | if (get_sha1(snapshot, sha1) == 0) | 128 | if (get_sha1(snapshot, sha1) == 0) |
150 | return snapshot; | 129 | return snapshot; |
151 | 130 | ||
152 | snapshot = fmt("v%s", snapshot); | 131 | snapshot = fmt("v%s", snapshot); |
153 | if (get_sha1(snapshot, sha1) == 0) | 132 | if (get_sha1(snapshot, sha1) == 0) |
154 | return snapshot; | 133 | return snapshot; |
155 | 134 | ||
156 | return NULL; | 135 | return NULL; |
157 | } | 136 | } |
158 | 137 | ||
159 | void show_error(char *msg) | 138 | void show_error(char *msg) |
160 | { | 139 | { |
161 | ctx.page.mimetype = "text/html"; | 140 | ctx.page.mimetype = "text/html"; |
162 | cgit_print_http_headers(&ctx); | 141 | cgit_print_http_headers(&ctx); |
163 | cgit_print_docstart(&ctx); | 142 | cgit_print_docstart(&ctx); |
164 | cgit_print_pageheader(&ctx); | 143 | cgit_print_pageheader(&ctx); |
165 | cgit_print_error(msg); | 144 | cgit_print_error(msg); |
166 | cgit_print_docend(); | 145 | cgit_print_docend(); |
167 | } | 146 | } |
168 | 147 | ||
169 | void cgit_print_snapshot(const char *head, const char *hex, | 148 | void cgit_print_snapshot(const char *head, const char *hex, |
170 | const char *filename, int snapshots, int dwim) | 149 | const char *filename, int snapshots, int dwim) |
171 | { | 150 | { |
172 | const struct cgit_snapshot_format* f; | 151 | const struct cgit_snapshot_format* f; |
173 | char *prefix = NULL; | 152 | char *prefix = NULL; |
174 | 153 | ||
175 | if (!filename) { | 154 | if (!filename) { |
176 | show_error("No snapshot name specified"); | 155 | show_error("No snapshot name specified"); |
177 | return; | 156 | return; |
178 | } | 157 | } |
179 | 158 | ||
180 | f = get_format(filename); | 159 | f = get_format(filename); |
181 | if (!f) { | 160 | if (!f) { |
182 | show_error(xstrdup(fmt("Unsupported snapshot format: %s", | 161 | show_error(xstrdup(fmt("Unsupported snapshot format: %s", |
183 | filename))); | 162 | filename))); |
184 | return; | 163 | return; |
185 | } | 164 | } |
186 | 165 | ||
187 | if (!hex && dwim) { | 166 | if (!hex && dwim) { |
188 | hex = get_ref_from_filename(ctx.repo->url, filename, f); | 167 | hex = get_ref_from_filename(ctx.repo->url, filename, f); |
189 | if (hex == NULL) { | 168 | if (hex == NULL) { |
190 | html_status(404, "Not found", 0); | 169 | html_status(404, "Not found", 0); |
191 | return; | 170 | return; |
192 | } | 171 | } |
193 | prefix = xstrdup(filename); | 172 | prefix = xstrdup(filename); |
194 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | 173 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; |
195 | } | 174 | } |
196 | 175 | ||
197 | if (!hex) | 176 | if (!hex) |
198 | hex = head; | 177 | hex = head; |
199 | 178 | ||
200 | if (!prefix) | 179 | if (!prefix) |
201 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); | 180 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); |
202 | 181 | ||
203 | make_snapshot(f, hex, prefix, filename); | 182 | make_snapshot(f, hex, prefix, filename); |
204 | free(prefix); | 183 | free(prefix); |
205 | } | 184 | } |