-rw-r--r-- | ui-snapshot.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index f623f35..84bf8f7 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -1,115 +1,116 @@ | |||
1 | /* ui-snapshot.c: generate snapshot of a commit | 1 | /* ui-snapshot.c: generate snapshot of a commit |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) | 11 | static 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 | 18 | ||
19 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); | 19 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); |
20 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); | 20 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); |
21 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); | 21 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); |
22 | if(gzpid==0) { | 22 | if(gzpid==0) { |
23 | /* child */ | 23 | /* child */ |
24 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); | 24 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); |
25 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); | 25 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); |
26 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); | 26 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); |
27 | execlp(filter,filter,NULL); | 27 | execlp(filter,filter,NULL); |
28 | _exit(-1); | 28 | _exit(-1); |
29 | } | 29 | } |
30 | /* parent */ | 30 | /* parent */ |
31 | chk_zero(close(rw[0]), "Closing read end of pipe"); | 31 | chk_zero(close(rw[0]), "Closing read end of pipe"); |
32 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); | 32 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); |
33 | 33 | ||
34 | rv = write_tar_archive(args); | 34 | rv = write_tar_archive(args); |
35 | 35 | ||
36 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | 36 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); |
37 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | 37 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); |
38 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | 38 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); |
39 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | 39 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); |
40 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | 40 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); |
41 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | 41 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) |
42 | cgit_print_error("Failed to compress archive"); | 42 | cgit_print_error("Failed to compress archive"); |
43 | 43 | ||
44 | return rv; | 44 | return rv; |
45 | } | 45 | } |
46 | 46 | ||
47 | static int write_tar_gzip_archive(struct archiver_args *args) | 47 | static int write_tar_gzip_archive(struct archiver_args *args) |
48 | { | 48 | { |
49 | return write_compressed_tar_archive(args,"gzip"); | 49 | return write_compressed_tar_archive(args,"gzip"); |
50 | } | 50 | } |
51 | static int write_tar_bzip2_archive(struct archiver_args *args) | 51 | static int write_tar_bzip2_archive(struct archiver_args *args) |
52 | { | 52 | { |
53 | return write_compressed_tar_archive(args,"bzip2"); | 53 | return write_compressed_tar_archive(args,"bzip2"); |
54 | } | 54 | } |
55 | 55 | ||
56 | static const struct snapshot_archive_t { | 56 | static const struct snapshot_archive_t { |
57 | const char *suffix; | 57 | const char *suffix; |
58 | const char *mimetype; | 58 | const char *mimetype; |
59 | write_archive_fn_t write_func; | 59 | write_archive_fn_t write_func; |
60 | }snapshot_archives[] = { | 60 | }snapshot_archives[] = { |
61 | { ".zip", "application/x-zip", write_zip_archive }, | 61 | { ".zip", "application/x-zip", write_zip_archive }, |
62 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive }, | 62 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive }, |
63 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive } | 63 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive }, |
64 | { ".tar", "application/x-tar", write_tar_archive } | ||
64 | }; | 65 | }; |
65 | 66 | ||
66 | void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 67 | void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
67 | const char *prefix, const char *filename) | 68 | const char *prefix, const char *filename) |
68 | { | 69 | { |
69 | int fnl = strlen(filename); | 70 | int fnl = strlen(filename); |
70 | int f; | 71 | int f; |
71 | for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { | 72 | for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { |
72 | const struct snapshot_archive_t* sat = &snapshot_archives[f]; | 73 | const struct snapshot_archive_t* sat = &snapshot_archives[f]; |
73 | int sl = strlen(sat->suffix); | 74 | int sl = strlen(sat->suffix); |
74 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) | 75 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) |
75 | continue; | 76 | continue; |
76 | 77 | ||
77 | struct archiver_args args; | 78 | struct archiver_args args; |
78 | struct commit *commit; | 79 | struct commit *commit; |
79 | unsigned char sha1[20]; | 80 | unsigned char sha1[20]; |
80 | 81 | ||
81 | if(get_sha1(hex, sha1)) { | 82 | if(get_sha1(hex, sha1)) { |
82 | cgit_print_error(fmt("Bad object id: %s", hex)); | 83 | cgit_print_error(fmt("Bad object id: %s", hex)); |
83 | return; | 84 | return; |
84 | } | 85 | } |
85 | commit = lookup_commit_reference(sha1); | 86 | commit = lookup_commit_reference(sha1); |
86 | 87 | ||
87 | if(!commit) { | 88 | if(!commit) { |
88 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 89 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
89 | return;; | 90 | return;; |
90 | } | 91 | } |
91 | 92 | ||
92 | memset(&args,0,sizeof(args)); | 93 | memset(&args,0,sizeof(args)); |
93 | args.base = fmt("%s/", prefix); | 94 | args.base = fmt("%s/", prefix); |
94 | args.tree = commit->tree; | 95 | args.tree = commit->tree; |
95 | 96 | ||
96 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 97 | cgit_print_snapshot_start(sat->mimetype, filename, item); |
97 | (*sat->write_func)(&args); | 98 | (*sat->write_func)(&args); |
98 | return; | 99 | return; |
99 | } | 100 | } |
100 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 101 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
101 | } | 102 | } |
102 | 103 | ||
103 | void cgit_print_snapshot_links(const char *repo,const char *hex) | 104 | void cgit_print_snapshot_links(const char *repo,const char *hex) |
104 | { | 105 | { |
105 | char *filename; | 106 | char *filename; |
106 | int f; | 107 | int f; |
107 | for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { | 108 | for(f=0;f<(sizeof(snapshot_archives)/sizeof(*snapshot_archives));++f) { |
108 | const struct snapshot_archive_t* sat = &snapshot_archives[f]; | 109 | const struct snapshot_archive_t* sat = &snapshot_archives[f]; |
109 | filename = fmt("%s-%s%s",repo,hex,sat->suffix); | 110 | filename = fmt("%s-%s%s",repo,hex,sat->suffix); |
110 | htmlf("<a href='%s'>%s</a><br/>", | 111 | htmlf("<a href='%s'>%s</a><br/>", |
111 | cgit_pageurl(repo,"snapshot", | 112 | cgit_pageurl(repo,"snapshot", |
112 | fmt("id=%s&name=%s",hex,filename)), filename); | 113 | fmt("id=%s&name=%s",hex,filename)), filename); |
113 | } | 114 | } |
114 | } | 115 | } |
115 | /* vim:set sw=8: */ | 116 | /* vim:set sw=8: */ |