1 files changed, 2 insertions, 2 deletions
diff --git a/parsing.c b/parsing.c
index 027f06b..8dce488 100644
--- a/parsing.c
+++ b/parsing.c
@@ -109,130 +109,130 @@ int cgit_parse_query(char *txt, configfn fn)
        if (!txt)
                return 0;
        t = txt = xstrdup(txt);
        while((c=*t) != '\0') {
                if (c=='=') {
                        *t = '\0';
                        value = t+1;
                } else if (c=='+') {
                        *t = ' ';
                } else if (c=='%') {
                        t = convert_query_hexchar(t);
                } else if (c=='&') {
                        *t = '\0';
                        (*fn)(txt, value);
                        txt = t+1;
                        value = NULL;
                }
                t++;
        }
        if (t!=txt)
                (*fn)(txt, value);
        return 0;
 }
 /*
 * url syntax: [repo ['/' cmd [ '/' path]]]
 *   repo: any valid repo url, may contain '/'
 *   cmd:  log | commit | diff | tree | view | blob | snapshot
 *   path: any valid path, may contain '/'
 *
 */
 void cgit_parse_url(const char *url)
 {
        char *cmd, *p;
        ctx.repo = NULL;
        if (!url || url[0] == '\0')
                return;
        ctx.repo = cgit_get_repoinfo(url);
        if (ctx.repo) {
                ctx.qry.repo = ctx.repo->url;
                return;
        }
        cmd = strchr(url, '/');
        while (!ctx.repo && cmd) {
                cmd[0] = '\0';
                ctx.repo = cgit_get_repoinfo(url);
                if (ctx.repo == NULL) {
                        cmd[0] = '/';
                        cmd = strchr(cmd + 1, '/');
                        continue;
                }
                ctx.qry.repo = ctx.repo->url;
                p = strchr(cmd + 1, '/');
                if (p) {
                        p[0] = '\0';
                        if (p[1])
                                ctx.qry.path = trim_end(p + 1, '/');
                }
-                cgit_cmd = cgit_get_cmd_index(cmd + 1);
+                if (cmd[1])
-                ctx.qry.page = xstrdup(cmd + 1);
+                        ctx.qry.page = xstrdup(cmd + 1);
                return;
        }
 }
 char *substr(const char *head, const char *tail)
 {
        char *buf;
        buf = xmalloc(tail - head + 1);
        strncpy(buf, head, tail - head);
        buf[tail - head] = '\0';
        return buf;
 }
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
        struct commitinfo *ret;
        char *p = commit->buffer, *t = commit->buffer;
        ret = xmalloc(sizeof(*ret));
        ret->commit = commit;
        ret->author = NULL;
        ret->author_email = NULL;
        ret->committer = NULL;
        ret->committer_email = NULL;
        ret->subject = NULL;
        ret->msg = NULL;
        ret->msg_encoding = NULL;
        if (p == NULL)
                return ret;
        if (strncmp(p, "tree ", 5))
                die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
        else
                p += 46; // "tree " + hex[40] + "\n"
        while (!strncmp(p, "parent ", 7))
                p += 48; // "parent " + hex[40] + "\n"
        if (!strncmp(p, "author ", 7)) {
                p += 7;
                t = strchr(p, '<') - 1;
                ret->author = substr(p, t);
                p = t;
                t = strchr(t, '>') + 1;
                ret->author_email = substr(p, t);
                ret->author_date = atol(t+1);
                p = strchr(t, '\n') + 1;
        }
        if (!strncmp(p, "committer ", 9)) {
                p += 9;
                t = strchr(p, '<') - 1;
                ret->committer = substr(p, t);
                p = t;
                t = strchr(t, '>') + 1;
                ret->committer_email = substr(p, t);
                ret->committer_date = atol(t+1);
                p = strchr(t, '\n') + 1;
        }
        if (!strncmp(p, "encoding ", 9)) {
                p += 9;

diff --git a/parsing.c b/parsing.c index 027f06b..8dce488 100644 --- a/parsing.c +++ b/parsing.c
@@ -109,130 +109,130 @@ int cgit_parse_query(char *txt, configfn fn)
109	if (!txt)	109	if (!txt)
110	return 0;	110	return 0;
111		111
112	t = txt = xstrdup(txt);	112	t = txt = xstrdup(txt);
113		113
114	while((c=*t) != '\0') {	114	while((c=*t) != '\0') {
115	if (c=='=') {	115	if (c=='=') {
116	*t = '\0';	116	*t = '\0';
117	value = t+1;	117	value = t+1;
118	} else if (c=='+') {	118	} else if (c=='+') {
119	*t = ' ';	119	*t = ' ';
120	} else if (c=='%') {	120	} else if (c=='%') {
121	t = convert_query_hexchar(t);	121	t = convert_query_hexchar(t);
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	*/
142	void cgit_parse_url(const char *url)	142	void cgit_parse_url(const char *url)
143	{	143	{
144	char cmd, p;	144	char cmd, p;
145		145
146	ctx.repo = NULL;	146	ctx.repo = NULL;
147	if (!url \|\| url[0] == '\0')	147	if (!url \|\| url[0] == '\0')
148	return;	148	return;
149		149
150	ctx.repo = cgit_get_repoinfo(url);	150	ctx.repo = cgit_get_repoinfo(url);
151	if (ctx.repo) {	151	if (ctx.repo) {
152	ctx.qry.repo = ctx.repo->url;	152	ctx.qry.repo = ctx.repo->url;
153	return;	153	return;
154	}	154	}
155		155
156	cmd = strchr(url, '/');	156	cmd = strchr(url, '/');
157	while (!ctx.repo && cmd) {	157	while (!ctx.repo && cmd) {
158	cmd[0] = '\0';	158	cmd[0] = '\0';
159	ctx.repo = cgit_get_repoinfo(url);	159	ctx.repo = cgit_get_repoinfo(url);
160	if (ctx.repo == NULL) {	160	if (ctx.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	ctx.qry.repo = ctx.repo->url;	166	ctx.qry.repo = ctx.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	if (p[1])	170	if (p[1])
171	ctx.qry.path = trim_end(p + 1, '/');	171	ctx.qry.path = trim_end(p + 1, '/');
172	}	172	}
173	cgit_cmd = cgit_get_cmd_index(cmd + 1);	173	if (cmd[1])
174	ctx.qry.page = xstrdup(cmd + 1);	174	ctx.qry.page = xstrdup(cmd + 1);
175	return;	175	return;
176	}	176	}
177	}	177	}
178		178
179	char substr(const char head, const char *tail)	179	char substr(const char head, const char *tail)
180	{	180	{
181	char *buf;	181	char *buf;
182		182
183	buf = xmalloc(tail - head + 1);	183	buf = xmalloc(tail - head + 1);
184	strncpy(buf, head, tail - head);	184	strncpy(buf, head, tail - head);
185	buf[tail - head] = '\0';	185	buf[tail - head] = '\0';
186	return buf;	186	return buf;
187	}	187	}
188		188
189	struct commitinfo cgit_parse_commit(struct commit commit)	189	struct commitinfo cgit_parse_commit(struct commit commit)
190	{	190	{
191	struct commitinfo *ret;	191	struct commitinfo *ret;
192	char p = commit->buffer, t = commit->buffer;	192	char p = commit->buffer, t = commit->buffer;
193		193
194	ret = xmalloc(sizeof(*ret));	194	ret = xmalloc(sizeof(*ret));
195	ret->commit = commit;	195	ret->commit = commit;
196	ret->author = NULL;	196	ret->author = NULL;
197	ret->author_email = NULL;	197	ret->author_email = NULL;
198	ret->committer = NULL;	198	ret->committer = NULL;
199	ret->committer_email = NULL;	199	ret->committer_email = NULL;
200	ret->subject = NULL;	200	ret->subject = NULL;
201	ret->msg = NULL;	201	ret->msg = NULL;
202	ret->msg_encoding = NULL;	202	ret->msg_encoding = NULL;
203		203
204	if (p == NULL)	204	if (p == NULL)
205	return ret;	205	return ret;
206		206
207	if (strncmp(p, "tree ", 5))	207	if (strncmp(p, "tree ", 5))
208	die("Bad commit: %s", sha1_to_hex(commit->object.sha1));	208	die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
209	else	209	else
210	p += 46; // "tree " + hex[40] + "\n"	210	p += 46; // "tree " + hex[40] + "\n"
211		211
212	while (!strncmp(p, "parent ", 7))	212	while (!strncmp(p, "parent ", 7))
213	p += 48; // "parent " + hex[40] + "\n"	213	p += 48; // "parent " + hex[40] + "\n"
214		214
215	if (!strncmp(p, "author ", 7)) {	215	if (!strncmp(p, "author ", 7)) {
216	p += 7;	216	p += 7;
217	t = strchr(p, '<') - 1;	217	t = strchr(p, '<') - 1;
218	ret->author = substr(p, t);	218	ret->author = substr(p, t);
219	p = t;	219	p = t;
220	t = strchr(t, '>') + 1;	220	t = strchr(t, '>') + 1;
221	ret->author_email = substr(p, t);	221	ret->author_email = substr(p, t);
222	ret->author_date = atol(t+1);	222	ret->author_date = atol(t+1);
223	p = strchr(t, '\n') + 1;	223	p = strchr(t, '\n') + 1;
224	}	224	}
225		225
226	if (!strncmp(p, "committer ", 9)) {	226	if (!strncmp(p, "committer ", 9)) {
227	p += 9;	227	p += 9;
228	t = strchr(p, '<') - 1;	228	t = strchr(p, '<') - 1;
229	ret->committer = substr(p, t);	229	ret->committer = substr(p, t);
230	p = t;	230	p = t;
231	t = strchr(t, '>') + 1;	231	t = strchr(t, '>') + 1;
232	ret->committer_email = substr(p, t);	232	ret->committer_email = substr(p, t);
233	ret->committer_date = atol(t+1);	233	ret->committer_date = atol(t+1);
234	p = strchr(t, '\n') + 1;	234	p = strchr(t, '\n') + 1;
235	}	235	}
236		236
237	if (!strncmp(p, "encoding ", 9)) {	237	if (!strncmp(p, "encoding ", 9)) {
238	p += 9;	238	p += 9;