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
@@ -122,97 +122,98 @@ int cgit_parse_query(char *txt, configfn fn)
122 } else if (c=='&') { 122 } else if (c=='&') {
123 *t = '\0'; 123 *t = '\0';
124 (*fn)(txt, value); 124 (*fn)(txt, value);
125 txt = t+1; 125 txt = t+1;
126 value = NULL; 126 value = NULL;
127 } 127 }
128 t++; 128 t++;
129 } 129 }
130 if (t!=txt) 130 if (t!=txt)
131 (*fn)(txt, value); 131 (*fn)(txt, value);
132 return 0; 132 return 0;
133} 133}
134 134
135/* 135/*
136 * url syntax: [repo ['/' cmd [ '/' path]]] 136 * url syntax: [repo ['/' cmd [ '/' path]]]
137 * repo: any valid repo url, may contain '/' 137 * repo: any valid repo url, may contain '/'
138 * cmd: log | commit | diff | tree | view | blob | snapshot 138 * cmd: log | commit | diff | tree | view | blob | snapshot
139 * path: any valid path, may contain '/' 139 * path: any valid path, may contain '/'
140 * 140 *
141 */ 141 */
142void cgit_parse_url(const char *url) 142void cgit_parse_url(const char *url)
143{ 143{
144 char *cmd, *p; 144 char *cmd, *p;
145 145
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;
195 ret->author = NULL; 196 ret->author = NULL;
196 ret->author_email = NULL; 197 ret->author_email = NULL;
197 ret->committer = NULL; 198 ret->committer = NULL;
198 ret->committer_email = NULL; 199 ret->committer_email = NULL;
199 ret->subject = NULL; 200 ret->subject = NULL;
200 ret->msg = NULL; 201 ret->msg = NULL;
201 202
202 if (strncmp(p, "tree ", 5)) 203 if (strncmp(p, "tree ", 5))
203 die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); 204 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
204 else 205 else
205 p += 46; // "tree " + hex[40] + "\n" 206 p += 46; // "tree " + hex[40] + "\n"
206 207
207 while (!strncmp(p, "parent ", 7)) 208 while (!strncmp(p, "parent ", 7))
208 p += 48; // "parent " + hex[40] + "\n" 209 p += 48; // "parent " + hex[40] + "\n"
209 210
210 if (!strncmp(p, "author ", 7)) { 211 if (!strncmp(p, "author ", 7)) {
211 p += 7; 212 p += 7;
212 t = strchr(p, '<') - 1; 213 t = strchr(p, '<') - 1;
213 ret->author = substr(p, t); 214 ret->author = substr(p, t);
214 p = t; 215 p = t;
215 t = strchr(t, '>') + 1; 216 t = strchr(t, '>') + 1;
216 ret->author_email = substr(p, t); 217 ret->author_email = substr(p, t);
217 ret->author_date = atol(++t); 218 ret->author_date = atol(++t);
218 p = strchr(t, '\n') + 1; 219 p = strchr(t, '\n') + 1;