|
diff --git a/shared.c b/shared.c index ffecac8..072bb6d 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -76,128 +76,130 @@ struct repoinfo *add_repo(const char *url) |
76 | else |
76 | else |
77 | cgit_repolist.length *= 2; |
77 | cgit_repolist.length *= 2; |
78 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
78 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
79 | cgit_repolist.length * |
79 | cgit_repolist.length * |
80 | sizeof(struct repoinfo)); |
80 | sizeof(struct repoinfo)); |
81 | } |
81 | } |
82 | |
82 | |
83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
83 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
84 | ret->url = xstrdup(url); |
84 | ret->url = xstrdup(url); |
85 | ret->name = ret->url; |
85 | ret->name = ret->url; |
86 | ret->path = NULL; |
86 | ret->path = NULL; |
87 | ret->desc = NULL; |
87 | ret->desc = NULL; |
88 | ret->owner = NULL; |
88 | ret->owner = NULL; |
89 | ret->snapshots = cgit_snapshots; |
89 | ret->snapshots = cgit_snapshots; |
90 | ret->module_link = cgit_module_link; |
90 | ret->module_link = cgit_module_link; |
91 | return ret; |
91 | return ret; |
92 | } |
92 | } |
93 | |
93 | |
94 | void cgit_global_config_cb(const char *name, const char *value) |
94 | void cgit_global_config_cb(const char *name, const char *value) |
95 | { |
95 | { |
96 | if (!strcmp(name, "root-title")) |
96 | if (!strcmp(name, "root-title")) |
97 | cgit_root_title = xstrdup(value); |
97 | cgit_root_title = xstrdup(value); |
98 | else if (!strcmp(name, "css")) |
98 | else if (!strcmp(name, "css")) |
99 | cgit_css = xstrdup(value); |
99 | cgit_css = xstrdup(value); |
100 | else if (!strcmp(name, "logo")) |
100 | else if (!strcmp(name, "logo")) |
101 | cgit_logo = xstrdup(value); |
101 | cgit_logo = xstrdup(value); |
102 | else if (!strcmp(name, "logo-link")) |
102 | else if (!strcmp(name, "logo-link")) |
103 | cgit_logo_link = xstrdup(value); |
103 | cgit_logo_link = xstrdup(value); |
104 | else if (!strcmp(name, "module-link")) |
104 | else if (!strcmp(name, "module-link")) |
105 | cgit_module_link = xstrdup(value); |
105 | cgit_module_link = xstrdup(value); |
106 | else if (!strcmp(name, "virtual-root")) |
106 | else if (!strcmp(name, "virtual-root")) |
107 | cgit_virtual_root = xstrdup(value); |
107 | cgit_virtual_root = xstrdup(value); |
108 | else if (!strcmp(name, "nocache")) |
108 | else if (!strcmp(name, "nocache")) |
109 | cgit_nocache = atoi(value); |
109 | cgit_nocache = atoi(value); |
110 | else if (!strcmp(name, "snapshots")) |
110 | else if (!strcmp(name, "snapshots")) |
111 | cgit_snapshots = atoi(value); |
111 | cgit_snapshots = atoi(value); |
112 | else if (!strcmp(name, "cache-root")) |
112 | else if (!strcmp(name, "cache-root")) |
113 | cgit_cache_root = xstrdup(value); |
113 | cgit_cache_root = xstrdup(value); |
114 | else if (!strcmp(name, "cache-root-ttl")) |
114 | else if (!strcmp(name, "cache-root-ttl")) |
115 | cgit_cache_root_ttl = atoi(value); |
115 | cgit_cache_root_ttl = atoi(value); |
116 | else if (!strcmp(name, "cache-repo-ttl")) |
116 | else if (!strcmp(name, "cache-repo-ttl")) |
117 | cgit_cache_repo_ttl = atoi(value); |
117 | cgit_cache_repo_ttl = atoi(value); |
118 | else if (!strcmp(name, "cache-static-ttl")) |
118 | else if (!strcmp(name, "cache-static-ttl")) |
119 | cgit_cache_static_ttl = atoi(value); |
119 | cgit_cache_static_ttl = atoi(value); |
120 | else if (!strcmp(name, "cache-dynamic-ttl")) |
120 | else if (!strcmp(name, "cache-dynamic-ttl")) |
121 | cgit_cache_dynamic_ttl = atoi(value); |
121 | cgit_cache_dynamic_ttl = atoi(value); |
122 | else if (!strcmp(name, "max-message-length")) |
122 | else if (!strcmp(name, "max-message-length")) |
123 | cgit_max_msg_len = atoi(value); |
123 | cgit_max_msg_len = atoi(value); |
124 | else if (!strcmp(name, "max-commit-count")) |
124 | else if (!strcmp(name, "max-commit-count")) |
125 | cgit_max_commit_count = atoi(value); |
125 | cgit_max_commit_count = atoi(value); |
126 | else if (!strcmp(name, "repo.url")) |
126 | else if (!strcmp(name, "repo.url")) |
127 | cgit_repo = add_repo(value); |
127 | cgit_repo = add_repo(value); |
128 | else if (!strcmp(name, "repo.name")) |
128 | else if (!strcmp(name, "repo.name")) |
129 | cgit_repo->name = xstrdup(value); |
129 | cgit_repo->name = xstrdup(value); |
130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
130 | else if (cgit_repo && !strcmp(name, "repo.path")) |
131 | cgit_repo->path = xstrdup(value); |
131 | cgit_repo->path = xstrdup(value); |
132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
132 | else if (cgit_repo && !strcmp(name, "repo.desc")) |
133 | cgit_repo->desc = xstrdup(value); |
133 | cgit_repo->desc = xstrdup(value); |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
134 | else if (cgit_repo && !strcmp(name, "repo.owner")) |
135 | cgit_repo->owner = xstrdup(value); |
135 | cgit_repo->owner = xstrdup(value); |
136 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
136 | else if (cgit_repo && !strcmp(name, "repo.snapshots")) |
137 | cgit_repo->snapshots = atoi(value); |
137 | cgit_repo->snapshots = atoi(value); |
138 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
138 | else if (cgit_repo && !strcmp(name, "repo.module-link")) |
139 | cgit_repo->module_link= xstrdup(value); |
139 | cgit_repo->module_link= xstrdup(value); |
| |
140 | else if (!strcmp(name, "include")) |
| |
141 | cgit_read_config(value, cgit_global_config_cb); |
140 | } |
142 | } |
141 | |
143 | |
142 | void cgit_repo_config_cb(const char *name, const char *value) |
144 | void cgit_repo_config_cb(const char *name, const char *value) |
143 | { |
145 | { |
144 | if (!strcmp(name, "name")) |
146 | if (!strcmp(name, "name")) |
145 | cgit_repo_name = xstrdup(value); |
147 | cgit_repo_name = xstrdup(value); |
146 | else if (!strcmp(name, "desc")) |
148 | else if (!strcmp(name, "desc")) |
147 | cgit_repo_desc = xstrdup(value); |
149 | cgit_repo_desc = xstrdup(value); |
148 | else if (!strcmp(name, "owner")) |
150 | else if (!strcmp(name, "owner")) |
149 | cgit_repo_owner = xstrdup(value); |
151 | cgit_repo_owner = xstrdup(value); |
150 | } |
152 | } |
151 | |
153 | |
152 | void cgit_querystring_cb(const char *name, const char *value) |
154 | void cgit_querystring_cb(const char *name, const char *value) |
153 | { |
155 | { |
154 | if (!strcmp(name,"r")) { |
156 | if (!strcmp(name,"r")) { |
155 | cgit_query_repo = xstrdup(value); |
157 | cgit_query_repo = xstrdup(value); |
156 | } else if (!strcmp(name, "p")) { |
158 | } else if (!strcmp(name, "p")) { |
157 | cgit_query_page = xstrdup(value); |
159 | cgit_query_page = xstrdup(value); |
158 | } else if (!strcmp(name, "q")) { |
160 | } else if (!strcmp(name, "q")) { |
159 | cgit_query_search = xstrdup(value); |
161 | cgit_query_search = xstrdup(value); |
160 | } else if (!strcmp(name, "h")) { |
162 | } else if (!strcmp(name, "h")) { |
161 | cgit_query_head = xstrdup(value); |
163 | cgit_query_head = xstrdup(value); |
162 | cgit_query_has_symref = 1; |
164 | cgit_query_has_symref = 1; |
163 | } else if (!strcmp(name, "id")) { |
165 | } else if (!strcmp(name, "id")) { |
164 | cgit_query_sha1 = xstrdup(value); |
166 | cgit_query_sha1 = xstrdup(value); |
165 | cgit_query_has_sha1 = 1; |
167 | cgit_query_has_sha1 = 1; |
166 | } else if (!strcmp(name, "id2")) { |
168 | } else if (!strcmp(name, "id2")) { |
167 | cgit_query_sha2 = xstrdup(value); |
169 | cgit_query_sha2 = xstrdup(value); |
168 | cgit_query_has_sha1 = 1; |
170 | cgit_query_has_sha1 = 1; |
169 | } else if (!strcmp(name, "ofs")) { |
171 | } else if (!strcmp(name, "ofs")) { |
170 | cgit_query_ofs = atoi(value); |
172 | cgit_query_ofs = atoi(value); |
171 | } else if (!strcmp(name, "path")) { |
173 | } else if (!strcmp(name, "path")) { |
172 | cgit_query_path = xstrdup(value); |
174 | cgit_query_path = xstrdup(value); |
173 | } else if (!strcmp(name, "name")) { |
175 | } else if (!strcmp(name, "name")) { |
174 | cgit_query_name = xstrdup(value); |
176 | cgit_query_name = xstrdup(value); |
175 | } |
177 | } |
176 | } |
178 | } |
177 | |
179 | |
178 | void *cgit_free_commitinfo(struct commitinfo *info) |
180 | void *cgit_free_commitinfo(struct commitinfo *info) |
179 | { |
181 | { |
180 | free(info->author); |
182 | free(info->author); |
181 | free(info->author_email); |
183 | free(info->author_email); |
182 | free(info->committer); |
184 | free(info->committer); |
183 | free(info->committer_email); |
185 | free(info->committer_email); |
184 | free(info->subject); |
186 | free(info->subject); |
185 | free(info); |
187 | free(info); |
186 | return NULL; |
188 | return NULL; |
187 | } |
189 | } |
188 | |
190 | |
189 | int hextoint(char c) |
191 | int hextoint(char c) |
190 | { |
192 | { |
191 | if (c >= 'a' && c <= 'f') |
193 | if (c >= 'a' && c <= 'f') |
192 | return 10 + c - 'a'; |
194 | return 10 + c - 'a'; |
193 | else if (c >= 'A' && c <= 'F') |
195 | else if (c >= 'A' && c <= 'F') |
194 | return 10 + c - 'A'; |
196 | return 10 + c - 'A'; |
195 | else if (c >= '0' && c <= '9') |
197 | else if (c >= '0' && c <= '9') |
196 | return c - '0'; |
198 | return c - '0'; |
197 | else |
199 | else |
198 | return -1; |
200 | return -1; |
199 | } |
201 | } |
200 | |
202 | |
201 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
203 | void cgit_diff_tree_cb(struct diff_queue_struct *q, |
202 | struct diff_options *options, void *data) |
204 | struct diff_options *options, void *data) |
203 | { |
205 | { |
|