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
@@ -160,4 +160,5 @@ extern int chk_positive(int result, char *msg);
 
 extern int hextoint(char c);
+extern char *trim_end(const char *str, char c);
 
 extern void *cgit_free_commitinfo(struct commitinfo *info);
diff --git a/parsing.c b/parsing.c
index 74a2484..2c05c09 100644
--- a/parsing.c
+++ b/parsing.c
@@ -169,5 +169,5 @@ void cgit_parse_url(const char *url)
                         p[0] = '\0';
                         if (p[1])
-                                cgit_query_path = xstrdup(p + 1);
+                                cgit_query_path = trim_end(p + 1, '/');
                 }
                 cgit_cmd = cgit_get_cmd_index(cmd + 1);
diff --git a/shared.c b/shared.c
index ab00bc9..45db735 100644
--- a/shared.c
+++ b/shared.c
@@ -229,5 +229,5 @@ void cgit_querystring_cb(const char *name, const char *value)
                 cgit_query_ofs = atoi(value);
         } else if (!strcmp(name, "path")) {
-                cgit_query_path = xstrdup(value);
+                cgit_query_path = trim_end(value, '/');
         } else if (!strcmp(name, "name")) {
                 cgit_query_name = xstrdup(value);
@@ -258,4 +258,26 @@ int hextoint(char c)
 }
 
+char *trim_end(const char *str, char c)
+{
+        int len;
+        char *s, *t;
+
+        if (str == NULL)
+                return NULL;
+        t = (char *)str;
+        len = strlen(t);
+        while(len > 0 && t[len - 1] == c)
+                len--;
+
+        if (len == 0)
+                return NULL;
+
+        c = t[len];
+        t[len] = '\0';
+        s = xstrdup(t);
+        t[len] = c;
+        return s;
+}
+
 void cgit_diff_tree_cb(struct diff_queue_struct *q,
                        struct diff_options *options, void *data)