summaryrefslogtreecommitdiffabout
path: root/cgit.c
Unidiff
Diffstat (limited to 'cgit.c') (more/less context) (show whitespace changes)
-rw-r--r--cgit.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/cgit.c b/cgit.c
index 34e590e..1c213c7 100644
--- a/cgit.c
+++ b/cgit.c
@@ -52,104 +52,101 @@ static void cgit_print_repo_page(struct cacheitem *item)
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_head, cgit_query_ofs, 95 cgit_print_log(cgit_query_head, 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_head, 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_head); 103 cgit_print_commit(cgit_query_head);
104 break; 104 break;
105 case CMD_VIEW:
106 cgit_print_view(cgit_query_sha1, cgit_query_path);
107 break;
108 case CMD_DIFF: 105 case CMD_DIFF:
109 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2, 106 cgit_print_diff(cgit_query_head, cgit_query_sha1, cgit_query_sha2,
110 cgit_query_path); 107 cgit_query_path);
111 break; 108 break;
112 default: 109 default:
113 cgit_print_error("Invalid request"); 110 cgit_print_error("Invalid request");
114 } 111 }
115 cgit_print_docend(); 112 cgit_print_docend();
116} 113}
117 114
118static void cgit_fill_cache(struct cacheitem *item, int use_cache) 115static void cgit_fill_cache(struct cacheitem *item, int use_cache)
119{ 116{
120 static char buf[PATH_MAX]; 117 static char buf[PATH_MAX];
121 int stdout2; 118 int stdout2;
122 119
123 getcwd(buf, sizeof(buf)); 120 getcwd(buf, sizeof(buf));
124 item->st.st_mtime = time(NULL); 121 item->st.st_mtime = time(NULL);
125 122
126 if (use_cache) { 123 if (use_cache) {
127 stdout2 = chk_positive(dup(STDOUT_FILENO), 124 stdout2 = chk_positive(dup(STDOUT_FILENO),
128 "Preserving STDOUT"); 125 "Preserving STDOUT");
129 chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); 126 chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
130 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); 127 chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
131 } 128 }
132 129
133 if (cgit_repo) 130 if (cgit_repo)
134 cgit_print_repo_page(item); 131 cgit_print_repo_page(item);
135 else 132 else
136 cgit_print_repolist(item); 133 cgit_print_repolist(item);
137 134
138 if (use_cache) { 135 if (use_cache) {
139 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); 136 chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
140 chk_positive(dup2(stdout2, STDOUT_FILENO), 137 chk_positive(dup2(stdout2, STDOUT_FILENO),
141 "Restoring original STDOUT"); 138 "Restoring original STDOUT");
142 chk_zero(close(stdout2), "Closing temporary STDOUT"); 139 chk_zero(close(stdout2), "Closing temporary STDOUT");
143 } 140 }
144 141
145 chdir(buf); 142 chdir(buf);
146} 143}
147 144
148static void cgit_check_cache(struct cacheitem *item) 145static void cgit_check_cache(struct cacheitem *item)
149{ 146{
150 int i = 0; 147 int i = 0;
151 148
152 top: 149 top:
153 if (++i > cgit_max_lock_attempts) { 150 if (++i > cgit_max_lock_attempts) {
154 die("cgit_refresh_cache: unable to lock %s: %s", 151 die("cgit_refresh_cache: unable to lock %s: %s",
155 item->name, strerror(errno)); 152 item->name, strerror(errno));