summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cgit.c b/cgit.c
index fedf355..6dddcbb 100644
--- a/cgit.c
+++ b/cgit.c
@@ -48,129 +48,129 @@ static int cgit_prepare_cache(struct cacheitem *item)
48 item->ttl = cgit_cache_repo_ttl; 48 item->ttl = cgit_cache_repo_ttl;
49 } else { 49 } else {
50 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 50 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
51 cgit_repo->url, cgit_query_page, 51 cgit_repo->url, cgit_query_page,
52 cache_safe_filename(cgit_querystring))); 52 cache_safe_filename(cgit_querystring)));
53 if (cgit_query_has_symref) 53 if (cgit_query_has_symref)
54 item->ttl = cgit_cache_dynamic_ttl; 54 item->ttl = cgit_cache_dynamic_ttl;
55 else if (cgit_query_has_sha1) 55 else if (cgit_query_has_sha1)
56 item->ttl = cgit_cache_static_ttl; 56 item->ttl = cgit_cache_static_ttl;
57 else 57 else
58 item->ttl = cgit_cache_repo_ttl; 58 item->ttl = cgit_cache_repo_ttl;
59 } 59 }
60 return 1; 60 return 1;
61} 61}
62 62
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_repo->snapshots && cgit_query_page && 82 if (cgit_repo->snapshots && cgit_query_page &&
83 !strcmp(cgit_query_page, "snapshot")) { 83 !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 88
89 if (cgit_query_page && !strcmp(cgit_query_page, "log")) 89 if (cgit_query_page && !strcmp(cgit_query_page, "log"))
90 show_search = 1; 90 show_search = 1;
91 91
92 cgit_print_docstart(title, item); 92 cgit_print_docstart(title, item);
93 93
94 94
95 if (!cgit_query_page) { 95 if (!cgit_query_page) {
96 cgit_print_pageheader("summary", show_search); 96 cgit_print_pageheader("summary", show_search);
97 cgit_print_summary(); 97 cgit_print_summary();
98 cgit_print_docend(); 98 cgit_print_docend();
99 return; 99 return;
100 } 100 }
101 101
102 cgit_print_pageheader(cgit_query_page, show_search); 102 cgit_print_pageheader(cgit_query_page, show_search);
103 103
104 if (!strcmp(cgit_query_page, "log")) { 104 if (!strcmp(cgit_query_page, "log")) {
105 cgit_print_log(cgit_query_head, cgit_query_ofs, 100, 105 cgit_print_log(cgit_query_head, cgit_query_ofs, 100,
106 cgit_query_search); 106 cgit_query_search);
107 } else if (!strcmp(cgit_query_page, "tree")) { 107 } else if (!strcmp(cgit_query_page, "tree")) {
108 cgit_print_tree(cgit_query_sha1, cgit_query_path); 108 cgit_print_tree(cgit_query_sha1, cgit_query_path);
109 } else if (!strcmp(cgit_query_page, "commit")) { 109 } else if (!strcmp(cgit_query_page, "commit")) {
110 cgit_print_commit(cgit_query_sha1); 110 cgit_print_commit(cgit_query_sha1);
111 } else if (!strcmp(cgit_query_page, "view")) { 111 } else if (!strcmp(cgit_query_page, "view")) {
112 cgit_print_view(cgit_query_sha1); 112 cgit_print_view(cgit_query_sha1, cgit_query_path);
113 } else if (!strcmp(cgit_query_page, "diff")) { 113 } else if (!strcmp(cgit_query_page, "diff")) {
114 cgit_print_diff(cgit_query_sha1, cgit_query_sha2); 114 cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
115 } else { 115 } else {
116 cgit_print_error("Invalid request"); 116 cgit_print_error("Invalid request");
117 } 117 }
118 cgit_print_docend(); 118 cgit_print_docend();
119} 119}
120 120
121static void cgit_fill_cache(struct cacheitem *item, int use_cache) 121static void cgit_fill_cache(struct cacheitem *item, int use_cache)
122{ 122{
123 static char buf[PATH_MAX]; 123 static char buf[PATH_MAX];
124 int stdout2; 124 int stdout2;
125 125
126 getcwd(buf, sizeof(buf)); 126 getcwd(buf, sizeof(buf));
127 item->st.st_mtime = time(NULL); 127 item->st.st_mtime = time(NULL);
128 128
129 if (use_cache) { 129 if (use_cache) {
130 stdout2 = chk_positive(dup(STDOUT_FILENO), 130 stdout2 = chk_positive(dup(STDOUT_FILENO),
131 "Preserving STDOUT"); 131 "Preserving STDOUT");
132 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 132 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
133 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 133 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
134 } 134 }
135 135
136 if (cgit_query_repo) 136 if (cgit_query_repo)
137 cgit_print_repo_page(item); 137 cgit_print_repo_page(item);
138 else 138 else
139 cgit_print_repolist(item); 139 cgit_print_repolist(item);
140 140
141 if (use_cache) { 141 if (use_cache) {
142 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 142 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
143 chk_positive(dup2(stdout2, STDOUT_FILENO), 143 chk_positive(dup2(stdout2, STDOUT_FILENO),
144 "Restoring original STDOUT"); 144 "Restoring original STDOUT");
145 chk_zero(close(stdout2), "Closing temporary STDOUT"); 145 chk_zero(close(stdout2), "Closing temporary STDOUT");
146 } 146 }
147 147
148 chdir(buf); 148 chdir(buf);
149} 149}
150 150
151static void cgit_check_cache(struct cacheitem *item) 151static void cgit_check_cache(struct cacheitem *item)
152{ 152{
153 int i = 0; 153 int i = 0;
154 154
155 top: 155 top:
156 if (++i > cgit_max_lock_attempts) { 156 if (++i > cgit_max_lock_attempts) {
157 die("cgit_refresh_cache: unable to lock %s: %s", 157 die("cgit_refresh_cache: unable to lock %s: %s",
158 item->name, strerror(errno)); 158 item->name, strerror(errno));
159 } 159 }
160 if (!cache_exist(item)) { 160 if (!cache_exist(item)) {
161 if (!cache_lock(item)) { 161 if (!cache_lock(item)) {
162 sleep(1); 162 sleep(1);
163 goto top; 163 goto top;
164 } 164 }
165 if (!cache_exist(item)) { 165 if (!cache_exist(item)) {
166 cgit_fill_cache(item, 1); 166 cgit_fill_cache(item, 1);
167 cache_unlock(item); 167 cache_unlock(item);
168 } else { 168 } else {
169 cache_cancel_lock(item); 169 cache_cancel_lock(item);
170 } 170 }
171 } else if (cache_expired(item) && cache_lock(item)) { 171 } else if (cache_expired(item) && cache_lock(item)) {
172 if (cache_expired(item)) { 172 if (cache_expired(item)) {
173 cgit_fill_cache(item, 1); 173 cgit_fill_cache(item, 1);
174 cache_unlock(item); 174 cache_unlock(item);
175 } else { 175 } else {
176 cache_cancel_lock(item); 176 cache_cancel_lock(item);