X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c6cf3a424a0860d69b290254d9b19d35527b2d27..a2ddc10479ec463708e422ca5ce7ec02c22a7d02:/cgit.c

diff --git a/cgit.c b/cgit.c
index aee7ba3..9b4815d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -15,7 +15,7 @@ static struct repoinfo *cgit_get_repoinfo(char *url)
 {
 	int i;
 	struct repoinfo *repo;
-	
+
 	for (i=0; i<cgit_repolist.count; i++) {
 		repo = &cgit_repolist.repos[i];
 		if (!strcmp(repo->url, url))
@@ -43,12 +43,12 @@ static int cgit_prepare_cache(struct cacheitem *item)
 	}
 
 	if (!cgit_query_page) {
-		item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
+		item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root,
 			   cgit_repo->url));
 		item->ttl = cgit_cache_repo_ttl;
 	} else {
-		item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
-			   cgit_repo->url, cgit_query_page, 
+		item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
+			   cgit_repo->url, cgit_query_page,
 			   cache_safe_filename(cgit_querystring)));
 		if (cgit_query_has_symref)
 			item->ttl = cgit_cache_dynamic_ttl;
@@ -65,6 +65,9 @@ static void cgit_print_repo_page(struct cacheitem *item)
 	char *title;
 	int show_search;
 
+	if (!cgit_query_head)
+		cgit_query_head = cgit_repo->defbranch;
+
 	if (chdir(cgit_repo->path)) {
 		title = fmt("%s - %s", cgit_root_title, "Bad request");
 		cgit_print_docstart(title, item);
@@ -81,7 +84,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
 	if (cgit_query_page) {
 	    if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
-		cgit_print_snapshot(item, cgit_query_sha1, "zip", 
+		cgit_print_snapshot(item, cgit_query_sha1, "zip",
 				    cgit_repo->url, cgit_query_name);
 		return;
 	    }
@@ -108,15 +111,16 @@ static void cgit_print_repo_page(struct cacheitem *item)
 
 	if (!strcmp(cgit_query_page, "log")) {
 		cgit_print_log(cgit_query_head, cgit_query_ofs,
-			       cgit_max_commit_count, cgit_query_search);
+			       cgit_max_commit_count, cgit_query_search,
+			       cgit_query_path);
 	} else if (!strcmp(cgit_query_page, "tree")) {
-		cgit_print_tree(cgit_query_sha1, cgit_query_path);
+		cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
 	} else if (!strcmp(cgit_query_page, "commit")) {
-		cgit_print_commit(cgit_query_sha1);
+		cgit_print_commit(cgit_query_head);
 	} else if (!strcmp(cgit_query_page, "view")) {
 		cgit_print_view(cgit_query_sha1, cgit_query_path);
 	} else if (!strcmp(cgit_query_page, "diff")) {
-		cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
+		cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
 	} else {
 		cgit_print_error("Invalid request");
 	}
@@ -132,7 +136,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 	item->st.st_mtime = time(NULL);
 
 	if (use_cache) {
-		stdout2 = chk_positive(dup(STDOUT_FILENO), 
+		stdout2 = chk_positive(dup(STDOUT_FILENO),
 				       "Preserving STDOUT");
 		chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
 		chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
@@ -145,7 +149,7 @@ static void cgit_fill_cache(struct cacheitem *item, int use_cache)
 
 	if (use_cache) {
 		chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
-		chk_positive(dup2(stdout2, STDOUT_FILENO), 
+		chk_positive(dup2(stdout2, STDOUT_FILENO),
 			     "Restoring original STDOUT");
 		chk_zero(close(stdout2), "Closing temporary STDOUT");
 	}
@@ -242,7 +246,9 @@ int main(int argc, const char **argv)
 	cgit_repolist.count = 0;
 	cgit_repolist.repos = NULL;
 
-	cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
+	cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+	if (getenv("SCRIPT_NAME"))
+		cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
 	if (getenv("QUERY_STRING"))
 		cgit_querystring = xstrdup(getenv("QUERY_STRING"));
 	cgit_parse_args(argc, argv);