Revert part of "Makefile: add support for DESTDIR"

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index 64c237fe0145230d18b34e8dbb6ecb96d87bf160..5c5bcf35a71e8a09dfdc39f144af4b4e6629fd46 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -57,13 +57,13 @@ char *cgit_repourl(const char *reponame)
        }
 }
 
-char *cgit_pageurl(const char *reponame, const char *pagename,
-                  const char *query)
+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", cgit_virtual_root, reponame,
-                                  pagename, 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);
@@ -75,6 +75,37 @@ char *cgit_pageurl(const char *reponame, const char *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)
@@ -163,9 +194,25 @@ void cgit_tree_link(char *name, char *title, char *class, char *head,
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-                  char *rev, char *path)
+                  char *rev, char *path, int ofs)
 {
-       reporevlink("log", name, title, class, head, rev, path);
+       char *delim;
+
+       delim = repolink(title, class, "log", head, path);
+       if (rev && strcmp(rev, cgit_query_head)) {
+               html(delim);
+               html("id=");
+               html_attr(rev);
+               delim = "&";
+       }
+       if (ofs > 0) {
+               html(delim);
+               html("ofs=");
+               htmlf("%d", ofs);
+       }
+       html("'>");
+       html_txt(name);
+       html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
@@ -180,6 +227,12 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
        reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
+void cgit_snapshot_link(char *name, char *title, char *class, char *head,
+                       char *rev, char *archivename)
+{
+       reporevlink("snapshot", name, title, class, head, rev, archivename);
+}
+
 void cgit_diff_link(char *name, char *title, char *class, char *head,
                    char *new_rev, char *old_rev, char *path)
 {
@@ -202,6 +255,30 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
        html("</a>");
 }
 
+void cgit_object_link(struct object *obj)
+{
+       char *page, *arg, *url;
+
+       if (obj->type == OBJ_COMMIT) {
+                cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
+                                cgit_query_head, sha1_to_hex(obj->sha1));
+               return;
+       } else if (obj->type == OBJ_TREE) {
+               page = "tree";
+               arg = "id";
+       } else {
+               page = "blob";
+               arg = "id";
+       }
+
+       url = cgit_pageurl(cgit_query_repo, page,
+                          fmt("%s=%s", arg, sha1_to_hex(obj->sha1)));
+       html_link_open(url, NULL, NULL);
+       htmlf("%s %s", typename(obj->type),
+             sha1_to_hex(obj->sha1));
+       html_link_close();
+}
+
 void cgit_print_date(time_t secs, char *format)
 {
        char buf[64];
@@ -266,7 +343,7 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
        html("<title>");
        html_txt(title);
        html("</title>\n");
-       htmlf("<meta name='generator' content='cgit v%s'/>\n", cgit_version);
+       htmlf("<meta name='generator' content='cgit %s'/>\n", cgit_version);
        html("<link rel='stylesheet' type='text/css' href='");
        html_attr(cgit_css);
        html("'/>\n");
@@ -302,7 +379,7 @@ void cgit_print_pageheader(char *title, int show_search)
                            NULL, NULL);
                html(" ");
                cgit_log_link("log", NULL, NULL, cgit_query_head,
-                             cgit_query_sha1, cgit_query_path);
+                             cgit_query_sha1, cgit_query_path, 0);
                html(" ");
                cgit_tree_link("tree", NULL, NULL, cgit_query_head,
                               cgit_query_sha1, NULL);
@@ -352,3 +429,5 @@ void cgit_print_snapshot_start(const char *mimetype, const char *filename,
                                         ttl_seconds(item->ttl)));
        html("\n");
 }
+
+/* vim:set sw=8: */