author | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-03-24 15:50:57 (UTC) |
commit | a4d1ca1dc6ff8171694d9e2280b6075a1beced0c (patch) (unidiff) | |
tree | 8ccfdd78b7fe61a54bf09c11a130cfbfa8ed50c8 /cgit.c | |
parent | c5984a9896b39748e61daf6e620483749654b102 (diff) | |
download | cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.zip cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.gz cgit-a4d1ca1dc6ff8171694d9e2280b6075a1beced0c.tar.bz2 |
Add ui-shared.h
This is finally a proper headerfile for the shared ui-functions which
used to reside in cgit.h
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,202 +1,203 @@ | |||
1 | /* cgit.c: cgi for the git scm | 1 | /* cgit.c: cgi for the git scm |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cmd.h" | 10 | #include "cmd.h" |
11 | #include "ui-shared.h" | ||
11 | 12 | ||
12 | static int cgit_prepare_cache(struct cacheitem *item) | 13 | static int cgit_prepare_cache(struct cacheitem *item) |
13 | { | 14 | { |
14 | if (!ctx.repo && ctx.qry.repo) { | 15 | if (!ctx.repo && ctx.qry.repo) { |
15 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, | 16 | ctx.page.title = fmt("%s - %s", ctx.cfg.root_title, |
16 | "Bad request"); | 17 | "Bad request"); |
17 | cgit_print_http_headers(&ctx); | 18 | cgit_print_http_headers(&ctx); |
18 | cgit_print_docstart(&ctx); | 19 | cgit_print_docstart(&ctx); |
19 | cgit_print_pageheader(&ctx); | 20 | cgit_print_pageheader(&ctx); |
20 | cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); | 21 | cgit_print_error(fmt("Unknown repo: %s", ctx.qry.repo)); |
21 | cgit_print_docend(); | 22 | cgit_print_docend(); |
22 | return 0; | 23 | return 0; |
23 | } | 24 | } |
24 | 25 | ||
25 | if (!ctx.repo) { | 26 | if (!ctx.repo) { |
26 | item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); | 27 | item->name = xstrdup(fmt("%s/index.html", ctx.cfg.cache_root)); |
27 | item->ttl = ctx.cfg.cache_root_ttl; | 28 | item->ttl = ctx.cfg.cache_root_ttl; |
28 | return 1; | 29 | return 1; |
29 | } | 30 | } |
30 | 31 | ||
31 | if (!cgit_cmd) { | 32 | if (!cgit_cmd) { |
32 | item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, | 33 | item->name = xstrdup(fmt("%s/%s/index.%s.html", ctx.cfg.cache_root, |
33 | cache_safe_filename(ctx.repo->url), | 34 | cache_safe_filename(ctx.repo->url), |
34 | cache_safe_filename(ctx.qry.raw))); | 35 | cache_safe_filename(ctx.qry.raw))); |
35 | item->ttl = ctx.cfg.cache_repo_ttl; | 36 | item->ttl = ctx.cfg.cache_repo_ttl; |
36 | } else { | 37 | } else { |
37 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, | 38 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", ctx.cfg.cache_root, |
38 | cache_safe_filename(ctx.repo->url), | 39 | cache_safe_filename(ctx.repo->url), |
39 | ctx.qry.page, | 40 | ctx.qry.page, |
40 | cache_safe_filename(ctx.qry.raw))); | 41 | cache_safe_filename(ctx.qry.raw))); |
41 | if (ctx.qry.has_symref) | 42 | if (ctx.qry.has_symref) |
42 | item->ttl = ctx.cfg.cache_dynamic_ttl; | 43 | item->ttl = ctx.cfg.cache_dynamic_ttl; |
43 | else if (ctx.qry.has_sha1) | 44 | else if (ctx.qry.has_sha1) |
44 | item->ttl = ctx.cfg.cache_static_ttl; | 45 | item->ttl = ctx.cfg.cache_static_ttl; |
45 | else | 46 | else |
46 | item->ttl = ctx.cfg.cache_repo_ttl; | 47 | item->ttl = ctx.cfg.cache_repo_ttl; |
47 | } | 48 | } |
48 | return 1; | 49 | return 1; |
49 | } | 50 | } |
50 | 51 | ||
51 | struct refmatch { | 52 | struct refmatch { |
52 | char *req_ref; | 53 | char *req_ref; |
53 | char *first_ref; | 54 | char *first_ref; |
54 | int match; | 55 | int match; |
55 | }; | 56 | }; |
56 | 57 | ||
57 | int find_current_ref(const char *refname, const unsigned char *sha1, | 58 | int find_current_ref(const char *refname, const unsigned char *sha1, |
58 | int flags, void *cb_data) | 59 | int flags, void *cb_data) |
59 | { | 60 | { |
60 | struct refmatch *info; | 61 | struct refmatch *info; |
61 | 62 | ||
62 | info = (struct refmatch *)cb_data; | 63 | info = (struct refmatch *)cb_data; |
63 | if (!strcmp(refname, info->req_ref)) | 64 | if (!strcmp(refname, info->req_ref)) |
64 | info->match = 1; | 65 | info->match = 1; |
65 | if (!info->first_ref) | 66 | if (!info->first_ref) |
66 | info->first_ref = xstrdup(refname); | 67 | info->first_ref = xstrdup(refname); |
67 | return info->match; | 68 | return info->match; |
68 | } | 69 | } |
69 | 70 | ||
70 | char *find_default_branch(struct cgit_repo *repo) | 71 | char *find_default_branch(struct cgit_repo *repo) |
71 | { | 72 | { |
72 | struct refmatch info; | 73 | struct refmatch info; |
73 | 74 | ||
74 | info.req_ref = repo->defbranch; | 75 | info.req_ref = repo->defbranch; |
75 | info.first_ref = NULL; | 76 | info.first_ref = NULL; |
76 | info.match = 0; | 77 | info.match = 0; |
77 | for_each_branch_ref(find_current_ref, &info); | 78 | for_each_branch_ref(find_current_ref, &info); |
78 | if (info.match) | 79 | if (info.match) |
79 | return info.req_ref; | 80 | return info.req_ref; |
80 | else | 81 | else |
81 | return info.first_ref; | 82 | return info.first_ref; |
82 | } | 83 | } |
83 | 84 | ||
84 | static int prepare_repo_cmd(struct cgit_context *ctx) | 85 | static int prepare_repo_cmd(struct cgit_context *ctx) |
85 | { | 86 | { |
86 | char *tmp; | 87 | char *tmp; |
87 | unsigned char sha1[20]; | 88 | unsigned char sha1[20]; |
88 | int nongit = 0; | 89 | int nongit = 0; |
89 | 90 | ||
90 | setenv("GIT_DIR", ctx->repo->path, 1); | 91 | setenv("GIT_DIR", ctx->repo->path, 1); |
91 | setup_git_directory_gently(&nongit); | 92 | setup_git_directory_gently(&nongit); |
92 | if (nongit) { | 93 | if (nongit) { |
93 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, | 94 | ctx->page.title = fmt("%s - %s", ctx->cfg.root_title, |
94 | "config error"); | 95 | "config error"); |
95 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); | 96 | tmp = fmt("Not a git repository: '%s'", ctx->repo->path); |
96 | ctx->repo = NULL; | 97 | ctx->repo = NULL; |
97 | cgit_print_http_headers(ctx); | 98 | cgit_print_http_headers(ctx); |
98 | cgit_print_docstart(ctx); | 99 | cgit_print_docstart(ctx); |
99 | cgit_print_pageheader(ctx); | 100 | cgit_print_pageheader(ctx); |
100 | cgit_print_error(tmp); | 101 | cgit_print_error(tmp); |
101 | cgit_print_docend(); | 102 | cgit_print_docend(); |
102 | return 1; | 103 | return 1; |
103 | } | 104 | } |
104 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); | 105 | ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc); |
105 | 106 | ||
106 | if (!ctx->qry.head) { | 107 | if (!ctx->qry.head) { |
107 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); | 108 | ctx->qry.head = xstrdup(find_default_branch(ctx->repo)); |
108 | ctx->repo->defbranch = ctx->qry.head; | 109 | ctx->repo->defbranch = ctx->qry.head; |
109 | } | 110 | } |
110 | 111 | ||
111 | if (!ctx->qry.head) { | 112 | if (!ctx->qry.head) { |
112 | cgit_print_http_headers(ctx); | 113 | cgit_print_http_headers(ctx); |
113 | cgit_print_docstart(ctx); | 114 | cgit_print_docstart(ctx); |
114 | cgit_print_pageheader(ctx); | 115 | cgit_print_pageheader(ctx); |
115 | cgit_print_error("Repository seems to be empty"); | 116 | cgit_print_error("Repository seems to be empty"); |
116 | cgit_print_docend(); | 117 | cgit_print_docend(); |
117 | return 1; | 118 | return 1; |
118 | } | 119 | } |
119 | 120 | ||
120 | if (get_sha1(ctx->qry.head, sha1)) { | 121 | if (get_sha1(ctx->qry.head, sha1)) { |
121 | tmp = xstrdup(ctx->qry.head); | 122 | tmp = xstrdup(ctx->qry.head); |
122 | ctx->qry.head = ctx->repo->defbranch; | 123 | ctx->qry.head = ctx->repo->defbranch; |
123 | cgit_print_http_headers(ctx); | 124 | cgit_print_http_headers(ctx); |
124 | cgit_print_docstart(ctx); | 125 | cgit_print_docstart(ctx); |
125 | cgit_print_pageheader(ctx); | 126 | cgit_print_pageheader(ctx); |
126 | cgit_print_error(fmt("Invalid branch: %s", tmp)); | 127 | cgit_print_error(fmt("Invalid branch: %s", tmp)); |
127 | cgit_print_docend(); | 128 | cgit_print_docend(); |
128 | return 1; | 129 | return 1; |
129 | } | 130 | } |
130 | return 0; | 131 | return 0; |
131 | } | 132 | } |
132 | 133 | ||
133 | static void process_request(struct cgit_context *ctx) | 134 | static void process_request(struct cgit_context *ctx) |
134 | { | 135 | { |
135 | struct cgit_cmd *cmd; | 136 | struct cgit_cmd *cmd; |
136 | 137 | ||
137 | cmd = cgit_get_cmd(ctx); | 138 | cmd = cgit_get_cmd(ctx); |
138 | if (!cmd) { | 139 | if (!cmd) { |
139 | ctx->page.title = "cgit error"; | 140 | ctx->page.title = "cgit error"; |
140 | ctx->repo = NULL; | 141 | ctx->repo = NULL; |
141 | cgit_print_http_headers(ctx); | 142 | cgit_print_http_headers(ctx); |
142 | cgit_print_docstart(ctx); | 143 | cgit_print_docstart(ctx); |
143 | cgit_print_pageheader(ctx); | 144 | cgit_print_pageheader(ctx); |
144 | cgit_print_error("Invalid request"); | 145 | cgit_print_error("Invalid request"); |
145 | cgit_print_docend(); | 146 | cgit_print_docend(); |
146 | return; | 147 | return; |
147 | } | 148 | } |
148 | 149 | ||
149 | if (cmd->want_repo && prepare_repo_cmd(ctx)) | 150 | if (cmd->want_repo && prepare_repo_cmd(ctx)) |
150 | return; | 151 | return; |
151 | 152 | ||
152 | if (cmd->want_layout) { | 153 | if (cmd->want_layout) { |
153 | cgit_print_http_headers(ctx); | 154 | cgit_print_http_headers(ctx); |
154 | cgit_print_docstart(ctx); | 155 | cgit_print_docstart(ctx); |
155 | cgit_print_pageheader(ctx); | 156 | cgit_print_pageheader(ctx); |
156 | } | 157 | } |
157 | 158 | ||
158 | cmd->fn(ctx); | 159 | cmd->fn(ctx); |
159 | 160 | ||
160 | if (cmd->want_layout) | 161 | if (cmd->want_layout) |
161 | cgit_print_docend(); | 162 | cgit_print_docend(); |
162 | } | 163 | } |
163 | 164 | ||
164 | static long ttl_seconds(long ttl) | 165 | static long ttl_seconds(long ttl) |
165 | { | 166 | { |
166 | if (ttl<0) | 167 | if (ttl<0) |
167 | return 60 * 60 * 24 * 365; | 168 | return 60 * 60 * 24 * 365; |
168 | else | 169 | else |
169 | return ttl * 60; | 170 | return ttl * 60; |
170 | } | 171 | } |
171 | 172 | ||
172 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 173 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
173 | { | 174 | { |
174 | int stdout2; | 175 | int stdout2; |
175 | 176 | ||
176 | if (use_cache) { | 177 | if (use_cache) { |
177 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 178 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
178 | "Preserving STDOUT"); | 179 | "Preserving STDOUT"); |
179 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 180 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
180 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 181 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
181 | } | 182 | } |
182 | 183 | ||
183 | ctx.page.modified = time(NULL); | 184 | ctx.page.modified = time(NULL); |
184 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); | 185 | ctx.page.expires = ctx.page.modified + ttl_seconds(item->ttl); |
185 | process_request(&ctx); | 186 | process_request(&ctx); |
186 | 187 | ||
187 | if (use_cache) { | 188 | if (use_cache) { |
188 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 189 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
189 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 190 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
190 | "Restoring original STDOUT"); | 191 | "Restoring original STDOUT"); |
191 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 192 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
192 | } | 193 | } |
193 | } | 194 | } |
194 | 195 | ||
195 | static void cgit_check_cache(struct cacheitem *item) | 196 | static void cgit_check_cache(struct cacheitem *item) |
196 | { | 197 | { |
197 | int i = 0; | 198 | int i = 0; |
198 | 199 | ||
199 | top: | 200 | top: |
200 | if (++i > ctx.cfg.max_lock_attempts) { | 201 | if (++i > ctx.cfg.max_lock_attempts) { |
201 | die("cgit_refresh_cache: unable to lock %s: %s", | 202 | die("cgit_refresh_cache: unable to lock %s: %s", |
202 | item->name, strerror(errno)); | 203 | item->name, strerror(errno)); |