about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2007-06-26 18:04:31 +0200
committerLars Hjemli2007-06-26 18:04:39 +0200
commit382805ee83b6e6f165159312a9fe20e3971897b6 (patch)
tree8bcf24b888ba95c91a575640be9ae87e949a99ea
parentDo not include current path in the "tree" menu link (diff)
downloadcgit-382805ee83b6e6f165159312a9fe20e3971897b6.tar.gz
cgit-382805ee83b6e6f165159312a9fe20e3971897b6.zip
Add trim_end() and use it to remove trailing slashes from repo paths
The new function removes all trailing instances of an arbitrary character
from a copy of the supplied char array. This is then used to remove any
trailing slashes from cgit_query_path.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.h1
-rw-r--r--parsing.c2
-rw-r--r--shared.c24
3 files changed, 25 insertions, 2 deletions
diff --git a/cgit.h b/cgit.h index 81c819d..ddb2fff 100644 --- a/cgit.h +++ b/cgit.h
@@ -159,6 +159,7 @@ extern int chk_zero(int result, char *msg);
159extern int chk_positive(int result, char *msg); 159extern int chk_positive(int result, char *msg);
160 160
161extern int hextoint(char c); 161extern int hextoint(char c);
162extern char *trim_end(const char *str, char c);
162 163
163extern void *cgit_free_commitinfo(struct commitinfo *info); 164extern void *cgit_free_commitinfo(struct commitinfo *info);
164 165
diff --git a/parsing.c b/parsing.c index 74a2484..2c05c09 100644 --- a/parsing.c +++ b/parsing.c
@@ -168,7 +168,7 @@ void cgit_parse_url(const char *url)
168 if (p) { 168 if (p) {
169 p[0] = '\0'; 169 p[0] = '\0';
170 if (p[1]) 170 if (p[1])
171 cgit_query_path = xstrdup(p + 1); 171 cgit_query_path = trim_end(p + 1, '/');
172 } 172 }
173 cgit_cmd = cgit_get_cmd_index(cmd + 1); 173 cgit_cmd = cgit_get_cmd_index(cmd + 1);
174 cgit_query_page = xstrdup(cmd + 1); 174 cgit_query_page = xstrdup(cmd + 1);
diff --git a/shared.c b/shared.c index ab00bc9..45db735 100644 --- a/shared.c +++ b/shared.c
@@ -228,7 +228,7 @@ void cgit_querystring_cb(const char *name, const char *value)
228 } else if (!strcmp(name, "ofs")) { 228 } else if (!strcmp(name, "ofs")) {
229 cgit_query_ofs = atoi(value); 229 cgit_query_ofs = atoi(value);
230 } else if (!strcmp(name, "path")) { 230 } else if (!strcmp(name, "path")) {
231 cgit_query_path = xstrdup(value); 231 cgit_query_path = trim_end(value, '/');
232 } else if (!strcmp(name, "name")) { 232 } else if (!strcmp(name, "name")) {
233 cgit_query_name = xstrdup(value); 233 cgit_query_name = xstrdup(value);
234 } 234 }
@@ -257,6 +257,28 @@ int hextoint(char c)
257 return -1; 257 return -1;
258} 258}
259 259
260char *trim_end(const char *str, char c)
261{
262 int len;
263 char *s, *t;
264
265 if (str == NULL)
266 return NULL;
267 t = (char *)str;
268 len = strlen(t);
269 while(len > 0 && t[len - 1] == c)
270 len--;
271
272 if (len == 0)
273 return NULL;
274
275 c = t[len];
276 t[len] = '\0';
277 s = xstrdup(t);
278 t[len] = c;
279 return s;
280}
281
260void cgit_diff_tree_cb(struct diff_queue_struct *q, 282void cgit_diff_tree_cb(struct diff_queue_struct *q,
261 struct diff_options *options, void *data) 283 struct diff_options *options, void *data)
262{ 284{