Merge branch 'stable'

author: Lars Hjemli 2011-06-12 21:23:14 +0000
committer: Lars Hjemli 2011-06-12 21:23:14 +0000
commit: fb3b94710febc3fb456201ce3486d09f65d0946f (patch)
tree: 8e7c90302b305f7f4e476cc3023fdd8ed1c65d37
parent: Merge branch 'stable' (diff)
parent: ui-plain.c: fix html and links generated by print_dir() and print_dir_entry() (diff)
download: cgit-fb3b94710febc3fb456201ce3486d09f65d0946f.tar.gz
cgit-fb3b94710febc3fb456201ce3486d09f65d0946f.zip
1 files changed, 46 insertions, 19 deletions
diff --git a/ui-plain.c b/ui-plain.c
index 1b2b672..733db4d 100644
--- a/ui-plain.c
+++ b/ui-plain.c

@@ -52,30 +52,57 @@ static void print_object(const unsigned char *sha1, const char *path)
        match = 1;
 }
-static void print_dir(const unsigned char *sha1, const char *path,
+static char *buildpath(const char *base, int baselen, const char *path)
-                      const char *base)
 {
-        char *fullpath;
+        if (path[0])
-        if (path[0] || base[0])
+                return fmt("%.*s%s/", baselen, base, path);
-                fullpath = fmt("/%s%s/", base, path);
        else
-                fullpath = "/";
+                return fmt("%.*s/", baselen, base);
+}
+static void print_dir(const unsigned char *sha1, const char *base,
+                      int baselen, const char *path)
+{
+        char *fullpath, *slash;
+        size_t len;
+        fullpath = buildpath(base, baselen, path);
+        slash = (fullpath[0] == '/' ? "" : "/");
        ctx.page.etag = sha1_to_hex(sha1);
        cgit_print_http_headers(&ctx);
-        htmlf("<html><head><title>%s</title></head>\n<body>\n"
+        htmlf("<html><head><title>%s", slash);
-              " <h2>%s</h2>\n <ul>\n", fullpath, fullpath);
+        html_txt(fullpath);
-        if (path[0] || base[0])
+        htmlf("</title></head>\n<body>\n<h2>%s", slash);
-              html("  <li><a href=\"../\">../</a></li>\n");
+        html_txt(fullpath);
+        html("</h2>\n<ul>\n");
+        len = strlen(fullpath);
+        if (len > 1) {
+                fullpath[len - 1] = 0;
+                slash = strrchr(fullpath, '/');
+                if (slash)
+                        *(slash + 1) = 0;
+                else
+                        fullpath = NULL;
+                html("<li>");
+                cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                                fullpath);
+                html("</li>\n");
+        }
        match = 2;
 }
-static void print_dir_entry(const unsigned char *sha1, const char *path,
+static void print_dir_entry(const unsigned char *sha1, const char *base,
-                            unsigned mode)
+                            int baselen, const char *path, unsigned mode)
 {
-        const char *sep = "";
+        char *fullpath;
-        if (S_ISDIR(mode))
-                sep = "/";
+        fullpath = buildpath(base, baselen, path);
-        htmlf("  <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);
+        if (!S_ISDIR(mode))
+                fullpath[strlen(fullpath) - 1] = 0;
+        html("  <li>");
+        cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
+                        fullpath);
+        html("</li>\n");
        match = 2;
 }
@@ -92,12 +119,12 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
                if (S_ISREG(mode))
                        print_object(sha1, pathname);
                else if (S_ISDIR(mode)) {
-                        print_dir(sha1, pathname, base);
+                        print_dir(sha1, base, baselen, pathname);
                        return READ_TREE_RECURSIVE;
                }
        }
        else if (baselen > match_baselen)
-                print_dir_entry(sha1, pathname, mode);
+                print_dir_entry(sha1, base, baselen, pathname, mode);
        else if (S_ISDIR(mode))
                return READ_TREE_RECURSIVE;
@@ -134,7 +161,7 @@ void cgit_print_plain(struct cgit_context *ctx)
        if (!paths[0]) {
                paths[0] = "";
                match_baselen = -1;
-                print_dir(commit->tree->object.sha1, "", "");
+                print_dir(commit->tree->object.sha1, "", 0, "");
        }
        else
                match_baselen = basedir_len(paths[0]);
author	Lars Hjemli	2011-06-12 21:23:14 +0000
committer	Lars Hjemli	2011-06-12 21:23:14 +0000
commit	fb3b94710febc3fb456201ce3486d09f65d0946f (patch)
tree	8e7c90302b305f7f4e476cc3023fdd8ed1c65d37
parent	Merge branch 'stable' (diff)
parent	ui-plain.c: fix html and links generated by print_dir() and print_dir_entry() (diff)
download	cgit-fb3b94710febc3fb456201ce3486d09f65d0946f.tar.gz cgit-fb3b94710febc3fb456201ce3486d09f65d0946f.zip

diff --git a/ui-plain.c b/ui-plain.c index 1b2b672..733db4d 100644 --- a/ui-plain.c +++ b/ui-plain.c
@@ -52,30 +52,57 @@ static void print_object(const unsigned char sha1, const char path)
52	match = 1;	52	match = 1;
53	}	53	}
54		54
55	static void print_dir(const unsigned char sha1, const char path,	55	static char buildpath(const char base, int baselen, const char *path)
56	const char *base)
57	{	56	{
58	char *fullpath;	57	if (path[0])
59	if (path[0] \|\| base[0])	58	return fmt("%.*s%s/", baselen, base, path);
60	fullpath = fmt("/%s%s/", base, path);
61	else	59	else
62	fullpath = "/";	60	return fmt("%.*s/", baselen, base);
		61	}
		62
		63	static void print_dir(const unsigned char sha1, const char base,
		64	int baselen, const char *path)
		65	{
		66	char fullpath, slash;
		67	size_t len;
		68
		69	fullpath = buildpath(base, baselen, path);
		70	slash = (fullpath[0] == '/' ? "" : "/");
63	ctx.page.etag = sha1_to_hex(sha1);	71	ctx.page.etag = sha1_to_hex(sha1);
64	cgit_print_http_headers(&ctx);	72	cgit_print_http_headers(&ctx);
65	htmlf("<html><head><title>%s</title></head>\n<body>\n"	73	htmlf("<html><head><title>%s", slash);
66	" <h2>%s</h2>\n <ul>\n", fullpath, fullpath);	74	html_txt(fullpath);
67	if (path[0] \|\| base[0])	75	htmlf("</title></head>\n<body>\n<h2>%s", slash);
68	html(" <li><a href=\"../\">../</a></li>\n");	76	html_txt(fullpath);
		77	html("</h2>\n<ul>\n");
		78	len = strlen(fullpath);
		79	if (len > 1) {
		80	fullpath[len - 1] = 0;
		81	slash = strrchr(fullpath, '/');
		82	if (slash)
		83	*(slash + 1) = 0;
		84	else
		85	fullpath = NULL;
		86	html("<li>");
		87	cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
		88	fullpath);
		89	html("</li>\n");
		90	}
69	match = 2;	91	match = 2;
70	}	92	}
71		93
72	static void print_dir_entry(const unsigned char sha1, const char path,	94	static void print_dir_entry(const unsigned char sha1, const char base,
73	unsigned mode)	95	int baselen, const char *path, unsigned mode)
74	{	96	{
75	const char *sep = "";	97	char *fullpath;
76	if (S_ISDIR(mode))	98
77	sep = "/";	99	fullpath = buildpath(base, baselen, path);
78	htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep);	100	if (!S_ISDIR(mode))
		101	fullpath[strlen(fullpath) - 1] = 0;
		102	html(" <li>");
		103	cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
		104	fullpath);
		105	html("</li>\n");
79	match = 2;	106	match = 2;
80	}	107	}
81		108
@@ -92,12 +119,12 @@ static int walk_tree(const unsigned char sha1, const char base, int baselen,
92	if (S_ISREG(mode))	119	if (S_ISREG(mode))
93	print_object(sha1, pathname);	120	print_object(sha1, pathname);
94	else if (S_ISDIR(mode)) {	121	else if (S_ISDIR(mode)) {
95	print_dir(sha1, pathname, base);	122	print_dir(sha1, base, baselen, pathname);
96	return READ_TREE_RECURSIVE;	123	return READ_TREE_RECURSIVE;
97	}	124	}
98	}	125	}
99	else if (baselen > match_baselen)	126	else if (baselen > match_baselen)
100	print_dir_entry(sha1, pathname, mode);	127	print_dir_entry(sha1, base, baselen, pathname, mode);
101	else if (S_ISDIR(mode))	128	else if (S_ISDIR(mode))
102	return READ_TREE_RECURSIVE;	129	return READ_TREE_RECURSIVE;
103		130
@@ -134,7 +161,7 @@ void cgit_print_plain(struct cgit_context *ctx)
134	if (!paths[0]) {	161	if (!paths[0]) {
135	paths[0] = "";	162	paths[0] = "";
136	match_baselen = -1;	163	match_baselen = -1;
137	print_dir(commit->tree->object.sha1, "", "");	164	print_dir(commit->tree->object.sha1, "", 0, "");
138	}	165	}
139	else	166	else
140	match_baselen = basedir_len(paths[0]);	167	match_baselen = basedir_len(paths[0]);