-rw-r--r-- | ui-snapshot.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index 5f813fc..f25613e 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, | |||
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 | ||
159 | void cgit_print_snapshot(const char *head, const char *hex, | 159 | void cgit_print_snapshot(const char *head, const char *hex, |
160 | const char *filename, int snapshots, int dwim) | 160 | const char *filename, int snapshots, int dwim) |
161 | { | 161 | { |
162 | const struct cgit_snapshot_format* f; | 162 | const struct cgit_snapshot_format* f; |
163 | char *prefix = NULL; | 163 | char *prefix = NULL; |
164 | 164 | ||
165 | f = get_format(filename); | 165 | f = get_format(filename); |
166 | if (!f) { | 166 | if (!f) { |
167 | ctx.page.mimetype = "text/html"; | 167 | ctx.page.mimetype = "text/html"; |
168 | cgit_print_http_headers(&ctx); | 168 | cgit_print_http_headers(&ctx); |
169 | cgit_print_docstart(&ctx); | 169 | cgit_print_docstart(&ctx); |
170 | cgit_print_pageheader(&ctx); | 170 | cgit_print_pageheader(&ctx); |
171 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 171 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
172 | cgit_print_docend(); | 172 | cgit_print_docend(); |
173 | return; | 173 | return; |
174 | } | 174 | } |
175 | 175 | ||
176 | if (!hex && dwim) { | 176 | if (!hex && dwim) { |
177 | hex = get_ref_from_filename(ctx.repo->url, filename, f); | 177 | hex = get_ref_from_filename(ctx.repo->url, filename, f); |
178 | if (hex != NULL) { | 178 | if (hex == NULL) { |
179 | prefix = xstrdup(filename); | 179 | html_status(404, "Not found", 0); |
180 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | 180 | return; |
181 | } | 181 | } |
182 | prefix = xstrdup(filename); | ||
183 | prefix[strlen(filename) - strlen(f->suffix)] = '\0'; | ||
182 | } | 184 | } |
183 | 185 | ||
184 | if (!hex) | 186 | if (!hex) |
185 | hex = head; | 187 | hex = head; |
186 | 188 | ||
187 | if (!prefix) | 189 | if (!prefix) |
188 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); | 190 | prefix = xstrdup(cgit_repobasename(ctx.repo->url)); |
189 | 191 | ||
190 | make_snapshot(f, hex, prefix, filename); | 192 | make_snapshot(f, hex, prefix, filename); |
191 | free(prefix); | 193 | free(prefix); |
192 | } | 194 | } |