ui-shared: remove "format" from cgit_print_age()

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index d9f825853a273309860821ca08421fad3ed2cdd3..76aac60fd6defb6562782f3dd07b2448870d775a 100644 (file)
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -54,21 +54,21 @@ const char *cgit_httpscheme(void)
                return "http://";
 }
 
                return "http://";
 }
 

-const char *cgit_hosturl(void)
+char *cgit_hosturl(void)

 {
        if (ctx.env.http_host)
 {
        if (ctx.env.http_host)

-               return ctx.env.http_host;
+               return xstrdup(ctx.env.http_host);

        if (!ctx.env.server_name)
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)
        if (!ctx.env.server_name)
                return NULL;
        if (!ctx.env.server_port || atoi(ctx.env.server_port) == 80)

-               return ctx.env.server_name;
+               return xstrdup(ctx.env.server_name);

        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 
        return fmtalloc("%s:%s", ctx.env.server_name, ctx.env.server_port);
 }
 

-const char *cgit_currenturl(void)
+char *cgit_currenturl(void)

 {
        if (!ctx.qry.url)
 {
        if (!ctx.qry.url)

-               return cgit_rooturl();
+               return xstrdup(cgit_rooturl());

        const char *root = cgit_rooturl();
        size_t len = strlen(root);
        if (len && root[len - 1] == '/')
        const char *root = cgit_rooturl();
        size_t len = strlen(root);
        if (len && root[len - 1] == '/')


@@ -157,8 +157,11 @@ static void site_url(const char *page, const char *search, const char *sort, int
 
        if (always_root || page)
                html_attr(cgit_rooturl());
 
        if (always_root || page)
                html_attr(cgit_rooturl());

-       else
-               html_attr(cgit_currenturl());
+       else {
+               char *currenturl = cgit_currenturl();
+               html_attr(currenturl);
+               free(currenturl);
+       }

 
        if (page) {
                htmlf("?p=%s", page);
 
        if (page) {
                htmlf("?p=%s", page);


@@ -522,7 +525,7 @@ void cgit_object_link(struct object *obj)
 {
        char *page, *shortrev, *fullrev, *name;
 
 {
        char *page, *shortrev, *fullrev, *name;
 

-       fullrev = sha1_to_hex(obj->sha1);
+       fullrev = oid_to_hex(&obj->oid);

        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {
        shortrev = xstrdup(fullrev);
        shortrev[10] = '\0';
        if (obj->type == OBJ_COMMIT) {


@@ -632,7 +635,7 @@ static void print_rel_date(time_t t, double value,
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 
        htmlf("'>%.0f %s</span>", value, suffix);
 }
 

-void cgit_print_age(time_t t, time_t max_relative, const char *format)
+void cgit_print_age(time_t t, time_t max_relative)

 {
        time_t now, secs;
 
 {
        time_t now, secs;
 


@@ -647,7 +650,7 @@ void cgit_print_age(time_t t, time_t max_relative, const char *format)
                html("<span title='");
                html_attr(fmt_date(t, FMT_LONGDATE, ctx.cfg.local_time));
                html("'>");
                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, FMT_SHORTDATE, ctx.cfg.local_time);

                html("</span>");
                return;
        }
                html("</span>");
                return;
        }


@@ -689,9 +692,11 @@ void cgit_print_http_headers(void)
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (ctx.page.size)
                htmlf("Content-Length: %zd\n", ctx.page.size);
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (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) {
+               html("Content-Disposition: inline; filename=\"");
+               html_header_arg_in_quotes(ctx.page.filename);
+               html("\"\n");
+       }

        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));


@@ -706,7 +711,9 @@ void cgit_print_http_headers(void)
 void cgit_redirect(const char *url, bool permanent)
 {
        htmlf("Status: %d %s\n", permanent ? 301 : 302, permanent ? "Moved" : "Found");
 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);
+       html("Location: ");
+       html_url_path(url);
+       html("\n\n");

        exit(0);
 }
 
        exit(0);
 }
 


@@ -727,7 +734,7 @@ void cgit_print_docstart(void)
                return;
        }
 
                return;
        }
 

-       const char *host = cgit_hosturl();
+       char *host = cgit_hosturl();

        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");
        html(cgit_doctype);
        html("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>\n");
        html("<head>\n");


@@ -752,7 +759,7 @@ void cgit_print_docstart(void)
 
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());
 
                html("<link rel='alternate' title='Atom feed' href='");
                html(cgit_httpscheme());

-               html_attr(cgit_hosturl());
+               html_attr(host);

                fileurl = cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
                                       sb.buf);
                html_attr(fileurl);
                fileurl = cgit_fileurl(ctx.repo->url, "atom", ctx.qry.vpath,
                                       sb.buf);
                html_attr(fileurl);


@@ -768,6 +775,7 @@ void cgit_print_docstart(void)
        html("<body>\n");
        if (ctx.cfg.header)
                html_include(ctx.cfg.header);
        html("<body>\n");
        if (ctx.cfg.header)
                html_include(ctx.cfg.header);

+       free(host);

 }
 
 void cgit_print_docend(void)
 }
 
 void cgit_print_docend(void)


@@ -885,6 +893,9 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
 
 static const char *hc(const char *page)
 {
 
 static const char *hc(const char *page)
 {

+       if (!ctx.qry.page)
+               return NULL;
+

        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }
 
        return strcmp(ctx.qry.page, page) ? NULL : "active";
 }
 


@@ -1020,19 +1031,21 @@ void cgit_print_pageheader(void)
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {
                html("<input type='submit' value='search'/>\n");
                html("</form>\n");
        } else if (ctx.env.authenticated) {

+               char *currenturl = cgit_currenturl();

                site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1);
                if (ctx.cfg.root_readme)
                        site_link("about", "about", NULL, hc("about"),
                                  NULL, NULL, 0, 1);
                html("</td><td class='form'>");
                html("<form method='get' action='");
                site_link(NULL, "index", NULL, hc("repolist"), NULL, NULL, 0, 1);
                if (ctx.cfg.root_readme)
                        site_link("about", "about", NULL, hc("about"),
                                  NULL, NULL, 0, 1);
                html("</td><td class='form'>");
                html("<form method='get' action='");

-               html_attr(cgit_currenturl());
+               html_attr(currenturl);

                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");
                html("'>\n");
                html("<input type='text' name='q' size='10' value='");
                html_attr(ctx.qry.search);
                html("'/>\n");
                html("<input type='submit' value='search'/>\n");
                html("</form>");

+               free(currenturl);

        }
        html("</td></tr></table>\n");
        if (ctx.env.authenticated && ctx.qry.vpath) {
        }
        html("</td></tr></table>\n");
        if (ctx.env.authenticated && ctx.qry.vpath) {