Add ofs argument to cgit_log_link and use it in ui-log.c

This fixes a bug in the prev/next links on the log page: when on the default
branch the links to prev/next page would contain h=(null).

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

6 files changed, 30 insertions, 16 deletions

diff --git a/cgit.h b/cgit.h
index ddb2fff..a59a370 100644
--- a/cgit.h
+++ b/cgit.h
@@ -177,60 +177,60 @@ extern char *fmt(const char *format,...);
 
 extern void html(const char *txt);
 extern void htmlf(const char *format,...);
 extern void html_txt(char *txt);
 extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
 extern void html_hidden(char *name, char *value);
 extern void html_link_open(char *url, char *title, char *class);
 extern void html_link_close(void);
 extern void html_filemode(unsigned short mode);
 extern int html_include(const char *filename);
 
 extern int cgit_read_config(const char *filename, configfn fn);
 extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
 
 extern char *cache_safe_filename(const char *unsafe);
 extern int cache_lock(struct cacheitem *item);
 extern int cache_unlock(struct cacheitem *item);
 extern int cache_cancel_lock(struct cacheitem *item);
 extern int cache_exist(struct cacheitem *item);
 extern int cache_expired(struct cacheitem *item);
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
 			  const char *query);
 
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
 			   char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
-			  char *rev, char *path);
+			  char *rev, char *path, int ofs);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
 			     char *rev);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
 			   char *new_rev, char *old_rev, char *path);
 
 extern void cgit_print_error(char *msg);
 extern void cgit_print_date(time_t secs, char *format);
 extern void cgit_print_age(time_t t, time_t max_relative, char *format);
 extern void cgit_print_docstart(char *title, struct cacheitem *item);
 extern void cgit_print_docend();
 extern void cgit_print_pageheader(char *title, int show_search);
 extern void cgit_print_snapshot_start(const char *mimetype,
 				      const char *filename,
 				      struct cacheitem *item);
 
 extern void cgit_print_repolist(struct cacheitem *item);
 extern void cgit_print_summary();
 extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, int pager);
 extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path);
 extern void cgit_print_tree(const char *rev, char *path);
 extern void cgit_print_commit(char *hex);
 extern void cgit_print_diff(const char *new_hex, const char *old_hex);
 extern void cgit_print_snapshot(struct cacheitem *item, const char *hex,
 				const char *format, const char *prefix,
 				const char *filename);
 
 #endif /* CGIT_H */
diff --git a/ui-log.c b/ui-log.c
index 95cb453..d38e40a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -84,47 +84,45 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path, i
 	html("<tr class='nohover'><th class='left'>Age</th>"
 	     "<th class='left'>Message</th>");
 
 	if (cgit_repo->enable_log_filecount) {
 		html("<th class='left'>Files</th>");
 		if (cgit_repo->enable_log_linecount)
 			html("<th class='left'>Lines</th>");
 	}
 	html("<th class='left'>Author</th></tr>\n");
 
 	if (ofs<0)
 		ofs = 0;
 
 	for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 
 	for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
 		print_commit(commit);
 		free(commit->buffer);
 		commit->buffer = NULL;
 		free_commit_list(commit->parents);
 		commit->parents = NULL;
 	}
 	html("</table>\n");
 
 	if (pager) {
 		html("<div class='pager'>");
 		if (ofs > 0) {
-			html("&nbsp;<a href='");
-			html(cgit_pageurl(cgit_query_repo, cgit_query_page,
-					  fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
-			html("'>[prev]</a>&nbsp;");
+			cgit_log_link("[prev]", NULL, NULL, cgit_query_head,
+				      cgit_query_sha1, cgit_query_path,
+				      ofs - cnt);
+			html("&nbsp;");
 		}
-
 		if ((commit = get_revision(&rev)) != NULL) {
-			html("&nbsp;<a href='");
-			html(cgit_pageurl(cgit_query_repo, "log",
-					  fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
-			html("'>[next]</a>&nbsp;");
+			cgit_log_link("[next]", NULL, NULL, cgit_query_head,
+				      cgit_query_sha1, cgit_query_path,
+				      ofs + cnt);
 		}
 		html("</div>");
 	}
 }
diff --git a/ui-repolist.c b/ui-repolist.c
index c735368..4c86543 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -69,41 +69,41 @@ void cgit_print_repolist(struct cacheitem *item)
 		html("<th>Links</th>");
 	html("</tr>\n");
 
 	for (i=0; i<cgit_repolist.count; i++) {
 		cgit_repo = &cgit_repolist.repos[i];
 		if ((last_group == NULL && cgit_repo->group != NULL) ||
 		    (last_group != NULL && cgit_repo->group == NULL) ||
 		    (last_group != NULL && cgit_repo->group != NULL &&
 		     strcmp(cgit_repo->group, last_group))) {
 			htmlf("<tr class='nohover'><td colspan='%d' class='repogroup'>",
 			      columns);
 			html_txt(cgit_repo->group);
 			html("</td></tr>");
 			last_group = cgit_repo->group;
 		}
 		htmlf("<tr><td class='%s'>",
 		      cgit_repo->group ? "sublevel-repo" : "toplevel-repo");
 		html_link_open(cgit_repourl(cgit_repo->url), NULL, NULL);
 		html_txt(cgit_repo->name);
 		html_link_close();
 		html("</td><td>");
 		html_ntxt(cgit_max_repodesc_len, cgit_repo->desc);
 		html("</td><td>");
 		html_txt(cgit_repo->owner);
 		html("</td><td>");
 		print_modtime(cgit_repo);
 		html("</td>");
 		if (cgit_enable_index_links) {
 			html("<td>");
 			html_link_open(cgit_repourl(cgit_repo->url),
 				       NULL, "button");
 			html("summary</a>");
-			cgit_log_link("log", NULL, "button", NULL, NULL, NULL);
+			cgit_log_link("log", NULL, "button", NULL, NULL, NULL, 0);
 			cgit_tree_link("tree", NULL, "button", NULL, NULL, NULL);
 			html("</td>");
 		}
 		html("</tr>\n");
 	}
 	html("</table>");
 	cgit_print_docend();
 }
diff --git a/ui-shared.c b/ui-shared.c
index 64c237f..bfcc2ac 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -134,67 +134,83 @@ static char *repolink(char *title, char *class, char *page, char *head,
 	if (head && strcmp(head, cgit_repo->defbranch)) {
 		html(delim);
 		html("h=");
 		html_attr(head);
 		delim = "&amp;";
 	}
 	return fmt("%s", delim);
 }
 
 static void reporevlink(char *page, char *name, char *title, char *class,
 			char *head, char *rev, char *path)
 {
 	char *delim;
 
 	delim = repolink(title, class, page, head, path);
 	if (rev && strcmp(rev, cgit_query_head)) {
 		html(delim);
 		html("id=");
 		html_attr(rev);
 	}
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
 void cgit_tree_link(char *name, char *title, char *class, char *head,
 		    char *rev, char *path)
 {
 	reporevlink("tree", name, title, class, head, rev, path);
 }
 
 void cgit_log_link(char *name, char *title, char *class, char *head,
-		   char *rev, char *path)
+		   char *rev, char *path, int ofs)
 {
-	reporevlink("log", name, title, class, head, rev, path);
+	char *delim;
+
+	delim = repolink(title, class, "log", head, path);
+	if (rev && strcmp(rev, cgit_query_head)) {
+		html(delim);
+		html("id=");
+		html_attr(rev);
+		delim = "&";
+	}
+	if (ofs > 0) {
+		html(delim);
+		html("ofs=");
+		htmlf("%d", ofs);
+	}
+	html("'>");
+	html_txt(name);
+	html("</a>");
 }
 
 void cgit_commit_link(char *name, char *title, char *class, char *head,
 		      char *rev)
 {
 	if (strlen(name) > cgit_max_msg_len && cgit_max_msg_len >= 15) {
 		name[cgit_max_msg_len] = '\0';
 		name[cgit_max_msg_len - 1] = '.';
 		name[cgit_max_msg_len - 2] = '.';
 		name[cgit_max_msg_len - 3] = '.';
 	}
 	reporevlink("commit", name, title, class, head, rev, NULL);
 }
 
 void cgit_diff_link(char *name, char *title, char *class, char *head,
 		    char *new_rev, char *old_rev, char *path)
 {
 	char *delim;
 
 	delim = repolink(title, class, "diff", head, path);
 	if (new_rev && strcmp(new_rev, cgit_query_head)) {
 		html(delim);
 		html("id=");
 		html_attr(new_rev);
 		delim = "&amp;";
 	}
 	if (old_rev) {
 		html(delim);
 		html("id2=");
 		html_attr(old_rev);
 	}
 	html("'>");
@@ -273,65 +289,65 @@ void cgit_print_docstart(char *title, struct cacheitem *item)
 	html("</head>\n");
 	html("<body>\n");
 }
 
 void cgit_print_docend()
 {
 	html("</td></tr></table>");
 	html("</body>\n</html>\n");
 }
 
 void cgit_print_pageheader(char *title, int show_search)
 {
 	html("<table id='layout'>");
 	html("<tr><td id='header'><a href='");
 	html_attr(cgit_rooturl());
 	html("'>");
 	html_txt(cgit_root_title);
 	html("</a></td><td id='logo'>");
 	html("<a href='");
 	html_attr(cgit_logo_link);
 	htmlf("'><img src='%s' alt='logo'/></a>", cgit_logo);
 	html("</td></tr>");
 	html("<tr><td id='crumb'>");
 	if (cgit_query_repo) {
 		html_txt(cgit_repo->name);
 		html(" (");
 		html_txt(cgit_query_head);
 		html(") : &nbsp;");
 		reporevlink(NULL, "summary", NULL, NULL, cgit_query_head,
 			    NULL, NULL);
 		html(" ");
 		cgit_log_link("log", NULL, NULL, cgit_query_head,
-			      cgit_query_sha1, cgit_query_path);
+			      cgit_query_sha1, cgit_query_path, 0);
 		html(" ");
 		cgit_tree_link("tree", NULL, NULL, cgit_query_head,
 			       cgit_query_sha1, NULL);
 		html(" ");
 		cgit_commit_link("commit", NULL, NULL, cgit_query_head,
 			      cgit_query_sha1);
 		html(" ");
 		cgit_diff_link("diff", NULL, NULL, cgit_query_head,
 			       cgit_query_sha1, cgit_query_sha2,
 			       cgit_query_path);
 	} else {
 		html_txt("Index of repositories");
 	}
 	html("</td>");
 	html("<td id='search'>");
 	if (show_search) {
 		html("<form method='get' action='");
 		html_attr(cgit_currurl());
 		html("'>");
 		if (!cgit_virtual_root) {
 			if (cgit_query_repo)
 				html_hidden("r", cgit_query_repo);
 			if (cgit_query_page)
 				html_hidden("p", cgit_query_page);
 		}
 		if (cgit_query_head)
 			html_hidden("h", cgit_query_head);
 		if (cgit_query_sha1)
 			html_hidden("id", cgit_query_sha1);
 		if (cgit_query_sha2)
 			html_hidden("id2", cgit_query_sha2);
 		html("<input type='text' name='q' value='");
diff --git a/ui-summary.c b/ui-summary.c
index 03dd078..b4bc6d8 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,62 +1,62 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 static int header;
 
 static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
 				int flags, void *cb_data)
 {
 	struct commit *commit;
 	struct commitinfo *info;
 	char buf[256];
 	char *ref;
 
 	ref = xstrdup(refname);
 	strncpy(buf, refname, sizeof(buf));
 	commit = lookup_commit(sha1);
 	// object is not really parsed at this point, because of some fallout
 	// from previous calls to git functions in cgit_print_log()
 	commit->object.parsed = 0;
 	if (commit && !parse_commit(commit)){
 		info = cgit_parse_commit(commit);
 		html("<tr><td>");
-		cgit_log_link(ref, NULL, NULL, ref, NULL, NULL);
+		cgit_log_link(ref, NULL, NULL, ref, NULL, NULL, 0);
 		html("</td><td>");
 		cgit_print_age(commit->date, -1, NULL);
 		html("</td><td>");
 		html_txt(info->author);
 		html("</td><td>");
 		cgit_commit_link(info->subject, NULL, NULL, ref, NULL);
 		html("</td></tr>\n");
 		cgit_free_commitinfo(info);
 	} else {
 		html("<tr><td>");
 		html_txt(buf);
 		html("</td><td colspan='3'>");
 		htmlf("*** bad ref %s ***", sha1_to_hex(sha1));
 		html("</td></tr>\n");
 	}
 	free(ref);
 	return 0;
 }
 
 
 static void cgit_print_object_ref(struct object *obj)
 {
 	char *page, *arg, *url;
 
 	if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s", sha1_to_hex(obj->sha1)), NULL, NULL,
 				 cgit_query_head, sha1_to_hex(obj->sha1));
 		return;
 	} else if (obj->type == OBJ_TREE) {
 		page = "tree";
 		arg = "id";
 	} else {
diff --git a/ui-tree.c b/ui-tree.c
index b6cb813..c5d64ff 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -64,65 +64,65 @@ 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)) {
 		htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
 		      name,
 		      sha1_to_hex(sha1));
 		return 0;
 	}
 
 	html("<tr><td class='ls-mode'>");
 	html_filemode(mode);
 	html("</td><td>");
 	if (S_ISDIRLNK(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)) {
 		cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
 			       curr_rev, fullpath);
 	} else {
 		cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
 			       curr_rev, fullpath);
 	}
 	htmlf("</td><td class='ls-size'>%li</td>", size);
 
 	html("<td>");
 	cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-		      fullpath);
+		      fullpath, 0);
 	html("</td></tr>\n");
 	free(name);
 	return 0;
 }
 
 static void ls_head()
 {
 	html("<table 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",