1 files changed, 37 insertions, 4 deletions
diff --git a/ui-shared.c b/ui-shared.c
index fd71c12..ca2ee82 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -1,141 +1,172 @@
 /* ui-shared.c: common web output functions
 *
 * Copyright (C) 2006 Lars Hjemli
 *
 * Licensed under GNU General Public License v2
 *   (see COPYING for full license text)
 */
 #include "cgit.h"
 const char cgit_doctype[] =
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 static char *http_date(time_t t)
 {
        static char day[][4] =
                {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
        static char month[][4] =
                {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                 "Jul", "Aug", "Sep", "Oct", "Now", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                   tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year,
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 static long ttl_seconds(long ttl)
 {
        if (ttl<0)
                return 60 * 60 * 24 * 365;
        else
                return ttl * 60;
 }
 void cgit_print_error(char *msg)
 {
        html("<div class='error'>");
        html_txt(msg);
        html("</div>\n");
 }
 char *cgit_rooturl()
 {
        if (cgit_virtual_root)
                return fmt("%s/", cgit_virtual_root);
        else
                return cgit_script_name;
 }
 char *cgit_repourl(const char *reponame)
 {
        if (cgit_virtual_root) {
                return fmt("%s/%s/", cgit_virtual_root, reponame);
        } else {
                return fmt("?r=%s", reponame);
        }
 }
-char *cgit_pageurl(const char *reponame, const char *pagename,
+char *cgit_fileurl(const char *reponame, const char *pagename,
-                   const char *query)
+                   const char *filename, const char *query)
 {
        if (cgit_virtual_root) {
                if (query)
-                        return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
+                        return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
-                                   pagename, query);
+                                   pagename, filename?filename:"", query);
                else
                        return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
                                   pagename);
        } else {
                if (query)
                        return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
                else
                        return fmt("?r=%s&amp;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("'");
        }
        if (class) {
                html(" class='");
                html_attr(class);
                html("'");
        }
        html(" href='");
        if (cgit_virtual_root) {
                html_attr(cgit_virtual_root);
                if (cgit_virtual_root[strlen(cgit_virtual_root) - 1] != '/')
                        html("/");
                html_attr(cgit_repo->url);
                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                        if (path)
                                html_attr(path);
                }
        } else {
                html(cgit_script_name);
                html("?url=");
                html_attr(cgit_repo->url);
                if (cgit_repo->url[strlen(cgit_repo->url) - 1] != '/')
                        html("/");
                if (page) {
                        html(page);
                        html("/");
                        if (path)
                                html_attr(path);
                }
                delim = "&amp;";
        }
        if (head && strcmp(head, cgit_repo->defbranch)) {
                html(delim);
                html("h=");
                html_attr(head);
                delim = "&amp;";
        }
        return fmt("%s", delim);
 }
@@ -331,64 +362,66 @@ void cgit_print_pageheader(char *title, int show_search)
        html("<a href='");
        html_attr(cgit_logo_link);
        htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
        html("</td></tr>");
        html("<tr><td id='crumb'>");
        if (cgit_query_repo) {
                html_txt(cgit_repo->name);
                html(" (");
                html_txt(cgit_query_head);
                html(") : &nbsp;");
                reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
                            NULL, NULL);
                html(" ");
                cgit_log_link("log", NULL, NULL, cgit_query_head,
                              cgit_query_sha1, cgit_query_path, 0);
                html(" ");
                cgit_tree_link("tree", NULL, NULL, cgit_query_head,
                               cgit_query_sha1, NULL);
                html(" ");
                cgit_commit_link("commit", NULL, NULL, cgit_query_head,
                              cgit_query_sha1);
                html(" ");
                cgit_diff_link("diff", NULL, NULL, cgit_query_head,
                               cgit_query_sha1, cgit_query_sha2,
                               cgit_query_path);
        } else {
                html_txt("Index of repositories");
        }
        html("</td>");
        html("<td id='search'>");
        if (show_search) {
                html("<form method='get' action='");
                html_attr(cgit_currurl());
                html("'>");
                if (!cgit_virtual_root) {
                        if (cgit_query_repo)
                                html_hidden("r", cgit_query_repo);
                        if (cgit_query_page)
                                html_hidden("p", cgit_query_page);
                }
                if (cgit_query_head)
                        html_hidden("h", cgit_query_head);
                if (cgit_query_sha1)
                        html_hidden("id", cgit_query_sha1);
                if (cgit_query_sha2)
                        html_hidden("id2", cgit_query_sha2);
                html("<input type='text' name='q' value='");
                html_attr(cgit_query_search);
                html("'/></form>");
        }
        html("</td></tr>");
        html("<tr><td id='content' colspan='2'>");
 }
 void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                               struct cacheitem *item)
 {
        htmlf("Content-Type: %s\n", mimetype);
        htmlf("Content-Disposition: inline; filename=\"%s\"\n", filename);
        htmlf("Last-Modified: %s\n", http_date(item->st.st_mtime));
        htmlf("Expires: %s\n", http_date(item->st.st_mtime +
                                         ttl_seconds(item->ttl)));
        html("\n");
 }
+/* vim:set sw=8: */