-rw-r--r-- | ui-snapshot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui-snapshot.c b/ui-snapshot.c index bd34a28..4d1aa88 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -1,155 +1,156 @@ | |||
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 | 51 | ||
52 | static int write_tar_bzip2_archive(struct archiver_args *args) | 52 | static int write_tar_bzip2_archive(struct archiver_args *args) |
53 | { | 53 | { |
54 | return write_compressed_tar_archive(args,"bzip2"); | 54 | return write_compressed_tar_archive(args,"bzip2"); |
55 | } | 55 | } |
56 | 56 | ||
57 | static const struct snapshot_archive_t { | 57 | static const struct snapshot_archive_t { |
58 | const char *suffix; | 58 | const char *suffix; |
59 | const char *mimetype; | 59 | const char *mimetype; |
60 | write_archive_fn_t write_func; | 60 | write_archive_fn_t write_func; |
61 | int bit; | 61 | int bit; |
62 | }snapshot_archives[] = { | 62 | }snapshot_archives[] = { |
63 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 63 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
64 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 64 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, |
65 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 65 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, |
66 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } | 66 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } |
67 | }; | 67 | }; |
68 | 68 | ||
69 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) | 69 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) |
70 | 70 | ||
71 | void cgit_print_snapshot(struct cacheitem *item, const char *head, | 71 | void cgit_print_snapshot(struct cacheitem *item, const char *head, |
72 | const char *hex, const char *prefix, | 72 | const char *hex, const char *prefix, |
73 | const char *filename, int snapshots) | 73 | const char *filename, int snapshots) |
74 | { | 74 | { |
75 | const struct snapshot_archive_t* sat; | 75 | const struct snapshot_archive_t* sat; |
76 | struct archiver_args args; | 76 | struct archiver_args args; |
77 | struct commit *commit; | 77 | struct commit *commit; |
78 | unsigned char sha1[20]; | 78 | unsigned char sha1[20]; |
79 | int f, sl, fnl = strlen(filename); | 79 | int f, sl, fnl = strlen(filename); |
80 | 80 | ||
81 | for(f=0; f<snapshot_archives_len; f++) { | 81 | for(f=0; f<snapshot_archives_len; f++) { |
82 | sat = &snapshot_archives[f]; | 82 | sat = &snapshot_archives[f]; |
83 | if(!(snapshots & sat->bit)) | 83 | if(!(snapshots & sat->bit)) |
84 | continue; | 84 | continue; |
85 | sl = strlen(sat->suffix); | 85 | sl = strlen(sat->suffix); |
86 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) | 86 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) |
87 | continue; | 87 | continue; |
88 | if (!hex) | 88 | if (!hex) |
89 | hex = head; | 89 | hex = head; |
90 | if(get_sha1(hex, sha1)) { | 90 | if(get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); | 91 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; | 92 | return; |
93 | } | 93 | } |
94 | commit = lookup_commit_reference(sha1); | 94 | commit = lookup_commit_reference(sha1); |
95 | if(!commit) { | 95 | if(!commit) { |
96 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 96 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
97 | return;; | 97 | return;; |
98 | } | 98 | } |
99 | memset(&args,0,sizeof(args)); | 99 | memset(&args,0,sizeof(args)); |
100 | args.base = fmt("%s/", prefix); | 100 | args.base = fmt("%s/", prefix); |
101 | args.tree = commit->tree; | 101 | args.tree = commit->tree; |
102 | args.time = commit->date; | ||
102 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 103 | cgit_print_snapshot_start(sat->mimetype, filename, item); |
103 | (*sat->write_func)(&args); | 104 | (*sat->write_func)(&args); |
104 | return; | 105 | return; |
105 | } | 106 | } |
106 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 107 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
107 | } | 108 | } |
108 | 109 | ||
109 | void cgit_print_snapshot_links(const char *repo, const char *head, | 110 | void cgit_print_snapshot_links(const char *repo, const char *head, |
110 | const char *hex, int snapshots) | 111 | const char *hex, int snapshots) |
111 | { | 112 | { |
112 | const struct snapshot_archive_t* sat; | 113 | const struct snapshot_archive_t* sat; |
113 | char *filename; | 114 | char *filename; |
114 | int f; | 115 | int f; |
115 | 116 | ||
116 | for(f=0; f<snapshot_archives_len; f++) { | 117 | for(f=0; f<snapshot_archives_len; f++) { |
117 | sat = &snapshot_archives[f]; | 118 | sat = &snapshot_archives[f]; |
118 | if(!(snapshots & sat->bit)) | 119 | if(!(snapshots & sat->bit)) |
119 | continue; | 120 | continue; |
120 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 121 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
121 | sat->suffix); | 122 | sat->suffix); |
122 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 123 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
123 | (char *)hex, filename); | 124 | (char *)hex, filename); |
124 | html("<br/>"); | 125 | html("<br/>"); |
125 | } | 126 | } |
126 | } | 127 | } |
127 | 128 | ||
128 | int cgit_parse_snapshots_mask(const char *str) | 129 | int cgit_parse_snapshots_mask(const char *str) |
129 | { | 130 | { |
130 | const struct snapshot_archive_t* sat; | 131 | const struct snapshot_archive_t* sat; |
131 | static const char *delim = " \t,:/|;"; | 132 | static const char *delim = " \t,:/|;"; |
132 | int f, tl, rv = 0; | 133 | int f, tl, rv = 0; |
133 | 134 | ||
134 | /* favor legacy setting */ | 135 | /* favor legacy setting */ |
135 | if(atoi(str)) | 136 | if(atoi(str)) |
136 | return 1; | 137 | return 1; |
137 | for(;;) { | 138 | for(;;) { |
138 | str += strspn(str,delim); | 139 | str += strspn(str,delim); |
139 | tl = strcspn(str,delim); | 140 | tl = strcspn(str,delim); |
140 | if(!tl) | 141 | if(!tl) |
141 | break; | 142 | break; |
142 | for(f=0; f<snapshot_archives_len; f++) { | 143 | for(f=0; f<snapshot_archives_len; f++) { |
143 | sat = &snapshot_archives[f]; | 144 | sat = &snapshot_archives[f]; |
144 | if(!(strncmp(sat->suffix, str, tl) && | 145 | if(!(strncmp(sat->suffix, str, tl) && |
145 | strncmp(sat->suffix+1, str, tl-1))) { | 146 | strncmp(sat->suffix+1, str, tl-1))) { |
146 | rv |= sat->bit; | 147 | rv |= sat->bit; |
147 | break; | 148 | break; |
148 | } | 149 | } |
149 | } | 150 | } |
150 | str += tl; | 151 | str += tl; |
151 | } | 152 | } |
152 | return rv; | 153 | return rv; |
153 | } | 154 | } |
154 | 155 | ||
155 | /* vim:set sw=8: */ | 156 | /* vim:set sw=8: */ |