ui-shared.c: Remove unused function cgit_currurl()

[cgit.git] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index c398d7aaf85a4ce5dfedbccc97bc844713dd44bf..31224bc1aa23cb80118275a5077c5f28a4f8bfe9 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -23,7 +23,7 @@ static char *http_date(time_t t)
                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
        struct tm *tm = gmtime(&t);
        return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday],
                 "Jul", "Aug", "Sep", "Oct", "Nov", "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_mday, month[tm->tm_mon], 1900 + tm->tm_year,

                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 
                   tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
 


@@ -83,7 +83,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));
        } else {
                tmp = fmt("?url=%s/%s/%s", reponame, pagename,
                          (filename ? filename : ""));

-               delim = "&";
+               delim = "&";

        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);
        }
        if (query)
                tmp = fmt("%s%s%s", tmp, delim, query);


@@ -93,7 +93,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {
 char *cgit_pageurl(const char *reponame, const char *pagename,
                   const char *query)
 {

-       return cgit_fileurl(reponame,pagename,0,query);
+       return cgit_fileurl(reponame, pagename, 0, query);

 }
 
 const char *cgit_repobasename(const char *reponame)
 }
 
 const char *cgit_repobasename(const char *reponame)


@@ -102,38 +102,26 @@ const char *cgit_repobasename(const char *reponame)
        static char rvbuf[1024];
        int p;
        const char *rv;
        static char rvbuf[1024];
        int p;
        const char *rv;

-       strncpy(rvbuf,reponame,sizeof(rvbuf));
-       if(rvbuf[sizeof(rvbuf)-1])
+       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 */
                die("cgit_repobasename: truncated repository name '%s'", reponame);
        p = strlen(rvbuf)-1;
        /* strip trailing slashes */

-       while(p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while (p && rvbuf[p] == '/') rvbuf[p--] = 0;

        /* strip trailing .git */
        /* strip trailing .git */

-       if(p>=3 && !strncmp(&rvbuf[p-3],".git",4)) {
+       if (p >= 3 && !strncmp(&rvbuf[p-3], ".git", 4)) {

                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */
                p -= 3; rvbuf[p--] = 0;
        }
        /* strip more trailing slashes if any */

-       while( p && rvbuf[p]=='/') rvbuf[p--]=0;
+       while ( p && rvbuf[p] == '/') rvbuf[p--] = 0;

        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');

-       if(rv)
+       if (rv)

                return ++rv;
        return rvbuf;
 }
 
                return ++rv;
        return rvbuf;
 }
 

-char *cgit_currurl()
-{
-       if (!ctx.cfg.virtual_root)
-               return ctx.cfg.script_name;
-       else if (ctx.qry.page)
-               return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
-       else if (ctx.qry.repo)
-               return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
-       else
-               return fmt("%s/", ctx.cfg.virtual_root);
-}
-
-static void site_url(const char *page, const char *search, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs)

 {
        char *delim = "?";
 
 {
        char *delim = "?";
 


@@ -146,13 +134,19 @@ static void site_url(const char *page, const char *search, int ofs)
 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);

-               delim = "&";
+               delim = "&";

        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);
        }
        if (search) {
                html(delim);
                html("q=");
                html_attr(search);

-               delim = "&";
+               delim = "&";
+       }
+       if (sort) {
+               html(delim);
+               html("s=");
+               html_attr(sort);
+               delim = "&";

        }
        if (ofs) {
                html(delim);
        }
        if (ofs) {
                html(delim);


@@ -161,7 +155,7 @@ static void site_url(const char *page, const char *search, int ofs)
 }
 
 static void site_link(const char *page, const char *name, const char *title,
 }
 
 static void site_link(const char *page, const char *name, const char *title,

-                     const char *class, const char *search, int ofs)
+                     const char *class, const char *search, const char *sort, int ofs)

 {
        html("<a");
        if (title) {
 {
        html("<a");
        if (title) {


@@ -175,16 +169,16 @@ static void site_link(const char *page, const char *name, const char *title,
                html("'");
        }
        html(" href='");
                html("'");
        }
        html(" href='");

-       site_url(page, search, ofs);
+       site_url(page, search, sort, ofs);

        html("'>");
        html_txt(name);
        html("</a>");
 }
 
 void cgit_index_link(const char *name, const char *title, const char *class,
        html("'>");
        html_txt(name);
        html("</a>");
 }
 
 void cgit_index_link(const char *name, const char *title, const char *class,

-                    const char *pattern, int ofs)
+                    const char *pattern, const char *sort, int ofs)

 {
 {

-       site_link(NULL, name, title, class, pattern, ofs);
+       site_link(NULL, name, title, class, pattern, sort, ofs);

 }
 
 static char *repolink(const char *title, const char *class, const char *page,
 }
 
 static char *repolink(const char *title, const char *class, const char *page,


@@ -288,17 +282,17 @@ void cgit_log_link(const char *name, const char *title, const char *class,
        char *delim;
 
        delim = repolink(title, class, "log", head, path);
        char *delim;
 
        delim = repolink(title, class, "log", head, path);

-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(rev);
                html(delim);
                html("id=");
                html_url_arg(rev);

-               delim = "&";
+               delim = "&amp;";

        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_url_arg(grep);
        }
        if (grep && pattern) {
                html(delim);
                html("qt=");
                html_url_arg(grep);

-               delim = "&";
+               delim = "&amp;";

                html(delim);
                html("q=");
                html_url_arg(pattern);
                html(delim);
                html("q=");
                html_url_arg(pattern);


@@ -307,7 +301,7 @@ void cgit_log_link(const char *name, const char *title, const char *class,
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);
                html(delim);
                html("ofs=");
                htmlf("%d", ofs);

-               delim = "&";
+               delim = "&amp;";

        }
        if (showmsg) {
                html(delim);
        }
        if (showmsg) {
                html(delim);


@@ -332,7 +326,7 @@ void cgit_commit_link(char *name, const char *title, const char *class,
        char *delim;
 
        delim = repolink(title, class, "commit", head, path);
        char *delim;
 
        delim = repolink(title, class, "commit", head, path);

-       if (rev && strcmp(rev, ctx.qry.head)) {
+       if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {

                html(delim);
                html("id=");
                html_url_arg(rev);
                html(delim);
                html("id=");
                html_url_arg(rev);


@@ -349,8 +343,16 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                htmlf("%d", ctx.qry.context);
                delim = "&amp;";
        }
                htmlf("%d", ctx.qry.context);
                delim = "&amp;";
        }

+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
+       }

        html("'>");
        html("'>");

-       html_txt(name);
+       if (name[0] != '\0')
+               html_txt(name);
+       else
+               html_txt("(no commit message)");

        html("</a>");
 }
 
        html("</a>");
 }
 


@@ -397,6 +399,11 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
                htmlf("%d", ctx.qry.context);
                delim = "&amp;";
        }
                htmlf("%d", ctx.qry.context);
                delim = "&amp;";
        }

+       if (ctx.qry.ignorews) {
+               html(delim);
+               html("ignorews=1");
+               delim = "&amp;";
+       }

        html("'>");
        html_txt(name);
        html("</a>");
        html("'>");
        html_txt(name);
        html("</a>");


@@ -414,11 +421,11 @@ void cgit_stats_link(const char *name, const char *title, const char *class,
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 
        reporevlink("stats", name, title, class, head, NULL, path);
 }
 

-void cgit_self_link(char *name, const char *title, const char *class,
-                   struct cgit_context *ctx)
+static void cgit_self_link(char *name, const char *title, const char *class,
+                          struct cgit_context *ctx)

 {
        if (!strcmp(ctx->qry.page, "repolist"))
 {
        if (!strcmp(ctx->qry.page, "repolist"))

-               return cgit_index_link(name, title, class, ctx->qry.search,
+               return cgit_index_link(name, title, class, ctx->qry.search, ctx->qry.sort,

                                       ctx->qry.ofs);
        else if (!strcmp(ctx->qry.page, "summary"))
                return cgit_summary_link(name, title, class, ctx->qry.head);
                                       ctx->qry.ofs);
        else if (!strcmp(ctx->qry.page, "summary"))
                return cgit_summary_link(name, title, class, ctx->qry.head);


@@ -480,7 +487,7 @@ void cgit_object_link(struct object *obj)
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {

-                cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
+               cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,

                                 ctx.qry.head, fullrev, NULL, 0);
                return;
        } else if (obj->type == OBJ_TREE)
                                 ctx.qry.head, fullrev, NULL, 0);
                return;
        } else if (obj->type == OBJ_TREE)


@@ -493,6 +500,63 @@ void cgit_object_link(struct object *obj)
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 
        reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
 }
 

+static struct string_list_item *lookup_path(struct string_list *list,
+                                           const char *path)
+{
+       struct string_list_item *item;
+
+       while (path && path[0]) {
+               if ((item = string_list_lookup(list, path)))
+                       return item;
+               if (!(path = strchr(path, '/')))
+                       break;
+               path++;
+       }
+       return NULL;
+}
+
+void cgit_submodule_link(const char *class, char *path, const char *rev)
+{
+       struct string_list *list;
+       struct string_list_item *item;
+       char tail, *dir;
+       size_t len;
+
+       tail = 0;
+       list = &ctx.repo->submodules;
+       item = lookup_path(list, path);
+       if (!item) {
+               len = strlen(path);
+               tail = path[len - 1];
+               if (tail == '/') {
+                       path[len - 1] = 0;
+                       item = lookup_path(list, path);
+               }
+       }
+       html("<a ");
+       if (class)
+               htmlf("class='%s' ", class);
+       html("href='");
+       if (item) {
+               html_attr(fmt(item->util, rev));
+       } else if (ctx.repo->module_link) {
+               dir = strrchr(path, '/');
+               if (dir)
+                       dir++;
+               else
+                       dir = path;
+               html_attr(fmt(ctx.repo->module_link, dir, rev));
+       } else {
+               html("#");
+       }
+       html("'>");
+       html_txt(path);
+       html("</a>");
+       html_txt(fmt(" @ %.7s", rev));
+       if (item && tail)
+               path[len - 1] = tail;
+}
+

 void cgit_print_date(time_t secs, const char *format, int local_time)
 {
        char buf[64];
 void cgit_print_date(time_t secs, const char *format, int local_time)
 {
        char buf[64];


@@ -500,7 +564,7 @@ void cgit_print_date(time_t secs, const char *format, int local_time)
 
        if (!secs)
                return;
 
        if (!secs)
                return;

-       if(local_time)
+       if (local_time)

                time = localtime(&secs);
        else
                time = gmtime(&secs);
                time = localtime(&secs);
        else
                time = gmtime(&secs);


@@ -564,7 +628,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)
        else if (ctx->page.mimetype)
                htmlf("Content-Type: %s\n", ctx->page.mimetype);
        if (ctx->page.size)

-               htmlf("Content-Length: %ld\n", ctx->page.size);
+               htmlf("Content-Length: %zd\n", ctx->page.size);

        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);
        if (ctx->page.filename)
                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
                      ctx->page.filename);


@@ -603,7 +667,7 @@ void cgit_print_docstart(struct cgit_context *ctx)
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }
                html_attr(ctx->cfg.favicon);
                html("'/>\n");
        }

-       if (host && ctx->repo) {
+       if (host && ctx->repo && ctx->qry.head) {

                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());


@@ -640,16 +704,16 @@ void cgit_print_docend()
        html("</body>\n</html>\n");
 }
 
        html("</body>\n</html>\n");
 }
 

-int print_branch_option(const char *refname, const unsigned char *sha1,
-                       int flags, void *cb_data)
+static int print_branch_option(const char *refname, const unsigned char *sha1,
+                              int flags, void *cb_data)

 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 
 {
        char *name = (char *)refname;
        html_option(name, name, ctx.qry.head);
        return 0;
 }
 

-int print_archive_ref(const char *refname, const unsigned char *sha1,
-                      int flags, void *cb_data)
+static int print_archive_ref(const char *refname, const unsigned char *sha1,
+                            int flags, void *cb_data)

 {
        struct tag *tag;
        struct taginfo *info;
 {
        struct tag *tag;
        struct taginfo *info;


@@ -660,7 +724,7 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 
        if (prefixcmp(refname, "refs/archives"))
                return 0;
 
        if (prefixcmp(refname, "refs/archives"))
                return 0;

-       strncpy(buf, refname+14, sizeof(buf));
+       strncpy(buf, refname + 14, sizeof(buf));

        obj = parse_object(sha1);
        if (!obj)
                return 1;
        obj = parse_object(sha1);
        if (!obj)
                return 1;


@@ -746,23 +810,33 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
 
 static void print_header(struct cgit_context *ctx)
 {
 
 static void print_header(struct cgit_context *ctx)
 {

+       char *logo = NULL, *logo_link = NULL;
+

        html("<table id='header'>\n");
        html("<tr>\n");
 
        html("<table id='header'>\n");
        html("<tr>\n");
 

-       if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
+       if (ctx->repo && ctx->repo->logo && *ctx->repo->logo)
+               logo = ctx->repo->logo;
+       else
+               logo = ctx->cfg.logo;
+       if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link)
+               logo_link = ctx->repo->logo_link;
+       else
+               logo_link = ctx->cfg.logo_link;
+       if (logo && *logo) {

                html("<td class='logo' rowspan='2'><a href='");
                html("<td class='logo' rowspan='2'><a href='");

-               if (ctx->cfg.logo_link)
-                       html_attr(ctx->cfg.logo_link);
+               if (logo_link && *logo_link)
+                       html_attr(logo_link);

                else
                        html_attr(cgit_rooturl());
                html("'><img src='");
                else
                        html_attr(cgit_rooturl());
                html("'><img src='");

-               html_attr(ctx->cfg.logo);
+               html_attr(logo);

                html("' alt='cgit logo'/></a></td>\n");
        }
 
        html("<td class='main'>");
        if (ctx->repo) {
                html("' alt='cgit logo'/></a></td>\n");
        }
 
        html("<td class='main'>");
        if (ctx->repo) {

-               cgit_index_link("index", NULL, NULL, NULL, 0);
+               cgit_index_link("index", NULL, NULL, NULL, NULL, 0);

                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");
                html(" : ");
                cgit_summary_link(ctx->repo->name, ctx->repo->name, NULL, NULL);
                html("</td><td class='form'>");


@@ -838,10 +912,10 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else {

-               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0);
+               site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, NULL, 0);

                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(ctx, "about"),
                if (ctx->cfg.root_readme)
                        site_link("about", "about", NULL, hc(ctx, "about"),

-                                 NULL, 0);
+                                 NULL, NULL, 0);

                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());
                html("</td><td class='form'>");
                html("<form method='get' action='");
                html_attr(cgit_rooturl());


@@ -882,7 +956,7 @@ void cgit_print_snapshot_links(const char *repo, const char *head,
 {
        const struct cgit_snapshot_format* f;
        char *prefix;
 {
        const struct cgit_snapshot_format* f;
        char *prefix;

-       char *filename;
+       char *filename;

        unsigned char sha1[20];
 
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&
        unsigned char sha1[20];
 
        if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 &&