author | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 15:38:38 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-07-31 15:39:51 (UTC) |
commit | d6f6072560c963065b13c704fa1fa6f8950e4bac (patch) (unidiff) | |
tree | 096a542cd404d4a174f2f4a1da44ab0df99aa7c3 | |
parent | 286a905842dc0bec6d21a614ec4a97c5f19d5bc4 (diff) | |
download | cgit-d6f6072560c963065b13c704fa1fa6f8950e4bac.zip cgit-d6f6072560c963065b13c704fa1fa6f8950e4bac.tar.gz cgit-d6f6072560c963065b13c704fa1fa6f8950e4bac.tar.bz2 |
Add generic filter/plugin infrastructure
The functions cgit_open_filter() and cgit_close_filter() can be used to
execute filters on the output stream from cgit.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 15 | ||||
-rw-r--r-- | cgit.h | 12 | ||||
-rw-r--r-- | shared.c | 35 |
3 files changed, 62 insertions, 0 deletions
@@ -8,24 +8,39 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cache.h" | 10 | #include "cache.h" |
11 | #include "cmd.h" | 11 | #include "cmd.h" |
12 | #include "configfile.h" | 12 | #include "configfile.h" |
13 | #include "html.h" | 13 | #include "html.h" |
14 | #include "ui-shared.h" | 14 | #include "ui-shared.h" |
15 | #include "ui-stats.h" | 15 | #include "ui-stats.h" |
16 | #include "scan-tree.h" | 16 | #include "scan-tree.h" |
17 | 17 | ||
18 | const char *cgit_version = CGIT_VERSION; | 18 | const char *cgit_version = CGIT_VERSION; |
19 | 19 | ||
20 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | ||
21 | { | ||
22 | struct cgit_filter *f; | ||
23 | |||
24 | if (!cmd) | ||
25 | return NULL; | ||
26 | |||
27 | f = xmalloc(sizeof(struct cgit_filter)); | ||
28 | f->cmd = xstrdup(cmd); | ||
29 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | ||
30 | f->argv[0] = f->cmd; | ||
31 | f->argv[1] = NULL; | ||
32 | return f; | ||
33 | } | ||
34 | |||
20 | void config_cb(const char *name, const char *value) | 35 | void config_cb(const char *name, const char *value) |
21 | { | 36 | { |
22 | if (!strcmp(name, "root-title")) | 37 | if (!strcmp(name, "root-title")) |
23 | ctx.cfg.root_title = xstrdup(value); | 38 | ctx.cfg.root_title = xstrdup(value); |
24 | else if (!strcmp(name, "root-desc")) | 39 | else if (!strcmp(name, "root-desc")) |
25 | ctx.cfg.root_desc = xstrdup(value); | 40 | ctx.cfg.root_desc = xstrdup(value); |
26 | else if (!strcmp(name, "root-readme")) | 41 | else if (!strcmp(name, "root-readme")) |
27 | ctx.cfg.root_readme = xstrdup(value); | 42 | ctx.cfg.root_readme = xstrdup(value); |
28 | else if (!strcmp(name, "css")) | 43 | else if (!strcmp(name, "css")) |
29 | ctx.cfg.css = xstrdup(value); | 44 | ctx.cfg.css = xstrdup(value); |
30 | else if (!strcmp(name, "favicon")) | 45 | else if (!strcmp(name, "favicon")) |
31 | ctx.cfg.favicon = xstrdup(value); | 46 | ctx.cfg.favicon = xstrdup(value); |
@@ -120,24 +120,33 @@ struct cgit_query { | |||
120 | char *sha2; | 120 | char *sha2; |
121 | char *path; | 121 | char *path; |
122 | char *name; | 122 | char *name; |
123 | char *mimetype; | 123 | char *mimetype; |
124 | char *url; | 124 | char *url; |
125 | char *period; | 125 | char *period; |
126 | int ofs; | 126 | int ofs; |
127 | int nohead; | 127 | int nohead; |
128 | char *sort; | 128 | char *sort; |
129 | int showmsg; | 129 | int showmsg; |
130 | }; | 130 | }; |
131 | 131 | ||
132 | struct cgit_filter { | ||
133 | char *cmd; | ||
134 | char **argv; | ||
135 | int old_stdout; | ||
136 | int pipe_fh[2]; | ||
137 | int pid; | ||
138 | int exitstatus; | ||
139 | }; | ||
140 | |||
132 | struct cgit_config { | 141 | struct cgit_config { |
133 | char *agefile; | 142 | char *agefile; |
134 | char *cache_root; | 143 | char *cache_root; |
135 | char *clone_prefix; | 144 | char *clone_prefix; |
136 | char *css; | 145 | char *css; |
137 | char *favicon; | 146 | char *favicon; |
138 | char *footer; | 147 | char *footer; |
139 | char *head_include; | 148 | char *head_include; |
140 | char *header; | 149 | char *header; |
141 | char *index_header; | 150 | char *index_header; |
142 | char *index_info; | 151 | char *index_info; |
143 | char *logo; | 152 | char *logo; |
@@ -239,14 +248,17 @@ extern void cgit_diff_tree(const unsigned char *old_sha1, | |||
239 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 248 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
240 | 249 | ||
241 | extern char *fmt(const char *format,...); | 250 | extern char *fmt(const char *format,...); |
242 | 251 | ||
243 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 252 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
244 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 253 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
245 | extern void cgit_parse_url(const char *url); | 254 | extern void cgit_parse_url(const char *url); |
246 | 255 | ||
247 | extern const char *cgit_repobasename(const char *reponame); | 256 | extern const char *cgit_repobasename(const char *reponame); |
248 | 257 | ||
249 | extern int cgit_parse_snapshots_mask(const char *str); | 258 | extern int cgit_parse_snapshots_mask(const char *str); |
250 | 259 | ||
260 | extern int cgit_open_filter(struct cgit_filter *filter); | ||
261 | extern int cgit_close_filter(struct cgit_filter *filter); | ||
262 | |||
251 | 263 | ||
252 | #endif /* CGIT_H */ | 264 | #endif /* CGIT_H */ |
@@ -346,12 +346,47 @@ int cgit_parse_snapshots_mask(const char *str) | |||
346 | for (f = cgit_snapshot_formats; f->suffix; f++) { | 346 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
347 | sl = strlen(f->suffix); | 347 | sl = strlen(f->suffix); |
348 | if((tl == sl && !strncmp(f->suffix, str, tl)) || | 348 | if((tl == sl && !strncmp(f->suffix, str, tl)) || |
349 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { | 349 | (tl == sl-1 && !strncmp(f->suffix+1, str, tl-1))) { |
350 | rv |= f->bit; | 350 | rv |= f->bit; |
351 | break; | 351 | break; |
352 | } | 352 | } |
353 | } | 353 | } |
354 | str += tl; | 354 | str += tl; |
355 | } | 355 | } |
356 | return rv; | 356 | return rv; |
357 | } | 357 | } |
358 | |||
359 | int cgit_open_filter(struct cgit_filter *filter) | ||
360 | { | ||
361 | |||
362 | filter->old_stdout = chk_positive(dup(STDOUT_FILENO), | ||
363 | "Unable to duplicate STDOUT"); | ||
364 | chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess"); | ||
365 | filter->pid = chk_non_negative(fork(), "Unable to create subprocess"); | ||
366 | if (filter->pid == 0) { | ||
367 | close(filter->pipe_fh[1]); | ||
368 | chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO), | ||
369 | "Unable to use pipe as STDIN"); | ||
370 | execvp(filter->cmd, filter->argv); | ||
371 | die("Unable to exec subprocess %s: %s (%d)", filter->cmd, | ||
372 | strerror(errno), errno); | ||
373 | } | ||
374 | close(filter->pipe_fh[0]); | ||
375 | chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO), | ||
376 | "Unable to use pipe as STDOUT"); | ||
377 | close(filter->pipe_fh[1]); | ||
378 | return 0; | ||
379 | } | ||
380 | |||
381 | int cgit_close_filter(struct cgit_filter *filter) | ||
382 | { | ||
383 | chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO), | ||
384 | "Unable to restore STDOUT"); | ||
385 | close(filter->old_stdout); | ||
386 | if (filter->pid < 0) | ||
387 | return 0; | ||
388 | waitpid(filter->pid, &filter->exitstatus, 0); | ||
389 | if (WIFEXITED(filter->exitstatus) && !WEXITSTATUS(filter->exitstatus)) | ||
390 | return 0; | ||
391 | die("Subprocess %s exited abnormally", filter->cmd); | ||
392 | } | ||