aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Michael Krelin <hacker@klever.net>2007-07-21 09:05:34 (JST)
committerGravatar Michael Krelin <hacker@klever.net>2007-07-21 09:05:34 (JST)
commit18a99bdf879953307d6ae6eb56c2117a4c074b0d (patch)
tree2d950fec688892398edd232f6e133b97e1a61e51
parent4a92cbb7fd1084764dfe9b97a163f1084c790b15 (diff)
downloadcgit-18a99bdf879953307d6ae6eb56c2117a4c074b0d.zip
cgit-18a99bdf879953307d6ae6eb56c2117a4c074b0d.tar.gz
introduced .tar.bz2 snapshots
- reworked write_tar_gzip_archive to handle arbitrary filter as a write_compressed_tar_archive - reformatted whitespaces in the said function to adhere to common cgit standards - added wrappers around write_compressed_tar_archive for .tar.gz and .tar.bz2 - added a hint for vim to use 8 characters shift width by default Signed-off-by: Michael Krelin <hacker@klever.net>
-rw-r--r--ui-snapshot.c73
1 files changed, 42 insertions, 31 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 649569f..f623f35 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -8,40 +8,49 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11static int write_tar_gzip_archive(struct archiver_args *args) 11static int write_compressed_tar_archive(struct archiver_args *args,const char *filter)
12{ 12{
13 int rw[2]; 13 int rw[2];
14 pid_t gzpid; 14 pid_t gzpid;
15 int stdout2; 15 int stdout2;
16 int status; 16 int status;
17 int rv; 17 int rv;
18
19 stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing");
20 chk_zero(pipe(rw), "Opening pipe from compressor subprocess");
21 gzpid = chk_non_negative(fork(), "Forking compressor subprocess");
22 if(gzpid==0) {
23 /* child */
24 chk_zero(close(rw[1]), "Closing write end of pipe in child");
25 chk_zero(close(STDIN_FILENO), "Closing STDIN");
26 chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
27 execlp(filter,filter,NULL);
28 _exit(-1);
29 }
30 /* parent */
31 chk_zero(close(rw[0]), "Closing read end of pipe");
32 chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
33
34 rv = write_tar_archive(args);
18 35
19 stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); 36 chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor");
20 chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); 37 chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT");
21 gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); 38 chk_zero(close(stdout2), "Closing uncompressed STDOUT");
22 if(gzpid==0) { 39 chk_zero(close(rw[1]), "Closing write end of pipe in parent");
23 /* child */ 40 chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
24 chk_zero(close(rw[1]), "Closing write end of pipe in child"); 41 if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
25 chk_zero(close(STDIN_FILENO), "Closing STDIN"); 42 cgit_print_error("Failed to compress archive");
26 chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin");
27 execlp("gzip","gzip",NULL);
28 _exit(-1);
29 }
30 /* parent */
31 chk_zero(close(rw[0]), "Closing read end of pipe");
32 chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor");
33
34 rv = write_tar_archive(args);
35 43
36 chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); 44 return rv;
37 chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); 45}
38 chk_zero(close(stdout2), "Closing uncompressed STDOUT");
39 chk_zero(close(rw[1]), "Closing write end of pipe in parent");
40 chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process");
41 if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) )
42 cgit_print_error("Failed to compress archive");
43 46
44 return rv; 47static int write_tar_gzip_archive(struct archiver_args *args)
48{
49 return write_compressed_tar_archive(args,"gzip");
50}
51static int write_tar_bzip2_archive(struct archiver_args *args)
52{
53 return write_compressed_tar_archive(args,"bzip2");
45} 54}
46 55
47static const struct snapshot_archive_t { 56static const struct snapshot_archive_t {
@@ -50,7 +59,8 @@ static const struct snapshot_archive_t {
50 write_archive_fn_t write_func; 59 write_archive_fn_t write_func;
51} snapshot_archives[] = { 60} snapshot_archives[] = {
52 { ".zip", "application/x-zip", write_zip_archive }, 61 { ".zip", "application/x-zip", write_zip_archive },
53 { ".tar.gz", "application/x-gzip", write_tar_gzip_archive } 62 { ".tar.gz", "application/x-tar", write_tar_gzip_archive },
63 { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }
54}; 64};
55 65
56void cgit_print_snapshot(struct cacheitem *item, const char *hex, 66void cgit_print_snapshot(struct cacheitem *item, const char *hex,
@@ -102,3 +112,4 @@ void cgit_print_snapshot_links(const char *repo,const char *hex)
102 fmt("id=%s&amp;name=%s",hex,filename)), filename); 112 fmt("id=%s&amp;name=%s",hex,filename)), filename);
103 } 113 }
104} 114}
115/* vim:set sw=8: */