Add html_option() function

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index eb3d3ac6c64a3f2489f23aadb325e8fb97a86e30..d6bcec3cfefd21e16e7d4e37737c13ec0949915f 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -15,8 +15,9 @@ int header = 0;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
-       unsigned char *buf;
+       char *buf;
        unsigned long size, lineno, start, idx;
+       const char *linefmt = "<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>";
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
@@ -32,6 +33,10 @@ static void print_object(const unsigned char *sha1, char *path)
                return;
        }
 
+       html(" blob: <a href='");
+       html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       htmlf("'>%s</a>",sha1_to_hex(sha1));
+
        html("<table class='blob'>\n");
        idx = 0;
        start = 0;
@@ -39,15 +44,16 @@ static void print_object(const unsigned char *sha1, char *path)
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
-                       htmlf("<tr><td class='no'>%d</td><td class='txt'>",
-                             ++lineno);
+                       htmlf(linefmt, ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
-       html("\n</td></tr>\n");
+       htmlf(linefmt, ++lineno);
+       html_txt(buf + start);
+       html("</td></tr>\n");
        html("</table>\n");
 }
 
@@ -56,48 +62,46 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                   const char *pathname, unsigned int mode, int stage)
 {
        char *name;
+       char *fullpath;
        enum object_type type;
        unsigned long size = 0;
-       char *url, *qry;
 
        name = xstrdup(pathname);
+       fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
+                      cgit_query_path ? "/" : "", name);
+
        type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
+       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
                htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                      name,
                      sha1_to_hex(sha1));
                return 0;
        }
-       qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
-                 cgit_query_path ? cgit_query_path : "",
-                 cgit_query_path ? "/" : "", pathname);
-       url = cgit_pageurl(cgit_query_repo, "tree", qry);
-       html("<tr><td class='filemode'>");
+
+       html("<tr><td class='ls-mode'>");
        html_filemode(mode);
-       html("</td><td ");
-       if (S_ISDIRLNK(mode)) {
-               htmlf("class='ls-mod'><a href='");
+       html("</td><td>");
+       if (S_ISGITLINK(mode)) {
+               htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,
                              sha1_to_hex(sha1)));
+               html("'>");
+               html_txt(name);
+               html("</a>");
        } else if (S_ISDIR(mode)) {
-               html("class='ls-dir'><a href='");
-               html_attr(url);
+               cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+                              curr_rev, fullpath);
        } else {
-               html("class='ls-blob'><a href='");
-               html_attr(url);
+               cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+                              curr_rev, fullpath);
        }
-       htmlf("'>%s</a></td>", name);
-       htmlf("<td class='filesize'>%li</td>", size);
-
-       html("<td class='links'><a href='");
-       qry = fmt("h=%s&amp;path=%s%s%s", curr_rev,
-                 cgit_query_path ? cgit_query_path : "",
-                 cgit_query_path ? "/" : "", pathname);
-       url = cgit_pageurl(cgit_query_repo, "log", qry);
-       html_attr(url);
-       html("' class='button'>H</a></td>");
-       html("</tr>\n");
+       htmlf("</td><td class='ls-size'>%li</td>", size);
+
+       html("<td>");
+       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
+                     fullpath, 0);
+       html("</td></tr>\n");
        free(name);
        return 0;
 }
@@ -151,11 +155,9 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                strcpy(buffer+baselen, pathname);
                url = cgit_pageurl(cgit_query_repo, "tree",
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
-               htmlf(" / <a href='");
-               html_attr(url);
-               html("'>");
-               html_txt(xstrdup(pathname));
-               html("</a>");
+               html("/");
+               cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+                              curr_rev, buffer);
 
                if (strcmp(match_path, buffer))
                        return READ_TREE_RECURSIVE;