summaryrefslogtreecommitdiffabout
authorNatanael Copa <natanael.copa@gmail.com>2008-12-02 10:31:34 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-28 09:09:18 (UTC)
commitc4b45de33458f66f5a768530d738f6c28e56cf49 (patch) (side-by-side diff)
tree4bbc634befd11509bb73cd978be6edd8deac41fa
parent06de14d0fdb141feab10383ba18c0e81d56f483b (diff)
downloadcgit-c4b45de33458f66f5a768530d738f6c28e56cf49.zip
cgit-c4b45de33458f66f5a768530d738f6c28e56cf49.tar.gz
cgit-c4b45de33458f66f5a768530d738f6c28e56cf49.tar.bz2
return 404 if snapshot is not found
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--ui-snapshot.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6f09151..f98f5d7 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -130,63 +130,65 @@ static const char *get_ref_from_filename(const char *url, const char *filename,
const char *reponame;
unsigned char sha1[20];
char *snapshot;
snapshot = xstrdup(filename);
snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
fprintf(stderr, "snapshot=%s\n", snapshot);
if (get_sha1(snapshot, sha1) == 0)
return snapshot;
reponame = cgit_repobasename(url);
fprintf(stderr, "reponame=%s\n", reponame);
if (prefixcmp(snapshot, reponame) == 0) {
snapshot += strlen(reponame);
while (snapshot && (*snapshot == '-' || *snapshot == '_'))
snapshot++;
}
if (get_sha1(snapshot, sha1) == 0)
return snapshot;
snapshot = fmt("v%s", snapshot);
if (get_sha1(snapshot, sha1) == 0)
return snapshot;
return NULL;
}
void cgit_print_snapshot(const char *head, const char *hex,
const char *filename, int snapshots, int dwim)
{
const struct cgit_snapshot_format* f;
char *prefix = NULL;
f = get_format(filename);
if (!f) {
ctx.page.mimetype = "text/html";
cgit_print_http_headers(&ctx);
cgit_print_docstart(&ctx);
cgit_print_pageheader(&ctx);
cgit_print_error(fmt("Unsupported snapshot format: %s", filename));
cgit_print_docend();
return;
}
if (!hex && dwim) {
hex = get_ref_from_filename(ctx.repo->url, filename, f);
- if (hex != NULL) {
+ if (hex == NULL) {
+ html_status(404, "Not found", 0);
+ return;
+ }
prefix = xstrdup(filename);
prefix[strlen(filename) - strlen(f->suffix)] = '\0';
}
- }
if (!hex)
hex = head;
if (!prefix)
prefix = xstrdup(cgit_repobasename(ctx.repo->url));
make_snapshot(f, hex, prefix, filename);
free(prefix);
}