]> gitweb.ps.run Git - ps-cgit/blobdiff - ui-shared.c
projects / ps-cgit / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ui-shared: fix resource leak: free allocation from cgit_fileurl
[ps-cgit] / ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 6d3cfa9c5101c1d766795ff4cb2cc23a6ad06767..d9f825853a273309860821ca08421fad3ed2cdd3 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -11,7 +11,7 @@
 #include "cmd.h"
 #include "html.h"
 
 #include "cmd.h"
 #include "html.h"
 
-const char cgit_doctype[] =
+static 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";
 
 "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n"
 "  \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
 
@@ -69,7 +69,11 @@ const char *cgit_currenturl(void)
 {
        if (!ctx.qry.url)
                return cgit_rooturl();
 {
        if (!ctx.qry.url)
                return cgit_rooturl();
-       return ctx.qry.url;
+       const char *root = cgit_rooturl();
+       size_t len = strlen(root);
+       if (len && root[len - 1] == '/')
+               return fmtalloc("%s%s", root, ctx.qry.url);
+       return fmtalloc("%s/%s", root, ctx.qry.url);
 }
 
 const char *cgit_rooturl(void)
 }
 
 const char *cgit_rooturl(void)
@@ -82,7 +86,7 @@ const char *cgit_rooturl(void)
 
 const char *cgit_loginurl(void)
 {
 
 const char *cgit_loginurl(void)
 {
-       static const char *login_url = 0;
+       static const char *login_url;
        if (!login_url)
                login_url = fmtalloc("%s?p=login", cgit_rooturl());
        return login_url;
        if (!login_url)
                login_url = fmtalloc("%s?p=login", cgit_rooturl());
        return login_url;
@@ -119,7 +123,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, NULL, query);
 }
 
 const char *cgit_repobasename(const char *reponame)
 }
 
 const char *cgit_repobasename(const char *reponame)
@@ -299,7 +303,8 @@ void cgit_plain_link(const char *name, const char *title, const char *class,
 
 void cgit_log_link(const char *name, const char *title, const char *class,
                   const char *head, const char *rev, const char *path,
 
 void cgit_log_link(const char *name, const char *title, const char *class,
                   const char *head, const char *rev, const char *path,
-                  int ofs, const char *grep, const char *pattern, int showmsg)
+                  int ofs, const char *grep, const char *pattern, int showmsg,
+                  int follow)
 {
        char *delim;
 
 {
        char *delim;
 
@@ -328,6 +333,11 @@ void cgit_log_link(const char *name, const char *title, const char *class,
        if (showmsg) {
                html(delim);
                html("showmsg=1");
        if (showmsg) {
                html(delim);
                html("showmsg=1");
+               delim = "&amp;";
+       }
+       if (follow) {
+               html(delim);
+               html("follow=1");
        }
        html("'>");
        html_txt(name);
        }
        html("'>");
        html_txt(name);
@@ -369,6 +379,10 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                html("ignorews=1");
                delim = "&amp;";
        }
                html("ignorews=1");
                delim = "&amp;";
        }
+       if (ctx.qry.follow) {
+               html(delim);
+               html("follow=1");
+       }
        html("'>");
        if (name[0] != '\0')
                html_txt(name);
        html("'>");
        if (name[0] != '\0')
                html_txt(name);
@@ -425,6 +439,10 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
                html("ignorews=1");
                delim = "&amp;";
        }
                html("ignorews=1");
                delim = "&amp;";
        }
+       if (ctx.qry.follow) {
+               html(delim);
+               html("follow=1");
+       }
        html("'>");
        html_txt(name);
        html("</a>");
        html("'>");
        html_txt(name);
        html("</a>");
@@ -465,7 +483,7 @@ static void cgit_self_link(char *name, const char *title, const char *class)
                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
                              ctx.qry.path, ctx.qry.ofs,
                              ctx.qry.grep, ctx.qry.search,
                              ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
                              ctx.qry.path, ctx.qry.ofs,
                              ctx.qry.grep, ctx.qry.search,
-                             ctx.qry.showmsg);
+                             ctx.qry.showmsg, ctx.qry.follow);
        else if (!strcmp(ctx.qry.page, "commit"))
                cgit_commit_link(name, title, class, ctx.qry.head,
                                 ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
        else if (!strcmp(ctx.qry.page, "commit"))
                cgit_commit_link(name, title, class, ctx.qry.head,
                                 ctx.qry.has_sha1 ? ctx.qry.sha1 : NULL,
@@ -555,59 +573,62 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
                        item = lookup_path(list, path);
                }
        }
                        item = lookup_path(list, path);
                }
        }
-       html("<a ");
-       if (class)
-               htmlf("class='%s' ", class);
-       html("href='");
-       if (item) {
-               html_attrf(item->util, rev);
-       } else if (ctx.repo->module_link) {
-               dir = strrchr(path, '/');
-               if (dir)
-                       dir++;
-               else
-                       dir = path;
-               html_attrf(ctx.repo->module_link, dir, rev);
+       if (item || ctx.repo->module_link) {
+               html("<a ");
+               if (class)
+                       htmlf("class='%s' ", class);
+               html("href='");
+               if (item) {
+                       html_attrf(item->util, rev);
+               } else {
+                       dir = strrchr(path, '/');
+                       if (dir)
+                               dir++;
+                       else
+                               dir = path;
+                       html_attrf(ctx.repo->module_link, dir, rev);
+               }
+               html("'>");
+               html_txt(path);
+               html("</a>");
        } else {
        } else {
-               html("#");
+               html("<span");
+               if (class)
+                       htmlf(" class='%s'", class);
+               html(">");
+               html_txt(path);
+               html("</span>");
        }
        }
-       html("'>");
-       html_txt(path);
-       html("</a>");
        html_txtf(" @ %.7s", rev);
        if (item && tail)
                path[len - 1] = tail;
 }
 
        html_txtf(" @ %.7s", rev);
        if (item && tail)
                path[len - 1] = tail;
 }
 
-void cgit_print_date(time_t secs, const char *format, int local_time)
+static const char *fmt_date(time_t secs, const char *format, int local_time)
 {
 {
-       char buf[64];
+       static char buf[64];
        struct tm *time;
 
        if (!secs)
        struct tm *time;
 
        if (!secs)
-               return;
+               return "";
        if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
        if (local_time)
                time = localtime(&secs);
        else
                time = gmtime(&secs);
        strftime(buf, sizeof(buf)-1, format, time);
-       html_txt(buf);
+       return buf;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
+{
+       html_txt(fmt_date(secs, format, local_time));
 }
 
 static void print_rel_date(time_t t, double value,
        const char *class, const char *suffix)
 {
 }
 
 static void print_rel_date(time_t t, double value,
        const char *class, const char *suffix)
 {
-       char buf[64];
-       struct tm *time;
-
-       if (ctx.cfg.local_time)
-               time = localtime(&t);
-       else
-               time = gmtime(&t);
-       strftime(buf, sizeof(buf) - 1, FMT_LONGDATE, time);
-
        htmlf("<span class='%s' title='", class);
        htmlf("<span class='%s' title='", class);
-       html_attr(buf);
+       html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
@@ -623,7 +644,11 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {
                secs = 0;
 
        if (secs > max_relative && max_relative >= 0) {
+               html("<span title='");
+               html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
+               html("'>");
                cgit_print_date(t, format, ctx.cfg.local_time);
                cgit_print_date(t, format, ctx.cfg.local_time);
+               html("</span>");
                return;
        }
 
                return;
        }
 
@@ -678,6 +703,13 @@ void cgit_print_http_headers(void)
                exit(0);
 }
 
                exit(0);
 }
 
+void cgit_redirect(const char *url, bool permanent)
+{
+       htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
+       htmlf("Location: %s\n\n", url);
+       exit(0);
+}
+
 static void print_rel_vcs_link(const char *url)
 {
        html("<link rel='vcs-git' href='");
 static void print_rel_vcs_link(const char *url)
 {
        html("<link rel='vcs-git' href='");
@@ -714,16 +746,19 @@ void cgit_print_docstart(void)
                html("'/>\n");
        }
        if (host && ctx.repo && ctx.qry.head) {
                html("'/>\n");
        }
        if (host && ctx.repo && ctx.qry.head) {
+               char *fileurl;
                struct strbuf sb = STRBUF_INIT;
                strbuf_addf(&sb, "h=%s", ctx.qry.head);
 
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
                struct strbuf sb = STRBUF_INIT;
                strbuf_addf(&sb, "h=%s", ctx.qry.head);
 
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
                html_attr(cgit_hosturl());
-               html_attr(cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
-                                      sb.buf));
+               fileurl = cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
+                                      sb.buf);
+               html_attr(fileurl);
                html("' type='application/atom+xml'/>\n");
                strbuf_release(&sb);
                html("' type='application/atom+xml'/>\n");
                strbuf_release(&sb);
+               free(fileurl);
        }
        if (ctx.repo)
                cgit_add_clone_urls(print_rel_vcs_link);
        }
        if (ctx.repo)
                cgit_add_clone_urls(print_rel_vcs_link);
@@ -756,6 +791,33 @@ void cgit_print_docend(void)
        html("</body>\n</html>\n");
 }
 
        html("</body>\n</html>\n");
 }
 
+void cgit_print_error_page(int code, const char *msg, const char *fmt, ...)
+{
+       va_list ap;
+       ctx.page.expires = ctx.cfg.cache_dynamic_ttl;
+       ctx.page.status = code;
+       ctx.page.statusmsg = msg;
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+       va_start(ap, fmt);
+       cgit_vprint_error(fmt, ap);
+       va_end(ap);
+       cgit_print_docend();
+}
+
+void cgit_print_layout_start(void)
+{
+       cgit_print_http_headers();
+       cgit_print_docstart();
+       cgit_print_pageheader();
+}
+
+void cgit_print_layout_end(void)
+{
+       cgit_print_docend();
+}
+
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
 static void add_clone_urls(void (*fn)(const char *), char *txt, char *suffix)
 {
        struct strbuf **url_list = strbuf_split_str(txt, ' ', 0);
@@ -781,7 +843,7 @@ void cgit_add_clone_urls(void (*fn)(const char *))
                add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
                add_clone_urls(fn, ctx.cfg.clone_prefix, ctx.repo->url);
 }
 
-static int print_branch_option(const char *refname, const unsigned char *sha1,
+static int print_branch_option(const char *refname, const struct object_id *oid,
                               int flags, void *cb_data)
 {
        char *name = (char *)refname;
                               int flags, void *cb_data)
 {
        char *name = (char *)refname;
@@ -884,6 +946,8 @@ static void print_header(void)
                        cgit_add_hidden_formfields(0, 1, ctx.qry.page);
                        html("<select name='h' onchange='this.form.submit();'>\n");
                        for_each_branch_ref(print_branch_option, ctx.qry.head);
                        cgit_add_hidden_formfields(0, 1, ctx.qry.page);
                        html("<select name='h' onchange='this.form.submit();'>\n");
                        for_each_branch_ref(print_branch_option, ctx.qry.head);
+                       if (ctx.repo->enable_remote_branches)
+                               for_each_remote_ref(print_branch_option, ctx.qry.head);
                        html("</select> ");
                        html("<input type='submit' name='' value='switch'/>");
                        html("</form>");
                        html("</select> ");
                        html("<input type='submit' name='' value='switch'/>");
                        html("</form>");
@@ -924,7 +988,7 @@ void cgit_print_pageheader(void)
                               ctx.qry.sha1, NULL);
                cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                              NULL, ctx.qry.vpath, 0, NULL, NULL,
                               ctx.qry.sha1, NULL);
                cgit_log_link("log", NULL, hc("log"), ctx.qry.head,
                              NULL, ctx.qry.vpath, 0, NULL, NULL,
-                             ctx.qry.showmsg);
+                             ctx.qry.showmsg, ctx.qry.follow);
                cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
                               ctx.qry.sha1, ctx.qry.vpath);
                cgit_commit_link("commit", NULL, hc("commit"),
                cgit_tree_link("tree", NULL, hc("tree"), ctx.qry.head,
                               ctx.qry.sha1, ctx.qry.vpath);
                cgit_commit_link("commit", NULL, hc("commit"),
@@ -936,9 +1000,12 @@ void cgit_print_pageheader(void)
                                        ctx.qry.head, ctx.qry.vpath);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
                                        ctx.qry.head, ctx.qry.vpath);
                html("</td><td class='form'>");
                html("<form class='right' method='get' action='");
-               if (ctx.cfg.virtual_root)
-                       html_url_path(cgit_fileurl(ctx.qry.repo, "log",
-                                                  ctx.qry.vpath, NULL));
+               if (ctx.cfg.virtual_root) {
+                       char *fileurl = cgit_fileurl(ctx.qry.repo, "log",
+                                                  ctx.qry.vpath, NULL);
+                       html_url_path(fileurl);
+                       free(fileurl);
+               }
                html("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
                html("'>\n");
                cgit_add_hidden_formfields(1, 0, "log");
                html("<select name='qt'>\n");
@@ -972,6 +1039,14 @@ void cgit_print_pageheader(void)
                html("<div class='path'>");
                html("path: ");
                cgit_print_path_crumbs(ctx.qry.vpath);
                html("<div class='path'>");
                html("path: ");
                cgit_print_path_crumbs(ctx.qry.vpath);
+               if (ctx.cfg.enable_follow_links && !strcmp(ctx.qry.page, "log")) {
+                       html(" (");
+                       ctx.qry.follow = !ctx.qry.follow;
+                       cgit_self_link(ctx.qry.follow ? "follow" : "unfollow",
+                                       NULL, NULL);
+                       ctx.qry.follow = !ctx.qry.follow;
+                       html(")");
+               }
                html("</div>");
        }
        html("<div class='content'>");
                html("</div>");
        }
        html("<div class='content'>");
Unnamed repository; edit this file 'description' to name the repository.