summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/parsing.c b/parsing.c
index a028625..4420e58 100644
--- a/parsing.c
+++ b/parsing.c
@@ -146,49 +146,50 @@ void cgit_parse_url(const char *url)
146 cgit_repo = NULL; 146 cgit_repo = NULL;
147 if (!url || url[0] == '\0') 147 if (!url || url[0] == '\0')
148 return; 148 return;
149 149
150 cgit_repo = cgit_get_repoinfo(url); 150 cgit_repo = cgit_get_repoinfo(url);
151 if (cgit_repo) { 151 if (cgit_repo) {
152 cgit_query_repo = cgit_repo->url; 152 cgit_query_repo = cgit_repo->url;
153 return; 153 return;
154 } 154 }
155 155
156 cmd = strchr(url, '/'); 156 cmd = strchr(url, '/');
157 while (!cgit_repo && cmd) { 157 while (!cgit_repo && cmd) {
158 cmd[0] = '\0'; 158 cmd[0] = '\0';
159 cgit_repo = cgit_get_repoinfo(url); 159 cgit_repo = cgit_get_repoinfo(url);
160 if (cgit_repo == NULL) { 160 if (cgit_repo == NULL) {
161 cmd[0] = '/'; 161 cmd[0] = '/';
162 cmd = strchr(cmd + 1, '/'); 162 cmd = strchr(cmd + 1, '/');
163 continue; 163 continue;
164 } 164 }
165 165
166 cgit_query_repo = cgit_repo->url; 166 cgit_query_repo = cgit_repo->url;
167 p = strchr(cmd + 1, '/'); 167 p = strchr(cmd + 1, '/');
168 if (p) { 168 if (p) {
169 p[0] = '\0'; 169 p[0] = '\0';
170 cgit_query_path = xstrdup(p + 1); 170 if (p[1])
171 cgit_query_path = xstrdup(p + 1);
171 } 172 }
172 cgit_cmd = cgit_get_cmd_index(cmd + 1); 173 cgit_cmd = cgit_get_cmd_index(cmd + 1);
173 cgit_query_page = xstrdup(cmd + 1); 174 cgit_query_page = xstrdup(cmd + 1);
174 return; 175 return;
175 } 176 }
176} 177}
177 178
178char *substr(const char *head, const char *tail) 179char *substr(const char *head, const char *tail)
179{ 180{
180 char *buf; 181 char *buf;
181 182
182 buf = xmalloc(tail - head + 1); 183 buf = xmalloc(tail - head + 1);
183 strncpy(buf, head, tail - head); 184 strncpy(buf, head, tail - head);
184 buf[tail - head] = '\0'; 185 buf[tail - head] = '\0';
185 return buf; 186 return buf;
186} 187}
187 188
188struct commitinfo *cgit_parse_commit(struct commit *commit) 189struct commitinfo *cgit_parse_commit(struct commit *commit)
189{ 190{
190 struct commitinfo *ret; 191 struct commitinfo *ret;
191 char *p = commit->buffer, *t = commit->buffer; 192 char *p = commit->buffer, *t = commit->buffer;
192 193
193 ret = xmalloc(sizeof(*ret)); 194 ret = xmalloc(sizeof(*ret));
194 ret->commit = commit; 195 ret->commit = commit;