author | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-20 20:09:55 (UTC) |
commit | dc3ac3f76077c5d612d42e8beb4878e43acfc58a (patch) (unidiff) | |
tree | dfb996c0ce9833841578e1f0accbb5a387c01237 /parsing.c | |
parent | 977a0b173df6fe1a4d362fe4c70f9badff1fd46c (diff) | |
parent | 3de63b264c36888dfd42dfdf3fc0aad4ce0c2b5c (diff) | |
download | cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.zip cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.gz cgit-dc3ac3f76077c5d612d42e8beb4878e43acfc58a.tar.bz2 |
Merge branch 'virtual-url'
* virtual-url:
Don't be fooled by trailing '/' in url-parameter
cache_safe_filename() needs more buffers
Enable url=value querystring parameter
Add lookup-function for valid repo commands
Move cgit_get_repoinfo into shared.c
-rw-r--r-- | parsing.c | 44 |
1 files changed, 44 insertions, 0 deletions
@@ -123,24 +123,68 @@ int cgit_parse_query(char *txt, configfn fn) | |||
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 | if (p[1]) | ||
171 | cgit_query_path = xstrdup(p + 1); | ||
172 | } | ||
173 | cgit_cmd = cgit_get_cmd_index(cmd + 1); | ||
174 | cgit_query_page = xstrdup(cmd + 1); | ||
175 | return; | ||
176 | } | ||
177 | } | ||
178 | |||
135 | char *substr(const char *head, const char *tail) | 179 | char *substr(const char *head, const char *tail) |
136 | { | 180 | { |
137 | char *buf; | 181 | char *buf; |
138 | 182 | ||
139 | buf = xmalloc(tail - head + 1); | 183 | buf = xmalloc(tail - head + 1); |
140 | strncpy(buf, head, tail - head); | 184 | strncpy(buf, head, tail - head); |
141 | buf[tail - head] = '\0'; | 185 | buf[tail - head] = '\0'; |
142 | return buf; | 186 | return buf; |
143 | } | 187 | } |
144 | 188 | ||
145 | struct commitinfo *cgit_parse_commit(struct commit *commit) | 189 | struct commitinfo *cgit_parse_commit(struct commit *commit) |
146 | { | 190 | { |