|
diff --git a/cgit.c b/cgit.c index 1b85b15..cc18ed4 100644 --- a/ cgit.c+++ b/ cgit.c |
|
@@ -58,96 +58,99 @@ static void cgit_print_repo_page(struct cacheitem *item) |
58 | cgit_print_docstart(title, item); |
58 | cgit_print_docstart(title, item); |
59 | cgit_print_pageheader(title, 0); |
59 | cgit_print_pageheader(title, 0); |
60 | cgit_print_error(fmt("Unable to scan repository: %s", |
60 | cgit_print_error(fmt("Unable to scan repository: %s", |
61 | strerror(errno))); |
61 | strerror(errno))); |
62 | cgit_print_docend(); |
62 | cgit_print_docend(); |
63 | return; |
63 | return; |
64 | } |
64 | } |
65 | |
65 | |
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
66 | title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); |
67 | show_search = 0; |
67 | show_search = 0; |
68 | setenv("GIT_DIR", cgit_repo->path, 1); |
68 | setenv("GIT_DIR", cgit_repo->path, 1); |
69 | |
69 | |
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
70 | if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
71 | cgit_print_snapshot(item, cgit_query_head, cgit_query_sha1, |
72 | cgit_repobasename(cgit_repo->url), |
72 | cgit_repobasename(cgit_repo->url), |
73 | cgit_query_path, |
73 | cgit_query_path, |
74 | cgit_repo->snapshots ); |
74 | cgit_repo->snapshots ); |
75 | return; |
75 | return; |
76 | } |
76 | } |
77 | |
77 | |
78 | if (cgit_cmd == CMD_BLOB) { |
78 | if (cgit_cmd == CMD_BLOB) { |
79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
79 | cgit_print_blob(item, cgit_query_sha1, cgit_query_path); |
80 | return; |
80 | return; |
81 | } |
81 | } |
82 | |
82 | |
83 | show_search = (cgit_cmd == CMD_LOG); |
83 | show_search = (cgit_cmd == CMD_LOG); |
84 | cgit_print_docstart(title, item); |
84 | cgit_print_docstart(title, item); |
85 | if (!cgit_cmd) { |
85 | if (!cgit_cmd) { |
86 | cgit_print_pageheader("summary", show_search); |
86 | cgit_print_pageheader("summary", show_search); |
87 | cgit_print_summary(); |
87 | cgit_print_summary(); |
88 | cgit_print_docend(); |
88 | cgit_print_docend(); |
89 | return; |
89 | return; |
90 | } |
90 | } |
91 | |
91 | |
92 | cgit_print_pageheader(cgit_query_page, show_search); |
92 | cgit_print_pageheader(cgit_query_page, show_search); |
93 | |
93 | |
94 | switch(cgit_cmd) { |
94 | switch(cgit_cmd) { |
95 | case CMD_LOG: |
95 | case CMD_LOG: |
96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
96 | cgit_print_log(cgit_query_sha1, cgit_query_ofs, |
97 | cgit_max_commit_count, cgit_query_search, |
97 | cgit_max_commit_count, cgit_query_search, |
98 | cgit_query_path, 1); |
98 | cgit_query_path, 1); |
99 | break; |
99 | break; |
100 | case CMD_TREE: |
100 | case CMD_TREE: |
101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
101 | cgit_print_tree(cgit_query_sha1, cgit_query_path); |
102 | break; |
102 | break; |
103 | case CMD_COMMIT: |
103 | case CMD_COMMIT: |
104 | cgit_print_commit(cgit_query_sha1); |
104 | cgit_print_commit(cgit_query_sha1); |
105 | break; |
105 | break; |
| |
106 | case CMD_REFS: |
| |
107 | cgit_print_refs(); |
| |
108 | break; |
106 | case CMD_TAG: |
109 | case CMD_TAG: |
107 | cgit_print_tag(cgit_query_sha1); |
110 | cgit_print_tag(cgit_query_sha1); |
108 | break; |
111 | break; |
109 | case CMD_DIFF: |
112 | case CMD_DIFF: |
110 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
113 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path); |
111 | break; |
114 | break; |
112 | default: |
115 | default: |
113 | cgit_print_error("Invalid request"); |
116 | cgit_print_error("Invalid request"); |
114 | } |
117 | } |
115 | cgit_print_docend(); |
118 | cgit_print_docend(); |
116 | } |
119 | } |
117 | |
120 | |
118 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
121 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
119 | { |
122 | { |
120 | static char buf[PATH_MAX]; |
123 | static char buf[PATH_MAX]; |
121 | int stdout2; |
124 | int stdout2; |
122 | |
125 | |
123 | getcwd(buf, sizeof(buf)); |
126 | getcwd(buf, sizeof(buf)); |
124 | item->st.st_mtime = time(NULL); |
127 | item->st.st_mtime = time(NULL); |
125 | |
128 | |
126 | if (use_cache) { |
129 | if (use_cache) { |
127 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
130 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
128 | "Preserving STDOUT"); |
131 | "Preserving STDOUT"); |
129 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
132 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
130 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
133 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
131 | } |
134 | } |
132 | |
135 | |
133 | if (cgit_repo) |
136 | if (cgit_repo) |
134 | cgit_print_repo_page(item); |
137 | cgit_print_repo_page(item); |
135 | else |
138 | else |
136 | cgit_print_repolist(item); |
139 | cgit_print_repolist(item); |
137 | |
140 | |
138 | if (use_cache) { |
141 | if (use_cache) { |
139 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
142 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
140 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
143 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
141 | "Restoring original STDOUT"); |
144 | "Restoring original STDOUT"); |
142 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
145 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
143 | } |
146 | } |
144 | |
147 | |
145 | chdir(buf); |
148 | chdir(buf); |
146 | } |
149 | } |
147 | |
150 | |
148 | static void cgit_check_cache(struct cacheitem *item) |
151 | static void cgit_check_cache(struct cacheitem *item) |
149 | { |
152 | { |
150 | int i = 0; |
153 | int i = 0; |
151 | |
154 | |
152 | top: |
155 | top: |
153 | if (++i > cgit_max_lock_attempts) { |
156 | if (++i > cgit_max_lock_attempts) { |
|