Fix several whitespace errors

[ps-cgit] / ui-shared.c

diff --git a/ui-shared.c b/ui-shared.c
index b736fca2d02f79ed2edeca5e3d2e99c342e78f09..1a28dce668ca67b30fb222ccb73e0f8e422eea0c 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,18 +102,18 @@ 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));
+       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 */
        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;
+       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,'/');
        if(rv)
        /* find last slash in the remaining string */
        rv = strrchr(rvbuf,'/');
        if(rv)


@@ -133,7 +133,7 @@ char *cgit_currurl()
                return fmt("%s/", ctx.cfg.virtual_root);
 }
 
                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 +146,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 +167,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 +181,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 +294,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 +313,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 +338,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);


@@ -355,7 +361,10 @@ void cgit_commit_link(char *name, const char *title, const char *class,
                delim = "&amp;";
        }
        html("'>");
                delim = "&amp;";
        }
        html("'>");

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

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


@@ -428,7 +437,7 @@ void cgit_self_link(char *name, const char *title, const char *class,
                    struct cgit_context *ctx)
 {
        if (!strcmp(ctx->qry.page, "repolist"))
                    struct cgit_context *ctx)
 {
        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);


@@ -490,7 +499,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)


@@ -555,6 +564,7 @@ void cgit_submodule_link(const char *class, char *path, const char *rev)
        html("'>");
        html_txt(path);
        html("</a>");
        html("'>");
        html_txt(path);
        html("</a>");

+       html_txt(fmt(" @ %.7s", rev));

        if (item && tail)
                path[len - 1] = tail;
 }
        if (item && tail)
                path[len - 1] = tail;
 }


@@ -669,7 +679,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());


@@ -726,7 +736,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;


@@ -838,7 +848,7 @@ static void print_header(struct cgit_context *ctx)
 
        html("<td class='main'>");
        if (ctx->repo) {
 
        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'>");


@@ -914,10 +924,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());


@@ -958,7 +968,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 &&