summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/cgit.c b/cgit.c
index b936a70..3fc90bf 100644
--- a/cgit.c
+++ b/cgit.c
@@ -42,130 +42,129 @@ static int cgit_prepare_cache(struct cacheitem *item)
42 item->ttl = cgit_cache_static_ttl; 42 item->ttl = cgit_cache_static_ttl;
43 else 43 else
44 item->ttl = cgit_cache_repo_ttl; 44 item->ttl = cgit_cache_repo_ttl;
45 } 45 }
46 return 1; 46 return 1;
47} 47}
48 48
49static void cgit_print_repo_page(struct cacheitem *item) 49static void cgit_print_repo_page(struct cacheitem *item)
50{ 50{
51 char *title; 51 char *title;
52 int show_search; 52 int show_search;
53 53
54 if (!cgit_query_head) 54 if (!cgit_query_head)
55 cgit_query_head = cgit_repo->defbranch; 55 cgit_query_head = cgit_repo->defbranch;
56 56
57 if (chdir(cgit_repo->path)) { 57 if (chdir(cgit_repo->path)) {
58 title = fmt("%s - %s", cgit_root_title, "Bad request"); 58 title = fmt("%s - %s", cgit_root_title, "Bad request");
59 cgit_print_docstart(title, item); 59 cgit_print_docstart(title, item);
60 cgit_print_pageheader(title, 0); 60 cgit_print_pageheader(title, 0);
61 cgit_print_error(fmt("Unable to scan repository: %s", 61 cgit_print_error(fmt("Unable to scan repository: %s",
62 strerror(errno))); 62 strerror(errno)));
63 cgit_print_docend(); 63 cgit_print_docend();
64 return; 64 return;
65 } 65 }
66 66
67 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc); 67 title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
68 show_search = 0; 68 show_search = 0;
69 setenv("GIT_DIR", cgit_repo->path, 1); 69 setenv("GIT_DIR", cgit_repo->path, 1);
70 70
71 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) { 71 if ((cgit_cmd == CMD_SNAPSHOT) && cgit_repo->snapshots) {
72 cgit_print_snapshot(item, cgit_query_sha1, "zip", 72 cgit_print_snapshot(item, cgit_query_sha1, "zip",
73 cgit_repo->url, cgit_query_name); 73 cgit_repo->url, cgit_query_name);
74 return; 74 return;
75 } 75 }
76 76
77 if (cgit_cmd == CMD_BLOB) { 77 if (cgit_cmd == CMD_BLOB) {
78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path); 78 cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
79 return; 79 return;
80 } 80 }
81 81
82 show_search = (cgit_cmd == CMD_LOG); 82 show_search = (cgit_cmd == CMD_LOG);
83 cgit_print_docstart(title, item); 83 cgit_print_docstart(title, item);
84 if (!cgit_cmd) { 84 if (!cgit_cmd) {
85 cgit_print_pageheader("summary", show_search); 85 cgit_print_pageheader("summary", show_search);
86 cgit_print_summary(); 86 cgit_print_summary();
87 cgit_print_docend(); 87 cgit_print_docend();
88 return; 88 return;
89 } 89 }
90 90
91 cgit_print_pageheader(cgit_query_page, show_search); 91 cgit_print_pageheader(cgit_query_page, show_search);
92 92
93 switch(cgit_cmd) { 93 switch(cgit_cmd) {
94 case CMD_LOG: 94 case CMD_LOG:
95 cgit_print_log(cgit_query_sha1, cgit_query_ofs, 95 cgit_print_log(cgit_query_sha1, cgit_query_ofs,
96 cgit_max_commit_count, cgit_query_search, 96 cgit_max_commit_count, cgit_query_search,
97 cgit_query_path, 1); 97 cgit_query_path, 1);
98 break; 98 break;
99 case CMD_TREE: 99 case CMD_TREE:
100 cgit_print_tree(cgit_query_sha1, cgit_query_path); 100 cgit_print_tree(cgit_query_sha1, cgit_query_path);
101 break; 101 break;
102 case CMD_COMMIT: 102 case CMD_COMMIT:
103 cgit_print_commit(cgit_query_sha1); 103 cgit_print_commit(cgit_query_sha1);
104 break; 104 break;
105 case CMD_DIFF: 105 case CMD_DIFF:
106 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, 106 cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
107 cgit_query_path);
108 break; 107 break;
109 default: 108 default:
110 cgit_print_error("Invalid request"); 109 cgit_print_error("Invalid request");
111 } 110 }
112 cgit_print_docend(); 111 cgit_print_docend();
113} 112}
114 113
115static void cgit_fill_cache(struct cacheitem *item, int use_cache) 114static void cgit_fill_cache(struct cacheitem *item, int use_cache)
116{ 115{
117 static char buf[PATH_MAX]; 116 static char buf[PATH_MAX];
118 int stdout2; 117 int stdout2;
119 118
120 getcwd(buf, sizeof(buf)); 119 getcwd(buf, sizeof(buf));
121 item->st.st_mtime = time(NULL); 120 item->st.st_mtime = time(NULL);
122 121
123 if (use_cache) { 122 if (use_cache) {
124 stdout2 = chk_positive(dup(STDOUT_FILENO), 123 stdout2 = chk_positive(dup(STDOUT_FILENO),
125 "Preserving STDOUT"); 124 "Preserving STDOUT");
126 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 125 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
127 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 126 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
128 } 127 }
129 128
130 if (cgit_repo) 129 if (cgit_repo)
131 cgit_print_repo_page(item); 130 cgit_print_repo_page(item);
132 else 131 else
133 cgit_print_repolist(item); 132 cgit_print_repolist(item);
134 133
135 if (use_cache) { 134 if (use_cache) {
136 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 135 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
137 chk_positive(dup2(stdout2, STDOUT_FILENO), 136 chk_positive(dup2(stdout2, STDOUT_FILENO),
138 "Restoring original STDOUT"); 137 "Restoring original STDOUT");
139 chk_zero(close(stdout2), "Closing temporary STDOUT"); 138 chk_zero(close(stdout2), "Closing temporary STDOUT");
140 } 139 }
141 140
142 chdir(buf); 141 chdir(buf);
143} 142}
144 143
145static void cgit_check_cache(struct cacheitem *item) 144static void cgit_check_cache(struct cacheitem *item)
146{ 145{
147 int i = 0; 146 int i = 0;
148 147
149 top: 148 top:
150 if (++i > cgit_max_lock_attempts) { 149 if (++i > cgit_max_lock_attempts) {
151 die("cgit_refresh_cache: unable to lock %s: %s", 150 die("cgit_refresh_cache: unable to lock %s: %s",
152 item->name, strerror(errno)); 151 item->name, strerror(errno));
153 } 152 }
154 if (!cache_exist(item)) { 153 if (!cache_exist(item)) {
155 if (!cache_lock(item)) { 154 if (!cache_lock(item)) {
156 sleep(1); 155 sleep(1);
157 goto top; 156 goto top;
158 } 157 }
159 if (!cache_exist(item)) { 158 if (!cache_exist(item)) {
160 cgit_fill_cache(item, 1); 159 cgit_fill_cache(item, 1);
161 cache_unlock(item); 160 cache_unlock(item);
162 } else { 161 } else {
163 cache_cancel_lock(item); 162 cache_cancel_lock(item);
164 } 163 }
165 } else if (cache_expired(item) && cache_lock(item)) { 164 } else if (cache_expired(item) && cache_lock(item)) {
166 if (cache_expired(item)) { 165 if (cache_expired(item)) {
167 cgit_fill_cache(item, 1); 166 cgit_fill_cache(item, 1);
168 cache_unlock(item); 167 cache_unlock(item);
169 } else { 168 } else {
170 cache_cancel_lock(item); 169 cache_cancel_lock(item);
171 } 170 }