1 files changed, 18 insertions, 24 deletions

diff --git a/ui-shared.c b/ui-shared.c
index 88dd6b8..a03661a 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -60,21 +60,19 @@ char *cgit_repourl(const char *reponame)
 char *cgit_fileurl(const char *reponame, const char *pagename,
 		   const char *filename, const char *query)
 {
-	char *tmp;
-	char *delim;
-
 	if (cgit_virtual_root) {
-		tmp = fmt("%s/%s/%s/%s", cgit_virtual_root, reponame,
-			  pagename, (filename ? filename:""));
-		delim = "?";
+		if (query)
+			return fmt("%s/%s/%s/%s?%s", cgit_virtual_root, reponame,
+				   pagename, filename?filename:"", query);
+		else
+			return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
+				   pagename);
 	} else {
-		tmp = fmt("?url=%s/%s/%s", reponame, pagename,
-			  (filename ? filename : ""));
-		delim = "&";
+		if (query)
+			return fmt("?r=%s&p=%s&%s", reponame, pagename, query);
+		else
+			return fmt("?r=%s&p=%s", reponame, pagename);
 	}
-	if (query)
-		tmp = fmt("%s%s%s", tmp, delim, query);
-	return tmp;
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
@@ -423,15 +421,13 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
 	return 0;
 }
 
-void add_hidden_formfields(int incl_head, int incl_search, char *page)
+void add_hidden_formfields(int incl_head, int incl_search)
 {
-	char *url;
-
 	if (!cgit_virtual_root) {
-		url = fmt("%s/%s", cgit_query_repo, page);
-		if (cgit_query_path)
-			url = fmt("%s/%s", url, cgit_query_path);
-		html_hidden("url", url);
+		if (cgit_query_repo)
+			html_hidden("r", cgit_query_repo);
+		if (cgit_query_page)
+			html_hidden("p", cgit_query_page);
 	}
 
 	if (incl_head && strcmp(cgit_query_head, cgit_repo->defbranch))
@@ -487,7 +483,7 @@ void cgit_print_pageheader(char *title, int show_search)
 
 		html("<p>\n<h1>branch</h1>\n");
 		html("<form method='get' action=''>\n");
-		add_hidden_formfields(0, 1, cgit_query_page);
+		add_hidden_formfields(0, 1);
 		html("<select name='h' onchange='this.form.submit();'>\n");
 		for_each_branch_ref(print_branch_option, cgit_query_head);
 		html("</select>\n");
@@ -495,11 +491,9 @@ void cgit_print_pageheader(char *title, int show_search)
 
 		html("<p>\n<h1>search</h1>\n");
 		html("<form method='get' action='");
-		if (cgit_virtual_root)
-			html_attr(cgit_fileurl(cgit_query_repo, "log",
-					       cgit_query_path, NULL));
+		html_attr(cgit_pageurl(cgit_query_repo, "log", NULL));
 		html("'>\n");
-		add_hidden_formfields(1, 0, "log");
+		add_hidden_formfields(1, 0);
 		html("<select name='qt'>\n");
 		html_option("grep", "log msg", cgit_query_grep);
 		html_option("author", "author", cgit_query_grep);