Use git-1.5.3.3

[cgit.git] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index 634132f8d4554647cc4a87e46ad6fcb3d899a2aa..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) {
@@ -43,14 +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'><a name='%d'>%1$d</a></td><td class='txt'>",
-                             ++lineno);
+                       htmlf(linefmt, ++lineno);
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
+       htmlf(linefmt, ++lineno);
+       html_txt(buf + start);
+       html("</td></tr>\n");
        html("</table>\n");
 }
 
@@ -68,7 +71,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
                       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));
@@ -78,7 +81,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        html("<tr><td class='ls-mode'>");
        html_filemode(mode);
        html("</td><td>");
-       if (S_ISDIRLNK(mode)) {
+       if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
                html_attr(fmt(cgit_repo->module_link,
                              name,