|
diff --git a/shared.c b/shared.c index 9c992c8..bf0581f 100644 --- a/ shared.c+++ b/ shared.c |
|
@@ -73,97 +73,97 @@ int cgit_get_cmd_index(const char *cmd) |
73 | "snapshot", "tag", "refs", "patch", NULL}; |
73 | "snapshot", "tag", "refs", "patch", NULL}; |
74 | int i; |
74 | int i; |
75 | |
75 | |
76 | for(i = 0; cmds[i]; i++) |
76 | for(i = 0; cmds[i]; i++) |
77 | if (!strcmp(cmd, cmds[i])) |
77 | if (!strcmp(cmd, cmds[i])) |
78 | return i + 1; |
78 | return i + 1; |
79 | return 0; |
79 | return 0; |
80 | } |
80 | } |
81 | |
81 | |
82 | int chk_zero(int result, char *msg) |
82 | int chk_zero(int result, char *msg) |
83 | { |
83 | { |
84 | if (result != 0) |
84 | if (result != 0) |
85 | die("%s: %s", msg, strerror(errno)); |
85 | die("%s: %s", msg, strerror(errno)); |
86 | return result; |
86 | return result; |
87 | } |
87 | } |
88 | |
88 | |
89 | int chk_positive(int result, char *msg) |
89 | int chk_positive(int result, char *msg) |
90 | { |
90 | { |
91 | if (result <= 0) |
91 | if (result <= 0) |
92 | die("%s: %s", msg, strerror(errno)); |
92 | die("%s: %s", msg, strerror(errno)); |
93 | return result; |
93 | return result; |
94 | } |
94 | } |
95 | |
95 | |
96 | int chk_non_negative(int result, char *msg) |
96 | int chk_non_negative(int result, char *msg) |
97 | { |
97 | { |
98 | if (result < 0) |
98 | if (result < 0) |
99 | die("%s: %s",msg, strerror(errno)); |
99 | die("%s: %s",msg, strerror(errno)); |
100 | return result; |
100 | return result; |
101 | } |
101 | } |
102 | |
102 | |
103 | struct repoinfo *add_repo(const char *url) |
103 | struct repoinfo *add_repo(const char *url) |
104 | { |
104 | { |
105 | struct repoinfo *ret; |
105 | struct repoinfo *ret; |
106 | |
106 | |
107 | if (++cgit_repolist.count > cgit_repolist.length) { |
107 | if (++cgit_repolist.count > cgit_repolist.length) { |
108 | if (cgit_repolist.length == 0) |
108 | if (cgit_repolist.length == 0) |
109 | cgit_repolist.length = 8; |
109 | cgit_repolist.length = 8; |
110 | else |
110 | else |
111 | cgit_repolist.length *= 2; |
111 | cgit_repolist.length *= 2; |
112 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
112 | cgit_repolist.repos = xrealloc(cgit_repolist.repos, |
113 | cgit_repolist.length * |
113 | cgit_repolist.length * |
114 | sizeof(struct repoinfo)); |
114 | sizeof(struct repoinfo)); |
115 | } |
115 | } |
116 | |
116 | |
117 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
117 | ret = &cgit_repolist.repos[cgit_repolist.count-1]; |
118 | ret->url = trim_end(url, '/'); |
118 | ret->url = trim_end(url, '/'); |
119 | ret->name = ret->url; |
119 | ret->name = ret->url; |
120 | ret->path = NULL; |
120 | ret->path = NULL; |
121 | ret->desc = NULL; |
121 | ret->desc = "[no description]"; |
122 | ret->owner = NULL; |
122 | ret->owner = NULL; |
123 | ret->group = cgit_repo_group; |
123 | ret->group = cgit_repo_group; |
124 | ret->defbranch = "master"; |
124 | ret->defbranch = "master"; |
125 | ret->snapshots = cgit_snapshots; |
125 | ret->snapshots = cgit_snapshots; |
126 | ret->enable_log_filecount = cgit_enable_log_filecount; |
126 | ret->enable_log_filecount = cgit_enable_log_filecount; |
127 | ret->enable_log_linecount = cgit_enable_log_linecount; |
127 | ret->enable_log_linecount = cgit_enable_log_linecount; |
128 | ret->module_link = cgit_module_link; |
128 | ret->module_link = cgit_module_link; |
129 | ret->readme = NULL; |
129 | ret->readme = NULL; |
130 | return ret; |
130 | return ret; |
131 | } |
131 | } |
132 | |
132 | |
133 | struct repoinfo *cgit_get_repoinfo(const char *url) |
133 | struct repoinfo *cgit_get_repoinfo(const char *url) |
134 | { |
134 | { |
135 | int i; |
135 | int i; |
136 | struct repoinfo *repo; |
136 | struct repoinfo *repo; |
137 | |
137 | |
138 | for (i=0; i<cgit_repolist.count; i++) { |
138 | for (i=0; i<cgit_repolist.count; i++) { |
139 | repo = &cgit_repolist.repos[i]; |
139 | repo = &cgit_repolist.repos[i]; |
140 | if (!strcmp(repo->url, url)) |
140 | if (!strcmp(repo->url, url)) |
141 | return repo; |
141 | return repo; |
142 | } |
142 | } |
143 | return NULL; |
143 | return NULL; |
144 | } |
144 | } |
145 | |
145 | |
146 | void cgit_global_config_cb(const char *name, const char *value) |
146 | void cgit_global_config_cb(const char *name, const char *value) |
147 | { |
147 | { |
148 | if (!strcmp(name, "root-title")) |
148 | if (!strcmp(name, "root-title")) |
149 | cgit_root_title = xstrdup(value); |
149 | cgit_root_title = xstrdup(value); |
150 | else if (!strcmp(name, "css")) |
150 | else if (!strcmp(name, "css")) |
151 | cgit_css = xstrdup(value); |
151 | cgit_css = xstrdup(value); |
152 | else if (!strcmp(name, "logo")) |
152 | else if (!strcmp(name, "logo")) |
153 | cgit_logo = xstrdup(value); |
153 | cgit_logo = xstrdup(value); |
154 | else if (!strcmp(name, "index-header")) |
154 | else if (!strcmp(name, "index-header")) |
155 | cgit_index_header = xstrdup(value); |
155 | cgit_index_header = xstrdup(value); |
156 | else if (!strcmp(name, "index-info")) |
156 | else if (!strcmp(name, "index-info")) |
157 | cgit_index_info = xstrdup(value); |
157 | cgit_index_info = xstrdup(value); |
158 | else if (!strcmp(name, "logo-link")) |
158 | else if (!strcmp(name, "logo-link")) |
159 | cgit_logo_link = xstrdup(value); |
159 | cgit_logo_link = xstrdup(value); |
160 | else if (!strcmp(name, "module-link")) |
160 | else if (!strcmp(name, "module-link")) |
161 | cgit_module_link = xstrdup(value); |
161 | cgit_module_link = xstrdup(value); |
162 | else if (!strcmp(name, "virtual-root")) { |
162 | else if (!strcmp(name, "virtual-root")) { |
163 | cgit_virtual_root = trim_end(value, '/'); |
163 | cgit_virtual_root = trim_end(value, '/'); |
164 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
164 | if (!cgit_virtual_root && (!strcmp(value, "/"))) |
165 | cgit_virtual_root = ""; |
165 | cgit_virtual_root = ""; |
166 | } else if (!strcmp(name, "nocache")) |
166 | } else if (!strcmp(name, "nocache")) |
167 | cgit_nocache = atoi(value); |
167 | cgit_nocache = atoi(value); |
168 | else if (!strcmp(name, "snapshots")) |
168 | else if (!strcmp(name, "snapshots")) |
169 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
169 | cgit_snapshots = cgit_parse_snapshots_mask(value); |
|