summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-snapshot.c23
1 files changed, 17 insertions, 6 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index f25613e..5372f5d 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -127,68 +127,79 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
127static const char *get_ref_from_filename(const char *url, const char *filename, 127static const char *get_ref_from_filename(const char *url, const char *filename,
128 const struct cgit_snapshot_format *format) 128 const struct cgit_snapshot_format *format)
129{ 129{
130 const char *reponame; 130 const char *reponame;
131 unsigned char sha1[20]; 131 unsigned char sha1[20];
132 char *snapshot; 132 char *snapshot;
133 133
134 snapshot = xstrdup(filename); 134 snapshot = xstrdup(filename);
135 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0'; 135 snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
136 fprintf(stderr, "snapshot=%s\n", snapshot); 136 fprintf(stderr, "snapshot=%s\n", snapshot);
137 137
138 if (get_sha1(snapshot, sha1) == 0) 138 if (get_sha1(snapshot, sha1) == 0)
139 return snapshot; 139 return snapshot;
140 140
141 reponame = cgit_repobasename(url); 141 reponame = cgit_repobasename(url);
142 fprintf(stderr, "reponame=%s\n", reponame); 142 fprintf(stderr, "reponame=%s\n", reponame);
143 if (prefixcmp(snapshot, reponame) == 0) { 143 if (prefixcmp(snapshot, reponame) == 0) {
144 snapshot += strlen(reponame); 144 snapshot += strlen(reponame);
145 while (snapshot && (*snapshot == '-' || *snapshot == '_')) 145 while (snapshot && (*snapshot == '-' || *snapshot == '_'))
146 snapshot++; 146 snapshot++;
147 } 147 }
148 148
149 if (get_sha1(snapshot, sha1) == 0) 149 if (get_sha1(snapshot, sha1) == 0)
150 return snapshot; 150 return snapshot;
151 151
152 snapshot = fmt("v%s", snapshot); 152 snapshot = fmt("v%s", snapshot);
153 if (get_sha1(snapshot, sha1) == 0) 153 if (get_sha1(snapshot, sha1) == 0)
154 return snapshot; 154 return snapshot;
155 155
156 return NULL; 156 return NULL;
157} 157}
158 158
159void show_error(char *msg)
160{
161 ctx.page.mimetype = "text/html";
162 cgit_print_http_headers(&ctx);
163 cgit_print_docstart(&ctx);
164 cgit_print_pageheader(&ctx);
165 cgit_print_error(msg);
166 cgit_print_docend();
167}
168
159void cgit_print_snapshot(const char *head, const char *hex, 169void cgit_print_snapshot(const char *head, const char *hex,
160 const char *filename, int snapshots, int dwim) 170 const char *filename, int snapshots, int dwim)
161{ 171{
162 const struct cgit_snapshot_format* f; 172 const struct cgit_snapshot_format* f;
163 char *prefix = NULL; 173 char *prefix = NULL;
164 174
175 if (!filename) {
176 show_error("No snapshot name specified");
177 return;
178 }
179
165 f = get_format(filename); 180 f = get_format(filename);
166 if (!f) { 181 if (!f) {
167 ctx.page.mimetype = "text/html"; 182 show_error(xstrdup(fmt("Unsupported snapshot format: %s",
168 cgit_print_http_headers(&ctx); 183 filename)));
169 cgit_print_docstart(&ctx);
170 cgit_print_pageheader(&ctx);
171 cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
172 cgit_print_docend();
173 return; 184 return;
174 } 185 }
175 186
176 if (!hex && dwim) { 187 if (!hex && dwim) {
177 hex = get_ref_from_filename(ctx.repo->url, filename, f); 188 hex = get_ref_from_filename(ctx.repo->url, filename, f);
178 if (hex == NULL) { 189 if (hex == NULL) {
179 html_status(404, "Not found", 0); 190 html_status(404, "Not found", 0);
180 return; 191 return;
181 } 192 }
182 prefix = xstrdup(filename); 193 prefix = xstrdup(filename);
183 prefix[strlen(filename) - strlen(f->suffix)] = '\0'; 194 prefix[strlen(filename) - strlen(f->suffix)] = '\0';
184 } 195 }
185 196
186 if (!hex) 197 if (!hex)
187 hex = head; 198 hex = head;
188 199
189 if (!prefix) 200 if (!prefix)
190 prefix = xstrdup(cgit_repobasename(ctx.repo->url)); 201 prefix = xstrdup(cgit_repobasename(ctx.repo->url));
191 202
192 make_snapshot(f, hex, prefix, filename); 203 make_snapshot(f, hex, prefix, filename);
193 free(prefix); 204 free(prefix);
194} 205}