ui-tree.c: do not add blank line when displaying blobs

Also, fix a related bug in the test-suite.

Noticed-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 3 insertions, 1 deletions

diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 0d62cc8..33f4eb0 100755
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -1,33 +1,33 @@
 #!/bin/sh
 
 . ./setup.sh
 
 prepare_tests "Check content on tree page"
 
 run_test 'generate bar/tree' 'cgit_url "bar/tree" >trash/tmp'
 run_test 'find file-1' 'grep -e "file-1" trash/tmp'
 run_test 'find file-50' 'grep -e "file-50" trash/tmp'
 
 run_test 'generate bar/tree/file-50' 'cgit_url "bar/tree/file-50" >trash/tmp'
 
 run_test 'find line 1' '
 	grep -e "<a id=.n1. name=.n1. href=.#n1.>1</a>" trash/tmp
 '
 
 run_test 'no line 2' '
-	grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
+	! grep -e "<a id=.n2. name=.n2. href=.#n2.>2</a>" trash/tmp
 '
 
 run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
 
 run_test 'verify a+b link' '
 	grep -e "/foo+bar/tree/a+b" trash/tmp
 '
 
 run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
 
 run_test 'verify a+b?h=1+2 link' '
 	grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
 '
 
 tests_done
diff --git a/ui-tree.c b/ui-tree.c
index 79332fc..4bf372a 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -1,223 +1,225 @@
 /* ui-tree.c: functions for tree output
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"
 
 char *curr_rev;
 char *match_path;
 int header = 0;
 
 static void print_object(const unsigned char *sha1, char *path)
 {
 	enum object_type type;
 	char *buf;
 	unsigned long size, lineno, start, idx;
 	const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";
 
 	type = sha1_object_info(sha1, &size);
 	if (type == OBJ_BAD) {
 		cgit_print_error(fmt("Bad object name: %s",
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
 		cgit_print_error(fmt("Error reading object %s",
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
 	html(" (");
 	cgit_plain_link("plain", NULL, NULL, ctx.qry.head,
 		        curr_rev, path);
 	htmlf(")<br/>blob: %s", sha1_to_hex(sha1));
 
 	html("<table summary='blob content' class='blob'>\n");
 	idx = 0;
 	start = 0;
 	lineno = 0;
 	while(idx < size) {
 		if (buf[idx] == '\n') {
 			buf[idx] = '\0';
 			htmlf(linefmt, ++lineno);
 			html_txt(buf + start);
 			html("</td></tr>\n");
 			start = idx + 1;
 		}
 		idx++;
 	}
+	if (start < idx) {
 	htmlf(linefmt, ++lineno);
 	html_txt(buf + start);
+	}
 	html("</td></tr>\n");
 	html("</table>\n");
 }
 
 
 static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 		   const char *pathname, unsigned int mode, int stage,
 		   void *cbdata)
 {
 	char *name;
 	char *fullpath;
 	enum object_type type;
 	unsigned long size = 0;
 
 	name = xstrdup(pathname);
 	fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
 		       ctx.qry.path ? "/" : "", name);
 
 	if (!S_ISGITLINK(mode)) {
 		type = sha1_object_info(sha1, &size);
 		if (type == OBJ_BAD) {
 			htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
 			      name,
 			      sha1_to_hex(sha1));
 			return 0;
 		}
 	}
 
 	html("<tr><td class='ls-mode'>");
 	cgit_print_filemode(mode);
 	html("</td><td>");
 	if (S_ISGITLINK(mode)) {
 		htmlf("<a class='ls-mod' href='");
 		html_attr(fmt(ctx.repo->module_link,
 			      name,
 			      sha1_to_hex(sha1)));
 		html("'>");
 		html_txt(name);
 		html("</a>");
 	} else if (S_ISDIR(mode)) {
 		cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,
 			       curr_rev, fullpath);
 	} else {
 		cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,
 			       curr_rev, fullpath);
 	}
 	htmlf("</td><td class='ls-size'>%li</td>", size);
 
 	html("<td>");
 	cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
 		      fullpath, 0, NULL, NULL);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
 }
 
 static void ls_head()
 {
 	html("<table summary='tree listing' class='list'>\n");
 	html("<tr class='nohover'>");
 	html("<th class='left'>Mode</th>");
 	html("<th class='left'>Name</th>");
 	html("<th class='right'>Size</th>");
 	html("<th/>");
 	html("</tr>\n");
 	header = 1;
 }
 
 static void ls_tail()
 {
 	if (!header)
 		return;
 	html("</table>\n");
 	header = 0;
 }
 
 static void ls_tree(const unsigned char *sha1, char *path)
 {
 	struct tree *tree;
 
 	tree = parse_tree_indirect(sha1);
 	if (!tree) {
 		cgit_print_error(fmt("Not a tree object: %s",
 				     sha1_to_hex(sha1)));
 		return;
 	}
 
 	ls_head();
 	read_tree_recursive(tree, "", 0, 1, NULL, ls_item, NULL);
 	ls_tail();
 }
 
 
 static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 		     const char *pathname, unsigned mode, int stage,
 		     void *cbdata)
 {
 	static int state;
 	static char buffer[PATH_MAX];
 	char *url;
 
 	if (state == 0) {
 		memcpy(buffer, base, baselen);
 		strcpy(buffer+baselen, pathname);
 		url = cgit_pageurl(ctx.qry.repo, "tree",
 				   fmt("h=%s&amp;path=%s", curr_rev, buffer));
 		html("/");
 		cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,
 			       curr_rev, buffer);
 
 		if (strcmp(match_path, buffer))
 			return READ_TREE_RECURSIVE;
 
 		if (S_ISDIR(mode)) {
 			state = 1;
 			ls_head();
 			return READ_TREE_RECURSIVE;
 		} else {
 			print_object(sha1, buffer);
 			return 0;
 		}
 	}
 	ls_item(sha1, base, baselen, pathname, mode, stage, NULL);
 	return 0;
 }
 
 
 /*
  * Show a tree or a blob
  *   rev:  the commit pointing at the root tree object
  *   path: path to tree or blob
  */
 void cgit_print_tree(const char *rev, char *path)
 {
 	unsigned char sha1[20];
 	struct commit *commit;
 	const char *paths[] = {path, NULL};
 
 	if (!rev)
 		rev = ctx.qry.head;
 
 	curr_rev = xstrdup(rev);
 	if (get_sha1(rev, sha1)) {
 		cgit_print_error(fmt("Invalid revision name: %s", rev));
 		return;
 	}
 	commit = lookup_commit_reference(sha1);
 	if (!commit || parse_commit(commit)) {
 		cgit_print_error(fmt("Invalid commit reference: %s", rev));
 		return;
 	}
 
 	html("path: <a href='");
 	html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));
 	html("'>root</a>");
 
 	if (path == NULL) {
 		ls_tree(commit->tree->object.sha1, NULL);
 		return;
 	}
 
 	match_path = path;
 	read_tree_recursive(commit->tree, NULL, 0, 0, paths, walk_tree, NULL);
 	ls_tail();
 }