|
diff --git a/shared.c b/shared.c index 6117f5c..84aa281 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -55,129 +55,129 @@ char *cgit_query_repo = NULL; |
55 | char *cgit_query_page = NULL; |
55 | char *cgit_query_page = NULL; |
56 | char *cgit_query_head = NULL; |
56 | char *cgit_query_head = NULL; |
57 | char *cgit_query_search = NULL; |
57 | char *cgit_query_search = NULL; |
58 | char *cgit_query_grep = NULL; |
58 | char *cgit_query_grep = NULL; |
59 | char *cgit_query_sha1 = NULL; |
59 | char *cgit_query_sha1 = NULL; |
60 | char *cgit_query_sha2 = NULL; |
60 | char *cgit_query_sha2 = NULL; |
61 | char *cgit_query_path = NULL; |
61 | char *cgit_query_path = NULL; |
62 | char *cgit_query_name = NULL; |
62 | char *cgit_query_name = NULL; |
63 | int cgit_query_ofs = 0; |
63 | int cgit_query_ofs = 0; |
64 | |
64 | |
65 | int htmlfd = 0; |
65 | int htmlfd = 0; |
66 | |
66 | |
67 | |
67 | |
68 | int cgit_get_cmd_index(const char *cmd) |
68 | int cgit_get_cmd_index(const char *cmd) |
69 | { |
69 | { |
70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
70 | static char *cmds[] = {"log", "commit", "diff", "tree", "blob", |
71 | "snapshot", "tag", "refs", NULL}; |
71 | "snapshot", "tag", "refs", NULL}; |
72 | int i; |
72 | int i; |
73 | |
73 | |
74 | for(i = 0; cmds[i]; i++) |
74 | for(i = 0; cmds[i]; i++) |
75 | if (!strcmp(cmd, cmds[i])) |
75 | if (!strcmp(cmd, cmds[i])) |
76 | return i + 1; |
76 | return i + 1; |
77 | return 0; |
77 | return 0; |
78 | } |
78 | } |
79 | |
79 | |
80 | int chk_zero(int result, char *msg) |
80 | int chk_zero(int result, char *msg) |
81 | { |
81 | { |
82 | if (result != 0) |
82 | if (result != 0) |
83 | die("%s: %s", msg, strerror(errno)); |
83 | die("%s: %s", msg, strerror(errno)); |
84 | return result; |
84 | return result; |
85 | } |
85 | } |
86 | |
86 | |
87 | int chk_positive(int result, char *msg) |
87 | int chk_positive(int result, char *msg) |
88 | { |
88 | { |
89 | if (result <= 0) |
89 | if (result <= 0) |
90 | die("%s: %s", msg, strerror(errno)); |
90 | die("%s: %s", msg, strerror(errno)); |
91 | return result; |
91 | return result; |
92 | } |
92 | } |
93 | |
93 | |
94 | int chk_non_negative(int result, char *msg) |
94 | int chk_non_negative(int result, char *msg) |
95 | { |
95 | { |
96 | if (result < 0) |
96 | if (result < 0) |
97 | die("%s: %s",msg, strerror(errno)); |
97 | die("%s: %s",msg, strerror(errno)); |
98 | return result; |
98 | return result; |
99 | } |
99 | } |
100 | |
100 | |
101 | struct repoinfo *add_repo(const char *url) |
101 | struct repoinfo *add_repo(const char *url) |
102 | { |
102 | { |
103 | struct repoinfo *ret; |
103 | struct repoinfo *ret; |
104 | |
104 | |
105 | if (++cgit_repolist.count > cgit_repolist.length) { |
105 | if (++cgit_repolist.count > cgit_repolist.length) { |
106 | if (cgit_repolist.length == 0) |
106 | if (cgit_repolist.length == 0) |
107 | cgit_repolist.length = 8; |
107 | cgit_repolist.length = 8; |
108 | else |
108 | else |
109 | cgit_repolist.length *= 2; |
109 | cgit_repolist.length *= 2; |
110 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
110 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
111 | cgit_repolist.length * |
111 | cgit_repolist.length * |
112 | sizeof(struct repoinfo)); |
112 | sizeof(struct repoinfo)); |
113 | } |
113 | } |
114 | |
114 | |
115 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
115 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
116 | ret->url = trim_end(url, '/'); |
116 | ret->url = trim_end(url, '/'); |
117 | ret->name = ret->url; |
117 | ret->name = ret->url; |
118 | ret->path = NULL; |
118 | ret->path = NULL; |
119 | ret->desc = NULL; |
119 | ret->desc = "[no description]"; |
120 | ret->owner = NULL; |
120 | ret->owner = NULL; |
121 | ret->group = cgit_repo_group; |
121 | ret->group = cgit_repo_group; |
122 | ret->defbranch = "master"; |
122 | ret->defbranch = "master"; |
123 | ret->snapshots = cgit_snapshots; |
123 | ret->snapshots = cgit_snapshots; |
124 | ret->enable_log_filecount = cgit_enable_log_filecount; |
124 | ret->enable_log_filecount = cgit_enable_log_filecount; |
125 | ret->enable_log_linecount = cgit_enable_log_linecount; |
125 | ret->enable_log_linecount = cgit_enable_log_linecount; |
126 | ret->module_link = cgit_module_link; |
126 | ret->module_link = cgit_module_link; |
127 | ret->readme = NULL; |
127 | ret->readme = NULL; |
128 | return ret; |
128 | return ret; |
129 | } |
129 | } |
130 | |
130 | |
131 | struct repoinfo *cgit_get_repoinfo(const char *url) |
131 | struct repoinfo *cgit_get_repoinfo(const char *url) |
132 | { |
132 | { |
133 | int i; |
133 | int i; |
134 | struct repoinfo *repo; |
134 | struct repoinfo *repo; |
135 | |
135 | |
136 | for (i=0; i<cgit_repolist.count; i++) { |
136 | for (i=0; i<cgit_repolist.count; i++) { |
137 | repo = &cgit_repolist.repos[i]; |
137 | repo = &cgit_repolist.repos[i]; |
138 | if (!strcmp(repo->url, url)) |
138 | if (!strcmp(repo->url, url)) |
139 | return repo; |
139 | return repo; |
140 | } |
140 | } |
141 | return NULL; |
141 | return NULL; |
142 | } |
142 | } |
143 | |
143 | |
144 | void cgit_global_config_cb(const char *name, const char *value) |
144 | void cgit_global_config_cb(const char *name, const char *value) |
145 | { |
145 | { |
146 | if (!strcmp(name, "root-title")) |
146 | if (!strcmp(name, "root-title")) |
147 | cgit_root_title = xstrdup(value); |
147 | cgit_root_title = xstrdup(value); |
148 | else if (!strcmp(name, "css")) |
148 | else if (!strcmp(name, "css")) |
149 | cgit_css = xstrdup(value); |
149 | cgit_css = xstrdup(value); |
150 | else if (!strcmp(name, "logo")) |
150 | else if (!strcmp(name, "logo")) |
151 | cgit_logo = xstrdup(value); |
151 | cgit_logo = xstrdup(value); |
152 | else if (!strcmp(name, "index-header")) |
152 | else if (!strcmp(name, "index-header")) |
153 | cgit_index_header = xstrdup(value); |
153 | cgit_index_header = xstrdup(value); |
154 | else if (!strcmp(name, "index-info")) |
154 | else if (!strcmp(name, "index-info")) |
155 | cgit_index_info = xstrdup(value); |
155 | cgit_index_info = xstrdup(value); |
156 | else if (!strcmp(name, "logo-link")) |
156 | else if (!strcmp(name, "logo-link")) |
157 | cgit_logo_link = xstrdup(value); |
157 | cgit_logo_link = xstrdup(value); |
158 | else if (!strcmp(name, "module-link")) |
158 | else if (!strcmp(name, "module-link")) |
159 | cgit_module_link = xstrdup(value); |
159 | cgit_module_link = xstrdup(value); |
160 | else if (!strcmp(name, "virtual-root")) { |
160 | else if (!strcmp(name, "virtual-root")) { |
161 | cgit_virtual_root = trim_end(value, '/'); |
161 | cgit_virtual_root = trim_end(value, '/'); |
162 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
162 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
163 | cgit_virtual_root = ""; |
163 | cgit_virtual_root = ""; |
164 | } else if (!strcmp(name, "nocache")) |
164 | } else if (!strcmp(name, "nocache")) |
165 | cgit_nocache = atoi(value); |
165 | cgit_nocache = atoi(value); |
166 | else if (!strcmp(name, "snapshots")) |
166 | else if (!strcmp(name, "snapshots")) |
167 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
167 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
168 | else if (!strcmp(name, "enable-index-links")) |
168 | else if (!strcmp(name, "enable-index-links")) |
169 | cgit_enable_index_links = atoi(value); |
169 | cgit_enable_index_links = atoi(value); |
170 | else if (!strcmp(name, "enable-log-filecount")) |
170 | else if (!strcmp(name, "enable-log-filecount")) |
171 | cgit_enable_log_filecount = atoi(value); |
171 | cgit_enable_log_filecount = atoi(value); |
172 | else if (!strcmp(name, "enable-log-linecount")) |
172 | else if (!strcmp(name, "enable-log-linecount")) |
173 | cgit_enable_log_linecount = atoi(value); |
173 | cgit_enable_log_linecount = atoi(value); |
174 | else if (!strcmp(name, "cache-root")) |
174 | else if (!strcmp(name, "cache-root")) |
175 | cgit_cache_root = xstrdup(value); |
175 | cgit_cache_root = xstrdup(value); |
176 | else if (!strcmp(name, "cache-root-ttl")) |
176 | else if (!strcmp(name, "cache-root-ttl")) |
177 | cgit_cache_root_ttl = atoi(value); |
177 | cgit_cache_root_ttl = atoi(value); |
178 | else if (!strcmp(name, "cache-repo-ttl")) |
178 | else if (!strcmp(name, "cache-repo-ttl")) |
179 | cgit_cache_repo_ttl = atoi(value); |
179 | cgit_cache_repo_ttl = atoi(value); |
180 | else if (!strcmp(name, "cache-static-ttl")) |
180 | else if (!strcmp(name, "cache-static-ttl")) |
181 | cgit_cache_static_ttl = atoi(value); |
181 | cgit_cache_static_ttl = atoi(value); |
182 | else if (!strcmp(name, "cache-dynamic-ttl")) |
182 | else if (!strcmp(name, "cache-dynamic-ttl")) |
183 | cgit_cache_dynamic_ttl = atoi(value); |
183 | cgit_cache_dynamic_ttl = atoi(value); |
|