author | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:32:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-01 12:32:57 (UTC) |
commit | bf8293d3196d49d6c4a48b254a04415183ca2762 (patch) (unidiff) | |
tree | 0188fd70e48112094ec4ee412320a099a1829a31 | |
parent | 6940b23b9e4698ba466a4616e4de77b986560ad3 (diff) | |
parent | ba1769cb6438f3a08da8cf1308eb8efad3ce573b (diff) | |
download | cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.zip cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.tar.gz cgit-bf8293d3196d49d6c4a48b254a04415183ca2762.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | ui-snapshot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 1b25dca..6e3412c 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -1,190 +1,191 @@ | |||
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 rv; | 15 | int rv; |
16 | struct cgit_filter f; | 16 | struct cgit_filter f; |
17 | 17 | ||
18 | f.cmd = xstrdup(filter); | 18 | f.cmd = xstrdup(filter); |
19 | f.argv = malloc(2 * sizeof(char *)); | 19 | f.argv = malloc(2 * sizeof(char *)); |
20 | f.argv[0] = f.cmd; | 20 | f.argv[0] = f.cmd; |
21 | f.argv[1] = NULL; | 21 | f.argv[1] = NULL; |
22 | cgit_open_filter(&f); | 22 | cgit_open_filter(&f); |
23 | rv = write_tar_archive(args); | 23 | rv = write_tar_archive(args); |
24 | cgit_close_filter(&f); | 24 | cgit_close_filter(&f); |
25 | return rv; | 25 | return rv; |
26 | } | 26 | } |
27 | 27 | ||
28 | static int write_tar_gzip_archive(struct archiver_args *args) | 28 | static int write_tar_gzip_archive(struct archiver_args *args) |
29 | { | 29 | { |
30 | return write_compressed_tar_archive(args,"gzip"); | 30 | return write_compressed_tar_archive(args,"gzip"); |
31 | } | 31 | } |
32 | 32 | ||
33 | static int write_tar_bzip2_archive(struct archiver_args *args) | 33 | static int write_tar_bzip2_archive(struct archiver_args *args) |
34 | { | 34 | { |
35 | return write_compressed_tar_archive(args,"bzip2"); | 35 | return write_compressed_tar_archive(args,"bzip2"); |
36 | } | 36 | } |
37 | 37 | ||
38 | static int write_tar_xz_archive(struct archiver_args *args) | 38 | static int write_tar_xz_archive(struct archiver_args *args) |
39 | { | 39 | { |
40 | return write_compressed_tar_archive(args,"xz"); | 40 | return write_compressed_tar_archive(args,"xz"); |
41 | } | 41 | } |
42 | 42 | ||
43 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { | 43 | const struct cgit_snapshot_format cgit_snapshot_formats[] = { |
44 | { ".zip", "application/x-zip", write_zip_archive, 0x01 }, | 44 | { ".zip", "application/x-zip", write_zip_archive, 0x01 }, |
45 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 }, | 45 | { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x02 }, |
46 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 }, | 46 | { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 }, |
47 | { ".tar", "application/x-tar", write_tar_archive, 0x08 }, | 47 | { ".tar", "application/x-tar", write_tar_archive, 0x08 }, |
48 | { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 }, | 48 | { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 }, |
49 | {} | 49 | {} |
50 | }; | 50 | }; |
51 | 51 | ||
52 | static const struct cgit_snapshot_format *get_format(const char *filename) | 52 | static const struct cgit_snapshot_format *get_format(const char *filename) |
53 | { | 53 | { |
54 | const struct cgit_snapshot_format *fmt; | 54 | const struct cgit_snapshot_format *fmt; |
55 | int fl, sl; | 55 | int fl, sl; |
56 | 56 | ||
57 | fl = strlen(filename); | 57 | fl = strlen(filename); |
58 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { | 58 | for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { |
59 | sl = strlen(fmt->suffix); | 59 | sl = strlen(fmt->suffix); |
60 | if (sl >= fl) | 60 | if (sl >= fl) |
61 | continue; | 61 | continue; |
62 | if (!strcmp(fmt->suffix, filename + fl - sl)) | 62 | if (!strcmp(fmt->suffix, filename + fl - sl)) |
63 | return fmt; | 63 | return fmt; |
64 | } | 64 | } |
65 | return NULL; | 65 | return NULL; |
66 | } | 66 | } |
67 | 67 | ||
68 | static int make_snapshot(const struct cgit_snapshot_format *format, | 68 | static int make_snapshot(const struct cgit_snapshot_format *format, |
69 | const char *hex, const char *prefix, | 69 | const char *hex, const char *prefix, |
70 | const char *filename) | 70 | const char *filename) |
71 | { | 71 | { |
72 | struct archiver_args args; | 72 | struct archiver_args args; |
73 | struct commit *commit; | 73 | struct commit *commit; |
74 | unsigned char sha1[20]; | 74 | unsigned char sha1[20]; |
75 | 75 | ||
76 | if(get_sha1(hex, sha1)) { | 76 | if(get_sha1(hex, sha1)) { |
77 | cgit_print_error(fmt("Bad object id: %s", hex)); | 77 | cgit_print_error(fmt("Bad object id: %s", hex)); |
78 | return 1; | 78 | return 1; |
79 | } | 79 | } |
80 | commit = lookup_commit_reference(sha1); | 80 | commit = lookup_commit_reference(sha1); |
81 | if(!commit) { | 81 | if(!commit) { |
82 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 82 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
83 | return 1; | 83 | return 1; |
84 | } | 84 | } |
85 | memset(&args, 0, sizeof(args)); | 85 | memset(&args, 0, sizeof(args)); |
86 | if (prefix) { | 86 | if (prefix) { |
87 | args.base = fmt("%s/", prefix); | 87 | args.base = fmt("%s/", prefix); |
88 | args.baselen = strlen(prefix) + 1; | 88 | args.baselen = strlen(prefix) + 1; |
89 | } else { | 89 | } else { |
90 | args.base = ""; | 90 | args.base = ""; |
91 | args.baselen = 0; | 91 | args.baselen = 0; |
92 | } | 92 | } |
93 | args.tree = commit->tree; | 93 | args.tree = commit->tree; |
94 | args.time = commit->date; | 94 | args.time = commit->date; |
95 | args.compression_level = Z_DEFAULT_COMPRESSION; | ||
95 | ctx.page.mimetype = xstrdup(format->mimetype); | 96 | ctx.page.mimetype = xstrdup(format->mimetype); |
96 | ctx.page.filename = xstrdup(filename); | 97 | ctx.page.filename = xstrdup(filename); |
97 | cgit_print_http_headers(&ctx); | 98 | cgit_print_http_headers(&ctx); |
98 | format->write_func(&args); | 99 | format->write_func(&args); |
99 | return 0; | 100 | return 0; |
100 | } | 101 | } |
101 | 102 | ||
102 | /* Try to guess the requested revision from the requested snapshot name. | 103 | /* Try to guess the requested revision from the requested snapshot name. |
103 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become | 104 | * First the format extension is stripped, e.g. "cgit-0.7.2.tar.gz" become |
104 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. | 105 | * "cgit-0.7.2". If this is a valid commit object name we've got a winner. |
105 | * Otherwise, if the snapshot name has a prefix matching the result from | 106 | * Otherwise, if the snapshot name has a prefix matching the result from |
106 | * repo_basename(), we strip the basename and any following '-' and '_' | 107 | * repo_basename(), we strip the basename and any following '-' and '_' |
107 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once | 108 | * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once |
108 | * more. If this still isn't a valid commit object name, we check if pre- | 109 | * more. If this still isn't a valid commit object name, we check if pre- |
109 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives | 110 | * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives |
110 | * us something valid. | 111 | * us something valid. |
111 | */ | 112 | */ |
112 | static const char *get_ref_from_filename(const char *url, const char *filename, | 113 | static const char *get_ref_from_filename(const char *url, const char *filename, |
113 | const struct cgit_snapshot_format *format) | 114 | const struct cgit_snapshot_format *format) |
114 | { | 115 | { |
115 | const char *reponame; | 116 | const char *reponame; |
116 | unsigned char sha1[20]; | 117 | unsigned char sha1[20]; |
117 | char *snapshot; | 118 | char *snapshot; |
118 | 119 | ||
119 | snapshot = xstrdup(filename); | 120 | snapshot = xstrdup(filename); |
120 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; | 121 | snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; |
121 | fprintf(stderr, "snapshot=%s\n", snapshot); | 122 | fprintf(stderr, "snapshot=%s\n", snapshot); |
122 | 123 | ||
123 | if (get_sha1(snapshot, sha1) == 0) | 124 | if (get_sha1(snapshot, sha1) == 0) |
124 | return snapshot; | 125 | return snapshot; |
125 | 126 | ||
126 | reponame = cgit_repobasename(url); | 127 | reponame = cgit_repobasename(url); |
127 | fprintf(stderr, "reponame=%s\n", reponame); | 128 | fprintf(stderr, "reponame=%s\n", reponame); |
128 | if (prefixcmp(snapshot, reponame) == 0) { | 129 | if (prefixcmp(snapshot, reponame) == 0) { |
129 | snapshot += strlen(reponame); | 130 | snapshot += strlen(reponame); |
130 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) | 131 | while (snapshot && (*snapshot == '-' || *snapshot == '_')) |
131 | snapshot++; | 132 | snapshot++; |
132 | } | 133 | } |
133 | 134 | ||
134 | if (get_sha1(snapshot, sha1) == 0) | 135 | if (get_sha1(snapshot, sha1) == 0) |
135 | return snapshot; | 136 | return snapshot; |
136 | 137 | ||
137 | snapshot = fmt("v%s", snapshot); | 138 | snapshot = fmt("v%s", snapshot); |
138 | if (get_sha1(snapshot, sha1) == 0) | 139 | if (get_sha1(snapshot, sha1) == 0) |
139 | return snapshot; | 140 | return snapshot; |
140 | 141 | ||
141 | return NULL; | 142 | return NULL; |
142 | } | 143 | } |
143 | 144 | ||
144 | void show_error(char *msg) | 145 | void show_error(char *msg) |
145 | { | 146 | { |
146 | ctx.page.mimetype = "text/html"; | 147 | ctx.page.mimetype = "text/html"; |
147 | cgit_print_http_headers(&ctx); | 148 | cgit_print_http_headers(&ctx); |
148 | cgit_print_docstart(&ctx); | 149 | cgit_print_docstart(&ctx); |
149 | cgit_print_pageheader(&ctx); | 150 | cgit_print_pageheader(&ctx); |
150 | cgit_print_error(msg); | 151 | cgit_print_error(msg); |
151 | cgit_print_docend(); | 152 | cgit_print_docend(); |
152 | } | 153 | } |
153 | 154 | ||
154 | void cgit_print_snapshot(const char *head, const char *hex, | 155 | void cgit_print_snapshot(const char *head, const char *hex, |
155 | const char *filename, int snapshots, int dwim) | 156 | const char *filename, int snapshots, int dwim) |
156 | { | 157 | { |
157 | const struct cgit_snapshot_format* f; | 158 | const struct cgit_snapshot_format* f; |
158 | char *prefix = NULL; | 159 | char *prefix = NULL; |
159 | 160 | ||
160 | if (!filename) { | 161 | if (!filename) { |
161 | show_error("No snapshot name specified"); | 162 | show_error("No snapshot name specified"); |
162 | return; | 163 | return; |
163 | } | 164 | } |
164 | 165 | ||
165 | f = get_format(filename); | 166 | f = get_format(filename); |
166 | if (!f) { | 167 | if (!f) { |
167 | show_error(xstrdup(fmt("Unsupported snapshot format: %s", | 168 | show_error(xstrdup(fmt("Unsupported snapshot format: %s", |
168 | filename))); | 169 | filename))); |
169 | return; | 170 | return; |
170 | } | 171 | } |
171 | 172 | ||
172 | if (!hex && dwim) { | 173 | if (!hex && dwim) { |
173 | hex = get_ref_from_filename(ctx.repo->url, filename, f); | 174 | hex = get_ref_from_filename(ctx.repo->url, filename, f); |
174 | if (hex == NULL) { | 175 | if (hex == NULL) { |
175 | html_status(404, "Not found", 0); | 176 | html_status(404, "Not found", 0); |
176 | return; | 177 | return; |
177 | } | 178 | } |
178 | prefix = xstrdup(filename); | 179 | prefix = xstrdup(filename); |
179 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | 180 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; |
180 | } | 181 | } |
181 | 182 | ||
182 | if (!hex) | 183 | if (!hex) |
183 | hex = head; | 184 | hex = head; |
184 | 185 | ||
185 | if (!prefix) | 186 | if (!prefix) |
186 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); | 187 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); |
187 | 188 | ||
188 | make_snapshot(f, hex, prefix, filename); | 189 | make_snapshot(f, hex, prefix, filename); |
189 | free(prefix); | 190 | free(prefix); |
190 | } | 191 | } |