summaryrefslogtreecommitdiffabout
path: root/ui-snapshot.c
authorLars Hjemli <hjemli@gmail.com>2008-12-26 10:33:59 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-12-26 10:33:59 (UTC)
commited77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f (patch) (unidiff)
treeefc0ecd9aaa557b058f30091441a74476884e601 /ui-snapshot.c
parent06de14d0fdb141feab10383ba18c0e81d56f483b (diff)
downloadcgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.zip
cgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.tar.gz
cgit-ed77b2e0bff52a44ce1e5bd64e1c784a9c2fa82f.tar.bz2
ui-snapshot.c: change mime-type for tar.gz and tar.bz2
The updated mime-types seems to work better than the old ones with both safari and firefox. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'ui-snapshot.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-snapshot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 6f09151..5f813fc 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -29,66 +29,66 @@ static int write_compressed_tar_archive(struct archiver_args *args,const char *f
29 execlp(filter,filter,NULL); 29 execlp(filter,filter,NULL);
30 _exit(-1); 30 _exit(-1);
31 } 31 }
32 /* parent */ 32 /* parent */
33 chk_zero(close(rw[0]), "Closing read end of pipe"); 33 chk_zero(close(rw[0]), "Closing read end of pipe");
34 chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); 34 chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
35 35
36 rv = write_tar_archive(args); 36 rv = write_tar_archive(args);
37 37
38 chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); 38 chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
39 chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); 39 chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
40 chk_zero(close(stdout2), "Closing uncompressed STDOUT"); 40 chk_zero(close(stdout2), "Closing uncompressed STDOUT");
41 chk_zero(close(rw[1]), "Closing write end of pipe in parent"); 41 chk_zero(close(rw[1]), "Closing write end of pipe in parent");
42 chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); 42 chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
43 if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) 43 if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
44 cgit_print_error("Failed to compress archive"); 44 cgit_print_error("Failed to compress archive");
45 45
46 return rv; 46 return rv;
47} 47}
48 48
49static int write_tar_gzip_archive(struct archiver_args *args) 49static int write_tar_gzip_archive(struct archiver_args *args)
50{ 50{
51 return write_compressed_tar_archive(args,"gzip"); 51 return write_compressed_tar_archive(args,"gzip");
52} 52}
53 53
54static int write_tar_bzip2_archive(struct archiver_args *args) 54static int write_tar_bzip2_archive(struct archiver_args *args)
55{ 55{
56 return write_compressed_tar_archive(args,"bzip2"); 56 return write_compressed_tar_archive(args,"bzip2");
57} 57}
58 58
59const struct cgit_snapshot_format cgit_snapshot_formats[] = { 59const struct cgit_snapshot_format cgit_snapshot_formats[] = {
60 { ".zip", "application/x-zip", write_zip_archive, 0x1 }, 60 { ".zip", "application/x-zip", write_zip_archive, 0x1 },
61 { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, 61 { ".tar.gz", "application/x-gzip", write_tar_gzip_archive, 0x2 },
62 { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, 62 { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x4 },
63 { ".tar", "application/x-tar", write_tar_archive, 0x8 }, 63 { ".tar", "application/x-tar", write_tar_archive, 0x8 },
64 {} 64 {}
65}; 65};
66 66
67static const struct cgit_snapshot_format *get_format(const char *filename) 67static const struct cgit_snapshot_format *get_format(const char *filename)
68{ 68{
69 const struct cgit_snapshot_format *fmt; 69 const struct cgit_snapshot_format *fmt;
70 int fl, sl; 70 int fl, sl;
71 71
72 fl = strlen(filename); 72 fl = strlen(filename);
73 for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) { 73 for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
74 sl = strlen(fmt->suffix); 74 sl = strlen(fmt->suffix);
75 if (sl >= fl) 75 if (sl >= fl)
76 continue; 76 continue;
77 if (!strcmp(fmt->suffix, filename + fl - sl)) 77 if (!strcmp(fmt->suffix, filename + fl - sl))
78 return fmt; 78 return fmt;
79 } 79 }
80 return NULL; 80 return NULL;
81} 81}
82 82
83static int make_snapshot(const struct cgit_snapshot_format *format, 83static int make_snapshot(const struct cgit_snapshot_format *format,
84 const char *hex, const char *prefix, 84 const char *hex, const char *prefix,
85 const char *filename) 85 const char *filename)
86{ 86{
87 struct archiver_args args; 87 struct archiver_args args;
88 struct commit *commit; 88 struct commit *commit;
89 unsigned char sha1[20]; 89 unsigned char sha1[20];
90 90
91 if(get_sha1(hex, sha1)) { 91 if(get_sha1(hex, sha1)) {
92 cgit_print_error(fmt("Bad object id: %s", hex)); 92 cgit_print_error(fmt("Bad object id: %s", hex));
93 return 1; 93 return 1;
94 } 94 }