summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index 3d85a08..9e63d18 100644
--- a/cgit.c
+++ b/cgit.c
@@ -63,99 +63,100 @@ static int cgit_prepare_cache(struct cacheitem *item)
63static void cgit_print_repo_page(struct cacheitem *item) 63static void cgit_print_repo_page(struct cacheitem *item)
64{ 64{
65 char *title; 65 char *title;
66 int show_search; 66 int show_search;
67 67
68 if (chdir(cgit_repo->path)) { 68 if (chdir(cgit_repo->path)) {
69 title = fmt("%s - %s", cgit_root_title, "Bad request"); 69 title = fmt("%s - %s", cgit_root_title, "Bad request");
70 cgit_print_docstart(title, item); 70 cgit_print_docstart(title, item);
71 cgit_print_pageheader(title, 0); 71 cgit_print_pageheader(title, 0);
72 cgit_print_error(fmt("Unable to scan repository: %s", 72 cgit_print_error(fmt("Unable to scan repository: %s",
73 strerror(errno))); 73 strerror(errno)));
74 cgit_print_docend(); 74 cgit_print_docend();
75 return; 75 return;
76 } 76 }
77 77
78 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); 78 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
79 show_search = 0; 79 show_search = 0;
80 setenv("GIT_DIR", cgit_repo->path, 1); 80 setenv("GIT_DIR", cgit_repo->path, 1);
81 81
82 if (cgit_query_page) { 82 if (cgit_query_page) {
83 if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) { 83 if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
84 cgit_print_snapshot(item, cgit_query_sha1, "zip", 84 cgit_print_snapshot(item, cgit_query_sha1, "zip",
85 cgit_repo->url, cgit_query_name); 85 cgit_repo->url, cgit_query_name);
86 return; 86 return;
87 } 87 }
88 if (!strcmp(cgit_query_page, "blob")) { 88 if (!strcmp(cgit_query_page, "blob")) {
89 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 89 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
90 return; 90 return;
91 } 91 }
92 } 92 }
93 93
94 if (cgit_query_page && !strcmp(cgit_query_page, "log")) 94 if (cgit_query_page && !strcmp(cgit_query_page, "log"))
95 show_search = 1; 95 show_search = 1;
96 96
97 cgit_print_docstart(title, item); 97 cgit_print_docstart(title, item);
98 98
99 99
100 if (!cgit_query_page) { 100 if (!cgit_query_page) {
101 cgit_print_pageheader("summary", show_search); 101 cgit_print_pageheader("summary", show_search);
102 cgit_print_summary(); 102 cgit_print_summary();
103 cgit_print_docend(); 103 cgit_print_docend();
104 return; 104 return;
105 } 105 }
106 106
107 cgit_print_pageheader(cgit_query_page, show_search); 107 cgit_print_pageheader(cgit_query_page, show_search);
108 108
109 if (!strcmp(cgit_query_page, "log")) { 109 if (!strcmp(cgit_query_page, "log")) {
110 cgit_print_log(cgit_query_head, cgit_query_ofs, 110 cgit_print_log(cgit_query_head, cgit_query_ofs,
111 cgit_max_commit_count, cgit_query_search); 111 cgit_max_commit_count, cgit_query_search,
112 cgit_query_path);
112 } else if (!strcmp(cgit_query_page, "tree")) { 113 } else if (!strcmp(cgit_query_page, "tree")) {
113 cgit_print_tree(cgit_query_sha1, cgit_query_path); 114 cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
114 } else if (!strcmp(cgit_query_page, "commit")) { 115 } else if (!strcmp(cgit_query_page, "commit")) {
115 cgit_print_commit(cgit_query_sha1); 116 cgit_print_commit(cgit_query_sha1);
116 } else if (!strcmp(cgit_query_page, "view")) { 117 } else if (!strcmp(cgit_query_page, "view")) {
117 cgit_print_view(cgit_query_sha1, cgit_query_path); 118 cgit_print_view(cgit_query_sha1, cgit_query_path);
118 } else if (!strcmp(cgit_query_page, "diff")) { 119 } else if (!strcmp(cgit_query_page, "diff")) {
119 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); 120 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
120 } else { 121 } else {
121 cgit_print_error("Invalid request"); 122 cgit_print_error("Invalid request");
122 } 123 }
123 cgit_print_docend(); 124 cgit_print_docend();
124} 125}
125 126
126static void cgit_fill_cache(struct cacheitem *item, int use_cache) 127static void cgit_fill_cache(struct cacheitem *item, int use_cache)
127{ 128{
128 static char buf[PATH_MAX]; 129 static char buf[PATH_MAX];
129 int stdout2; 130 int stdout2;
130 131
131 getcwd(buf, sizeof(buf)); 132 getcwd(buf, sizeof(buf));
132 item->st.st_mtime = time(NULL); 133 item->st.st_mtime = time(NULL);
133 134
134 if (use_cache) { 135 if (use_cache) {
135 stdout2 = chk_positive(dup(STDOUT_FILENO), 136 stdout2 = chk_positive(dup(STDOUT_FILENO),
136 "Preserving STDOUT"); 137 "Preserving STDOUT");
137 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 138 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
138 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 139 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
139 } 140 }
140 141
141 if (cgit_query_repo) 142 if (cgit_query_repo)
142 cgit_print_repo_page(item); 143 cgit_print_repo_page(item);
143 else 144 else
144 cgit_print_repolist(item); 145 cgit_print_repolist(item);
145 146
146 if (use_cache) { 147 if (use_cache) {
147 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 148 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
148 chk_positive(dup2(stdout2, STDOUT_FILENO), 149 chk_positive(dup2(stdout2, STDOUT_FILENO),
149 "Restoring original STDOUT"); 150 "Restoring original STDOUT");
150 chk_zero(close(stdout2), "Closing temporary STDOUT"); 151 chk_zero(close(stdout2), "Closing temporary STDOUT");
151 } 152 }
152 153
153 chdir(buf); 154 chdir(buf);
154} 155}
155 156
156static void cgit_check_cache(struct cacheitem *item) 157static void cgit_check_cache(struct cacheitem *item)
157{ 158{
158 int i = 0; 159 int i = 0;
159 160
160 top: 161 top:
161 if (++i > cgit_max_lock_attempts) { 162 if (++i > cgit_max_lock_attempts) {