summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rwxr-xr-xtests/t0107-snapshot.sh20
-rw-r--r--ui-snapshot.c6
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index c42091a..8ab4912 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -1,39 +1,39 @@
1#!/bin/sh 1#!/bin/sh
2 2
3. ./setup.sh 3. ./setup.sh
4 4
5prepare_tests "Verify snapshot" 5prepare_tests "Verify snapshot"
6 6
7run_test 'get foo/snapshot/test.tar.gz' ' 7run_test 'get foo/snapshot/master.tar.gz' '
8 cgit_url "foo/snapshot/test.tar.gz" >trash/tmp 8 cgit_url "foo/snapshot/master.tar.gz" >trash/tmp
9' 9'
10 10
11run_test 'check html headers' ' 11run_test 'check html headers' '
12 head -n 1 trash/tmp | 12 head -n 1 trash/tmp |
13 grep -e "Content-Type: application/x-gzip" && 13 grep -e "Content-Type: application/x-gzip" &&
14 14
15 head -n 2 trash/tmp | 15 head -n 2 trash/tmp |
16 grep -e "Content-Disposition: inline; filename=.test.tar.gz." 16 grep -e "Content-Disposition: inline; filename=.master.tar.gz."
17' 17'
18 18
19run_test 'strip off the header lines' ' 19run_test 'strip off the header lines' '
20 tail -n +6 trash/tmp > trash/test.tar.gz 20 tail -n +6 trash/tmp > trash/master.tar.gz
21' 21'
22 22
23run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' 23run_test 'verify gzip format' 'gunzip --test trash/master.tar.gz'
24run_test 'untar' ' 24run_test 'untar' '
25 rm -rf trash/foo && 25 rm -rf trash/master &&
26 tar -xf trash/test.tar.gz -C trash 26 tar -xf trash/master.tar.gz -C trash
27' 27'
28 28
29run_test 'count files' ' 29run_test 'count files' '
30 c=$(ls -1 trash/foo/ | wc -l) && 30 c=$(ls -1 trash/master/ | wc -l) &&
31 test $c = 5 31 test $c = 5
32' 32'
33 33
34run_test 'verify untarred file-5' ' 34run_test 'verify untarred file-5' '
35 grep -e "^5$" trash/foo/file-5 && 35 grep -e "^5$" trash/master/file-5 &&
36 test $(cat trash/foo/file-5 | wc -l) = 1 36 test $(cat trash/master/file-5 | wc -l) = 1
37' 37'
38 38
39tests_done 39tests_done
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 5f813fc..f25613e 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -166,27 +166,29 @@ void cgit_print_snapshot(const char *head, const char *hex,
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 html_status(404, "Not found", 0);
180 return;
181 }
179 prefix = xstrdup(filename); 182 prefix = xstrdup(filename);
180 prefix[strlen(filename) - strlen(f->suffix)] = '\0'; 183 prefix[strlen(filename) - strlen(f->suffix)] = '\0';
181 } 184 }
182 }
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}