|
diff --git a/parsing.c b/parsing.c index 36b0f0c..a028625 100644 --- a/ parsing.c+++ b/ parsing.c |
|
@@ -111,48 +111,91 @@ int cgit_parse_query(char *txt, configfn fn) |
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 | /* |
| |
136 | * url syntax: [repo ['/' cmd [ '/' path]]] |
| |
137 | * repo: any valid repo url, may contain '/' |
| |
138 | * cmd: log | commit | diff | tree | view | blob | snapshot |
| |
139 | * path: any valid path, may contain '/' |
| |
140 | * |
| |
141 | */ |
| |
142 | void cgit_parse_url(const char *url) |
| |
143 | { |
| |
144 | char *cmd, *p; |
| |
145 | |
| |
146 | cgit_repo = NULL; |
| |
147 | if (!url || url[0] == '\0') |
| |
148 | return; |
| |
149 | |
| |
150 | cgit_repo = cgit_get_repoinfo(url); |
| |
151 | if (cgit_repo) { |
| |
152 | cgit_query_repo = cgit_repo->url; |
| |
153 | return; |
| |
154 | } |
| |
155 | |
| |
156 | cmd = strchr(url, '/'); |
| |
157 | while (!cgit_repo && cmd) { |
| |
158 | cmd[0] = '\0'; |
| |
159 | cgit_repo = cgit_get_repoinfo(url); |
| |
160 | if (cgit_repo == NULL) { |
| |
161 | cmd[0] = '/'; |
| |
162 | cmd = strchr(cmd + 1, '/'); |
| |
163 | continue; |
| |
164 | } |
| |
165 | |
| |
166 | cgit_query_repo = cgit_repo->url; |
| |
167 | p = strchr(cmd + 1, '/'); |
| |
168 | if (p) { |
| |
169 | p[0] = '\0'; |
| |
170 | cgit_query_path = xstrdup(p + 1); |
| |
171 | } |
| |
172 | cgit_cmd = cgit_get_cmd_index(cmd + 1); |
| |
173 | cgit_query_page = xstrdup(cmd + 1); |
| |
174 | return; |
| |
175 | } |
| |
176 | } |
| |
177 | |
135 | char *substr(const char *head, const char *tail) |
178 | char *substr(const char *head, const char *tail) |
136 | { |
179 | { |
137 | char *buf; |
180 | char *buf; |
138 | |
181 | |
139 | buf = xmalloc(tail - head + 1); |
182 | buf = xmalloc(tail - head + 1); |
140 | strncpy(buf, head, tail - head); |
183 | strncpy(buf, head, tail - head); |
141 | buf[tail - head] = '\0'; |
184 | buf[tail - head] = '\0'; |
142 | return buf; |
185 | return buf; |
143 | } |
186 | } |
144 | |
187 | |
145 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
188 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
146 | { |
189 | { |
147 | struct commitinfo *ret; |
190 | struct commitinfo *ret; |
148 | char *p = commit->buffer, *t = commit->buffer; |
191 | char *p = commit->buffer, *t = commit->buffer; |
149 | |
192 | |
150 | ret = xmalloc(sizeof(*ret)); |
193 | ret = xmalloc(sizeof(*ret)); |
151 | ret->commit = commit; |
194 | ret->commit = commit; |
152 | ret->author = NULL; |
195 | ret->author = NULL; |
153 | ret->author_email = NULL; |
196 | ret->author_email = NULL; |
154 | ret->committer = NULL; |
197 | ret->committer = NULL; |
155 | ret->committer_email = NULL; |
198 | ret->committer_email = NULL; |
156 | ret->subject = NULL; |
199 | ret->subject = NULL; |
157 | ret->msg = NULL; |
200 | ret->msg = NULL; |
158 | |
201 | |
|