author | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-02-19 13:51:00 (UTC) |
commit | 979c460e7f71d153ae79da67b8b21c3412f0fe02 (patch) (unidiff) | |
tree | 6da9ffb66ed0a68205e6644cb7e2b4652d6684be /cgit.c | |
parent | fb9e6d1594a24fe4e551fd57a9c91fd18b14806e (diff) | |
parent | 0141b9f889bbaa1fe474f9a98dd377138ac73054 (diff) | |
download | cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.zip cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.gz cgit-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.bz2 |
Merge branch 'br/misc'
* br/misc:
Use transparent background for the cgit logo
ssdiff: anchors for ssdiff
implement repo.logo and repo.logo-link
-rw-r--r-- | cgit.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -28,99 +28,103 @@ void add_mimetype(const char *name, const char *value) | |||
28 | 28 | ||
29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) | 29 | struct cgit_filter *new_filter(const char *cmd, int extra_args) |
30 | { | 30 | { |
31 | struct cgit_filter *f; | 31 | struct cgit_filter *f; |
32 | 32 | ||
33 | if (!cmd || !cmd[0]) | 33 | if (!cmd || !cmd[0]) |
34 | return NULL; | 34 | return NULL; |
35 | 35 | ||
36 | f = xmalloc(sizeof(struct cgit_filter)); | 36 | f = xmalloc(sizeof(struct cgit_filter)); |
37 | f->cmd = xstrdup(cmd); | 37 | f->cmd = xstrdup(cmd); |
38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); | 38 | f->argv = xmalloc((2 + extra_args) * sizeof(char *)); |
39 | f->argv[0] = f->cmd; | 39 | f->argv[0] = f->cmd; |
40 | f->argv[1] = NULL; | 40 | f->argv[1] = NULL; |
41 | return f; | 41 | return f; |
42 | } | 42 | } |
43 | 43 | ||
44 | static void process_cached_repolist(const char *path); | 44 | static void process_cached_repolist(const char *path); |
45 | 45 | ||
46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | 46 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
47 | { | 47 | { |
48 | if (!strcmp(name, "name")) | 48 | if (!strcmp(name, "name")) |
49 | repo->name = xstrdup(value); | 49 | repo->name = xstrdup(value); |
50 | else if (!strcmp(name, "clone-url")) | 50 | else if (!strcmp(name, "clone-url")) |
51 | repo->clone_url = xstrdup(value); | 51 | repo->clone_url = xstrdup(value); |
52 | else if (!strcmp(name, "desc")) | 52 | else if (!strcmp(name, "desc")) |
53 | repo->desc = xstrdup(value); | 53 | repo->desc = xstrdup(value); |
54 | else if (!strcmp(name, "owner")) | 54 | else if (!strcmp(name, "owner")) |
55 | repo->owner = xstrdup(value); | 55 | repo->owner = xstrdup(value); |
56 | else if (!strcmp(name, "defbranch")) | 56 | else if (!strcmp(name, "defbranch")) |
57 | repo->defbranch = xstrdup(value); | 57 | repo->defbranch = xstrdup(value); |
58 | else if (!strcmp(name, "snapshots")) | 58 | else if (!strcmp(name, "snapshots")) |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); | 59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-commit-graph")) | 60 | else if (!strcmp(name, "enable-commit-graph")) |
61 | repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); | 61 | repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); |
62 | else if (!strcmp(name, "enable-log-filecount")) | 62 | else if (!strcmp(name, "enable-log-filecount")) |
63 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 63 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
64 | else if (!strcmp(name, "enable-log-linecount")) | 64 | else if (!strcmp(name, "enable-log-linecount")) |
65 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 65 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
66 | else if (!strcmp(name, "enable-remote-branches")) | 66 | else if (!strcmp(name, "enable-remote-branches")) |
67 | repo->enable_remote_branches = atoi(value); | 67 | repo->enable_remote_branches = atoi(value); |
68 | else if (!strcmp(name, "enable-subject-links")) | 68 | else if (!strcmp(name, "enable-subject-links")) |
69 | repo->enable_subject_links = atoi(value); | 69 | repo->enable_subject_links = atoi(value); |
70 | else if (!strcmp(name, "max-stats")) | 70 | else if (!strcmp(name, "max-stats")) |
71 | repo->max_stats = cgit_find_stats_period(value, NULL); | 71 | repo->max_stats = cgit_find_stats_period(value, NULL); |
72 | else if (!strcmp(name, "module-link")) | 72 | else if (!strcmp(name, "module-link")) |
73 | repo->module_link= xstrdup(value); | 73 | repo->module_link= xstrdup(value); |
74 | else if (!strcmp(name, "section")) | 74 | else if (!strcmp(name, "section")) |
75 | repo->section = xstrdup(value); | 75 | repo->section = xstrdup(value); |
76 | else if (!strcmp(name, "readme") && value != NULL) { | 76 | else if (!strcmp(name, "readme") && value != NULL) |
77 | repo->readme = xstrdup(value); | 77 | repo->readme = xstrdup(value); |
78 | } else if (ctx.cfg.enable_filter_overrides) { | 78 | else if (!strcmp(name, "logo") && value != NULL) |
79 | repo->logo = xstrdup(value); | ||
80 | else if (!strcmp(name, "logo-link") && value != NULL) | ||
81 | repo->logo_link = xstrdup(value); | ||
82 | else if (ctx.cfg.enable_filter_overrides) { | ||
79 | if (!strcmp(name, "about-filter")) | 83 | if (!strcmp(name, "about-filter")) |
80 | repo->about_filter = new_filter(value, 0); | 84 | repo->about_filter = new_filter(value, 0); |
81 | else if (!strcmp(name, "commit-filter")) | 85 | else if (!strcmp(name, "commit-filter")) |
82 | repo->commit_filter = new_filter(value, 0); | 86 | repo->commit_filter = new_filter(value, 0); |
83 | else if (!strcmp(name, "source-filter")) | 87 | else if (!strcmp(name, "source-filter")) |
84 | repo->source_filter = new_filter(value, 1); | 88 | repo->source_filter = new_filter(value, 1); |
85 | } | 89 | } |
86 | } | 90 | } |
87 | 91 | ||
88 | void config_cb(const char *name, const char *value) | 92 | void config_cb(const char *name, const char *value) |
89 | { | 93 | { |
90 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) | 94 | if (!strcmp(name, "section") || !strcmp(name, "repo.group")) |
91 | ctx.cfg.section = xstrdup(value); | 95 | ctx.cfg.section = xstrdup(value); |
92 | else if (!strcmp(name, "repo.url")) | 96 | else if (!strcmp(name, "repo.url")) |
93 | ctx.repo = cgit_add_repo(value); | 97 | ctx.repo = cgit_add_repo(value); |
94 | else if (ctx.repo && !strcmp(name, "repo.path")) | 98 | else if (ctx.repo && !strcmp(name, "repo.path")) |
95 | ctx.repo->path = trim_end(value, '/'); | 99 | ctx.repo->path = trim_end(value, '/'); |
96 | else if (ctx.repo && !prefixcmp(name, "repo.")) | 100 | else if (ctx.repo && !prefixcmp(name, "repo.")) |
97 | repo_config(ctx.repo, name + 5, value); | 101 | repo_config(ctx.repo, name + 5, value); |
98 | else if (!strcmp(name, "readme")) | 102 | else if (!strcmp(name, "readme")) |
99 | ctx.cfg.readme = xstrdup(value); | 103 | ctx.cfg.readme = xstrdup(value); |
100 | else if (!strcmp(name, "root-title")) | 104 | else if (!strcmp(name, "root-title")) |
101 | ctx.cfg.root_title = xstrdup(value); | 105 | ctx.cfg.root_title = xstrdup(value); |
102 | else if (!strcmp(name, "root-desc")) | 106 | else if (!strcmp(name, "root-desc")) |
103 | ctx.cfg.root_desc = xstrdup(value); | 107 | ctx.cfg.root_desc = xstrdup(value); |
104 | else if (!strcmp(name, "root-readme")) | 108 | else if (!strcmp(name, "root-readme")) |
105 | ctx.cfg.root_readme = xstrdup(value); | 109 | ctx.cfg.root_readme = xstrdup(value); |
106 | else if (!strcmp(name, "css")) | 110 | else if (!strcmp(name, "css")) |
107 | ctx.cfg.css = xstrdup(value); | 111 | ctx.cfg.css = xstrdup(value); |
108 | else if (!strcmp(name, "favicon")) | 112 | else if (!strcmp(name, "favicon")) |
109 | ctx.cfg.favicon = xstrdup(value); | 113 | ctx.cfg.favicon = xstrdup(value); |
110 | else if (!strcmp(name, "footer")) | 114 | else if (!strcmp(name, "footer")) |
111 | ctx.cfg.footer = xstrdup(value); | 115 | ctx.cfg.footer = xstrdup(value); |
112 | else if (!strcmp(name, "head-include")) | 116 | else if (!strcmp(name, "head-include")) |
113 | ctx.cfg.head_include = xstrdup(value); | 117 | ctx.cfg.head_include = xstrdup(value); |
114 | else if (!strcmp(name, "header")) | 118 | else if (!strcmp(name, "header")) |
115 | ctx.cfg.header = xstrdup(value); | 119 | ctx.cfg.header = xstrdup(value); |
116 | else if (!strcmp(name, "logo")) | 120 | else if (!strcmp(name, "logo")) |
117 | ctx.cfg.logo = xstrdup(value); | 121 | ctx.cfg.logo = xstrdup(value); |
118 | else if (!strcmp(name, "index-header")) | 122 | else if (!strcmp(name, "index-header")) |
119 | ctx.cfg.index_header = xstrdup(value); | 123 | ctx.cfg.index_header = xstrdup(value); |
120 | else if (!strcmp(name, "index-info")) | 124 | else if (!strcmp(name, "index-info")) |
121 | ctx.cfg.index_info = xstrdup(value); | 125 | ctx.cfg.index_info = xstrdup(value); |
122 | else if (!strcmp(name, "logo-link")) | 126 | else if (!strcmp(name, "logo-link")) |
123 | ctx.cfg.logo_link = xstrdup(value); | 127 | ctx.cfg.logo_link = xstrdup(value); |
124 | else if (!strcmp(name, "module-link")) | 128 | else if (!strcmp(name, "module-link")) |
125 | ctx.cfg.module_link = xstrdup(value); | 129 | ctx.cfg.module_link = xstrdup(value); |
126 | else if (!strcmp(name, "strict-export")) | 130 | else if (!strcmp(name, "strict-export")) |