| -rwxr-xr-x | tests/t0107-snapshot.sh | 2 | ||||
| -rw-r--r-- | ui-snapshot.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh index d97c465..c42091a 100755 --- a/tests/t0107-snapshot.sh +++ b/tests/t0107-snapshot.sh @@ -1,37 +1,37 @@ #!/bin/sh . ./setup.sh prepare_tests "Verify snapshot" run_test 'get foo/snapshot/test.tar.gz' ' cgit_url "foo/snapshot/test.tar.gz" >trash/tmp ' run_test 'check html headers' ' head -n 1 trash/tmp | - grep -e "Content-Type: application/x-tar" && + grep -e "Content-Type: application/x-gzip" && head -n 2 trash/tmp | grep -e "Content-Disposition: inline; filename=.test.tar.gz." ' run_test 'strip off the header lines' ' tail -n +6 trash/tmp > trash/test.tar.gz ' run_test 'verify gzip format' 'gunzip --test trash/test.tar.gz' run_test 'untar' ' rm -rf trash/foo && tar -xf trash/test.tar.gz -C trash ' run_test 'count files' ' c=$(ls -1 trash/foo/ | wc -l) && test $c = 5 ' run_test 'verify untarred file-5' ' grep -e "^5$" trash/foo/file-5 && test $(cat trash/foo/file-5 | wc -l) = 1 ' diff --git a/ui-snapshot.c b/ui-snapshot.c index 6f09151..5f813fc 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -37,50 +37,50 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); chk_zero(close(stdout2), "Closing uncompressed STDOUT"); chk_zero(close(rw[1]), "Closing write end of pipe in parent"); chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) cgit_print_error("Failed to compress archive"); return rv; } static int write_tar_gzip_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"gzip"); } static int write_tar_bzip2_archive(struct archiver_args *args) { return write_compressed_tar_archive(args,"bzip2"); } const struct cgit_snapshot_format cgit_snapshot_formats[] = { { ".zip", "application/x-zip", write_zip_archive, 0x1 }, - { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, - { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, + { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 }, + { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 }, { ".tar", "application/x-tar", write_tar_archive, 0x8 }, {} }; static const struct cgit_snapshot_format *get_format(const char *filename) { const struct cgit_snapshot_format *fmt; int fl, sl; fl = strlen(filename); for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { sl = strlen(fmt->suffix); if (sl >= fl) continue; if (!strcmp(fmt->suffix, filename + fl - sl)) return fmt; } return NULL; } static int make_snapshot(const struct cgit_snapshot_format *format, const char *hex, const char *prefix, const char *filename) { |