]> git.cameronkatri.com Git - cgit.git/commitdiff
git.ckatri.com / cgit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 74ebf82)
ui-plain: print directory listings
authorMark Lodato <lodatom@gmail.com>
Sun, 31 Jan 2010 19:25:03 +0000 (14:25 -0500)
committerMark Lodato <lodatom@gmail.com>
Sun, 31 Jan 2010 22:10:00 +0000 (17:10 -0500)
When a user requests a plain view of a tree (as opposed to a blob),
print out a directory listing rather than giving a 404 Not Found.

Also, fix a segfault when ctx->qry.path is NULL - i.e, when /plain is
requested without a path.

Signed-off-by: Mark Lodato <lodatom@gmail.com>
ui-plain.c patch | blob | history

diff --git a/ui-plain.c b/ui-plain.c
index 8b0badd2c6554993db04c2b5cc4b7104d90ff1fa..da76406a9142c820625dd02bd53b0033ee6d1d83 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -52,6 +52,38 @@ static void print_object(const unsigned char *sha1, const char *path)
        match = 1;
 }
 
+static void print_dir(const unsigned char *sha1, const char *path,
+                     const char *base)
+{
+       char *fullpath;
+       if (path[0] || base[0])
+               fullpath = fmt("/%s%s/", base, path);
+       else
+               fullpath = "/";
+       ctx.page.etag = sha1_to_hex(sha1);
+       cgit_print_http_headers(&ctx);
+       htmlf("<html><head><title>%s</title></head>\n<body>\n"
+             " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
+       if (path[0] || base[0])
+             html("  <li><a href=\"../\">../</a></li>\n");
+       match = 2;
+}
+
+static void print_dir_entry(const unsigned char *sha1, const char *path,
+                           unsigned mode)
+{
+       const char *sep = "";
+       if (S_ISDIR(mode))
+               sep = "/";
+       htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
+       match = 2;
+}
+
+static void print_dir_tail(void)
+{
+       html(" </ul>\n</body></html>\n");
+}
+
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                     const char *pathname, unsigned mode, int stage,
                     void *cbdata)
@@ -59,7 +91,13 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        if (baselen == match_baselen) {
                if (S_ISREG(mode))
                        print_object(sha1, pathname);
+               else if (S_ISDIR(mode)) {
+                       print_dir(sha1, pathname, base);
+                       return READ_TREE_RECURSIVE;
+               }
        }
+       else if (baselen > match_baselen)
+               print_dir_entry(sha1, pathname, mode);
        else if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
 
@@ -93,8 +131,16 @@ void cgit_print_plain(struct cgit_context *ctx)
                html_status(404, "Not found", 0);
                return;
        }
-       match_baselen = basedir_len(paths[0]);
+       if (!paths[0]) {
+               paths[0] = "";
+               match_baselen = -1;
+               print_dir(commit->tree->object.sha1, "", "");
+       }
+       else
+               match_baselen = basedir_len(paths[0]);
        read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL);
        if (!match)
                html_status(404, "Not found", 0);
+       else if (match == 2)
+               print_dir_tail();
 }
A hyperfast web frontend for git repositories written in C.