introduce cgit_repobasename

 that shortens reponame stripping any directories and .git suffixes, that is
 turning 'dir/repo.git/' or 'dir/repo/.git/' or alikes into mere 'repo'.

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 26 insertions, 0 deletions

diff --git a/cgit.h b/cgit.h
index aabf725..1dbf901 100644
--- a/cgit.h
+++ b/cgit.h
@@ -185,48 +185,50 @@ extern void html_hidden(char *name, char *value);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
 extern int html_include(const char *filename);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
                           const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
                           const char *query);
 
+extern const char *cgit_repobasename(const char *reponame);
+
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
                            char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
                           char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
                              char *rev);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
                            char *new_rev, char *old_rev, char *path);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
                                       const char *filename,
                                       struct cacheitem *item);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
diff --git a/ui-shared.c b/ui-shared.c
index 1c1415e..3e378a4 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -60,48 +60,72 @@ char *cgit_repourl(const char *reponame)
 char *cgit_fileurl(const char *reponame, const char *pagename,
                    const char *filename, const char *query)
 {
         if (cgit_virtual_root) {
                 if (query)
                         return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
                                    pagename, filename?filename:"", query);
                 else
                         return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
                                    pagename);
         } else {
                 if (query)
                         return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
                 else
                         return fmt("?r=%s&p=%s", reponame, pagename);
         }
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
                    const char *query)
 {
         return cgit_fileurl(reponame,pagename,0,query);
 }
 
+const char *cgit_repobasename(const char *reponame)
+{
+        /* I assume we don't need to store more than one repo basename */
+        static char rvbuf[1024];
+        int p;
+        const char *rv;
+        strncpy(rvbuf,reponame,sizeof(rvbuf));
+        if(rvbuf[sizeof(rvbuf)-1])
+                die("cgit_repobasename: truncated repository name '%s'", reponame);
+        p = strlen(rvbuf)-1;
+        /* strip trailing slashes */
+        while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+        /* strip trailing .git */
+        if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+                p -= 3; rvbuf[p--] = 0;
+        }
+        /* strip more trailing slashes if any */
+        while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+        /* find last slash in the remaining string */
+        rv = strrchr(rvbuf,'/');
+        if(rv)
+                return ++rv;
+        return rvbuf;
+}
 
 char *cgit_currurl()
 {
         if (!cgit_virtual_root)
                 return cgit_script_name;
         else if (cgit_query_page)
                 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
         else if (cgit_query_repo)
                 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
         else
                 return fmt("%s/", cgit_virtual_root);
 }
 
 static char *repolink(char *title, char *class, char *page, char *head,
                       char *path)
 {
         char *delim = "?";
 
         html("<a");
         if (title) {
                 html(" title='");
                 html_attr(title);
                 html("'");
         }