-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 dfedd8f..67dbbdd 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -1,157 +1,158 @@ | |||
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 | #include "html.h" | ||
10 | 11 | ||
11 | static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) | 12 | static int write_compressed_tar_archive(struct archiver_args *args,const char *filter) |
12 | { | 13 | { |
13 | int rw[2]; | 14 | int rw[2]; |
14 | pid_t gzpid; | 15 | pid_t gzpid; |
15 | int stdout2; | 16 | int stdout2; |
16 | int status; | 17 | int status; |
17 | int rv; | 18 | int rv; |
18 | 19 | ||
19 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); | 20 | stdout2 = chk_non_negative(dup(STDIN_FILENO), "Preserving STDOUT before compressing"); |
20 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); | 21 | chk_zero(pipe(rw), "Opening pipe from compressor subprocess"); |
21 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); | 22 | gzpid = chk_non_negative(fork(), "Forking compressor subprocess"); |
22 | if(gzpid==0) { | 23 | if(gzpid==0) { |
23 | /* child */ | 24 | /* child */ |
24 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); | 25 | chk_zero(close(rw[1]), "Closing write end of pipe in child"); |
25 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); | 26 | chk_zero(close(STDIN_FILENO), "Closing STDIN"); |
26 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); | 27 | chk_non_negative(dup2(rw[0],STDIN_FILENO), "Redirecting compressor input to stdin"); |
27 | execlp(filter,filter,NULL); | 28 | execlp(filter,filter,NULL); |
28 | _exit(-1); | 29 | _exit(-1); |
29 | } | 30 | } |
30 | /* parent */ | 31 | /* parent */ |
31 | chk_zero(close(rw[0]), "Closing read end of pipe"); | 32 | chk_zero(close(rw[0]), "Closing read end of pipe"); |
32 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); | 33 | chk_non_negative(dup2(rw[1],STDOUT_FILENO), "Redirecting output to compressor"); |
33 | 34 | ||
34 | rv = write_tar_archive(args); | 35 | rv = write_tar_archive(args); |
35 | 36 | ||
36 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); | 37 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT redirected to compressor"); |
37 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); | 38 | chk_non_negative(dup2(stdout2,STDOUT_FILENO), "Restoring uncompressed STDOUT"); |
38 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); | 39 | chk_zero(close(stdout2), "Closing uncompressed STDOUT"); |
39 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); | 40 | chk_zero(close(rw[1]), "Closing write end of pipe in parent"); |
40 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); | 41 | chk_positive(waitpid(gzpid,&status,0), "Waiting on compressor process"); |
41 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) | 42 | if(! ( WIFEXITED(status) && WEXITSTATUS(status)==0 ) ) |
42 | cgit_print_error("Failed to compress archive"); | 43 | cgit_print_error("Failed to compress archive"); |
43 | 44 | ||
44 | return rv; | 45 | return rv; |
45 | } | 46 | } |
46 | 47 | ||
47 | static int write_tar_gzip_archive(struct archiver_args *args) | 48 | static int write_tar_gzip_archive(struct archiver_args *args) |
48 | { | 49 | { |
49 | return write_compressed_tar_archive(args,"gzip"); | 50 | return write_compressed_tar_archive(args,"gzip"); |
50 | } | 51 | } |
51 | 52 | ||
52 | static int write_tar_bzip2_archive(struct archiver_args *args) | 53 | static int write_tar_bzip2_archive(struct archiver_args *args) |
53 | { | 54 | { |
54 | return write_compressed_tar_archive(args,"bzip2"); | 55 | return write_compressed_tar_archive(args,"bzip2"); |
55 | } | 56 | } |
56 | 57 | ||
57 | static const struct snapshot_archive_t { | 58 | static const struct snapshot_archive_t { |
58 | const char *suffix; | 59 | const char *suffix; |
59 | const char *mimetype; | 60 | const char *mimetype; |
60 | write_archive_fn_t write_func; | 61 | write_archive_fn_t write_func; |
61 | int bit; | 62 | int bit; |
62 | }snapshot_archives[] = { | 63 | }snapshot_archives[] = { |
63 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, | 64 | { ".zip", "application/x-zip", write_zip_archive, 0x1 }, |
64 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, | 65 | { ".tar.gz", "application/x-tar", write_tar_gzip_archive, 0x2 }, |
65 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, | 66 | { ".tar.bz2", "application/x-tar", write_tar_bzip2_archive, 0x4 }, |
66 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } | 67 | { ".tar", "application/x-tar", write_tar_archive, 0x8 } |
67 | }; | 68 | }; |
68 | 69 | ||
69 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) | 70 | #define snapshot_archives_len (sizeof(snapshot_archives) / sizeof(*snapshot_archives)) |
70 | 71 | ||
71 | void cgit_print_snapshot(struct cacheitem *item, const char *head, | 72 | void cgit_print_snapshot(struct cacheitem *item, const char *head, |
72 | const char *hex, const char *prefix, | 73 | const char *hex, const char *prefix, |
73 | const char *filename, int snapshots) | 74 | const char *filename, int snapshots) |
74 | { | 75 | { |
75 | const struct snapshot_archive_t* sat; | 76 | const struct snapshot_archive_t* sat; |
76 | struct archiver_args args; | 77 | struct archiver_args args; |
77 | struct commit *commit; | 78 | struct commit *commit; |
78 | unsigned char sha1[20]; | 79 | unsigned char sha1[20]; |
79 | int f, sl, fnl = strlen(filename); | 80 | int f, sl, fnl = strlen(filename); |
80 | 81 | ||
81 | for(f=0; f<snapshot_archives_len; f++) { | 82 | for(f=0; f<snapshot_archives_len; f++) { |
82 | sat = &snapshot_archives[f]; | 83 | sat = &snapshot_archives[f]; |
83 | if(!(snapshots & sat->bit)) | 84 | if(!(snapshots & sat->bit)) |
84 | continue; | 85 | continue; |
85 | sl = strlen(sat->suffix); | 86 | sl = strlen(sat->suffix); |
86 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) | 87 | if(fnl<sl || strcmp(&filename[fnl-sl],sat->suffix)) |
87 | continue; | 88 | continue; |
88 | if (!hex) | 89 | if (!hex) |
89 | hex = head; | 90 | hex = head; |
90 | if(get_sha1(hex, sha1)) { | 91 | if(get_sha1(hex, sha1)) { |
91 | cgit_print_error(fmt("Bad object id: %s", hex)); | 92 | cgit_print_error(fmt("Bad object id: %s", hex)); |
92 | return; | 93 | return; |
93 | } | 94 | } |
94 | commit = lookup_commit_reference(sha1); | 95 | commit = lookup_commit_reference(sha1); |
95 | if(!commit) { | 96 | if(!commit) { |
96 | cgit_print_error(fmt("Not a commit reference: %s", hex)); | 97 | cgit_print_error(fmt("Not a commit reference: %s", hex)); |
97 | return;; | 98 | return;; |
98 | } | 99 | } |
99 | memset(&args,0,sizeof(args)); | 100 | memset(&args,0,sizeof(args)); |
100 | args.base = fmt("%s/", prefix); | 101 | args.base = fmt("%s/", prefix); |
101 | args.tree = commit->tree; | 102 | args.tree = commit->tree; |
102 | args.time = commit->date; | 103 | args.time = commit->date; |
103 | cgit_print_snapshot_start(sat->mimetype, filename, item); | 104 | cgit_print_snapshot_start(sat->mimetype, filename, item); |
104 | (*sat->write_func)(&args); | 105 | (*sat->write_func)(&args); |
105 | return; | 106 | return; |
106 | } | 107 | } |
107 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); | 108 | cgit_print_error(fmt("Unsupported snapshot format: %s", filename)); |
108 | } | 109 | } |
109 | 110 | ||
110 | void cgit_print_snapshot_links(const char *repo, const char *head, | 111 | void cgit_print_snapshot_links(const char *repo, const char *head, |
111 | const char *hex, int snapshots) | 112 | const char *hex, int snapshots) |
112 | { | 113 | { |
113 | const struct snapshot_archive_t* sat; | 114 | const struct snapshot_archive_t* sat; |
114 | char *filename; | 115 | char *filename; |
115 | int f; | 116 | int f; |
116 | 117 | ||
117 | for(f=0; f<snapshot_archives_len; f++) { | 118 | for(f=0; f<snapshot_archives_len; f++) { |
118 | sat = &snapshot_archives[f]; | 119 | sat = &snapshot_archives[f]; |
119 | if(!(snapshots & sat->bit)) | 120 | if(!(snapshots & sat->bit)) |
120 | continue; | 121 | continue; |
121 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, | 122 | filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, |
122 | sat->suffix); | 123 | sat->suffix); |
123 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, | 124 | cgit_snapshot_link(filename, NULL, NULL, (char *)head, |
124 | (char *)hex, filename); | 125 | (char *)hex, filename); |
125 | html("<br/>"); | 126 | html("<br/>"); |
126 | } | 127 | } |
127 | } | 128 | } |
128 | 129 | ||
129 | int cgit_parse_snapshots_mask(const char *str) | 130 | int cgit_parse_snapshots_mask(const char *str) |
130 | { | 131 | { |
131 | const struct snapshot_archive_t* sat; | 132 | const struct snapshot_archive_t* sat; |
132 | static const char *delim = " \t,:/|;"; | 133 | static const char *delim = " \t,:/|;"; |
133 | int f, tl, sl, rv = 0; | 134 | int f, tl, sl, rv = 0; |
134 | 135 | ||
135 | /* favor legacy setting */ | 136 | /* favor legacy setting */ |
136 | if(atoi(str)) | 137 | if(atoi(str)) |
137 | return 1; | 138 | return 1; |
138 | for(;;) { | 139 | for(;;) { |
139 | str += strspn(str,delim); | 140 | str += strspn(str,delim); |
140 | tl = strcspn(str,delim); | 141 | tl = strcspn(str,delim); |
141 | if(!tl) | 142 | if(!tl) |
142 | break; | 143 | break; |
143 | for(f=0; f<snapshot_archives_len; f++) { | 144 | for(f=0; f<snapshot_archives_len; f++) { |
144 | sat = &snapshot_archives[f]; | 145 | sat = &snapshot_archives[f]; |
145 | sl = strlen(sat->suffix); | 146 | sl = strlen(sat->suffix); |
146 | if((tl == sl && !strncmp(sat->suffix, str, tl)) || | 147 | if((tl == sl && !strncmp(sat->suffix, str, tl)) || |
147 | (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { | 148 | (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { |
148 | rv |= sat->bit; | 149 | rv |= sat->bit; |
149 | break; | 150 | break; |
150 | } | 151 | } |
151 | } | 152 | } |
152 | str += tl; | 153 | str += tl; |
153 | } | 154 | } |
154 | return rv; | 155 | return rv; |
155 | } | 156 | } |
156 | 157 | ||
157 | /* vim:set sw=8: */ | 158 | /* vim:set sw=8: */ |