author | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:53:02 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-06-17 12:53:02 (UTC) |
commit | 42a7eb9c73457319a3fd5441ff26046fc9b31dad (patch) (unidiff) | |
tree | 4771b955e031005e7c222ef0cbabb719f7cd003a /cgit.c | |
parent | 48c487d72daef7e71683a85f775db8d36ab20341 (diff) | |
download | cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.zip cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.tar.gz cgit-42a7eb9c73457319a3fd5441ff26046fc9b31dad.tar.bz2 |
Add cgit_commit_link() + support for id=sha1 to commit view
This adds a function to generate links to the commit page and extends said
page to use id from querystring as primary revision specified (fallback to
h).
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,193 +7,193 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | const char cgit_version[] = CGIT_VERSION; | 11 | const char cgit_version[] = CGIT_VERSION; |
12 | 12 | ||
13 | 13 | ||
14 | static int cgit_prepare_cache(struct cacheitem *item) | 14 | static int cgit_prepare_cache(struct cacheitem *item) |
15 | { | 15 | { |
16 | if (!cgit_repo && cgit_query_repo) { | 16 | if (!cgit_repo && cgit_query_repo) { |
17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
18 | cgit_print_docstart(title, item); | 18 | cgit_print_docstart(title, item); |
19 | cgit_print_pageheader(title, 0); | 19 | cgit_print_pageheader(title, 0); |
20 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); | 20 | cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo)); |
21 | cgit_print_docend(); | 21 | cgit_print_docend(); |
22 | return 0; | 22 | return 0; |
23 | } | 23 | } |
24 | 24 | ||
25 | if (!cgit_repo) { | 25 | if (!cgit_repo) { |
26 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 26 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
27 | item->ttl = cgit_cache_root_ttl; | 27 | item->ttl = cgit_cache_root_ttl; |
28 | return 1; | 28 | return 1; |
29 | } | 29 | } |
30 | 30 | ||
31 | if (!cgit_cmd) { | 31 | if (!cgit_cmd) { |
32 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, | 32 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
33 | cache_safe_filename(cgit_repo->url))); | 33 | cache_safe_filename(cgit_repo->url))); |
34 | item->ttl = cgit_cache_repo_ttl; | 34 | item->ttl = cgit_cache_repo_ttl; |
35 | } else { | 35 | } else { |
36 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 36 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
37 | cache_safe_filename(cgit_repo->url), cgit_query_page, | 37 | cache_safe_filename(cgit_repo->url), cgit_query_page, |
38 | cache_safe_filename(cgit_querystring))); | 38 | cache_safe_filename(cgit_querystring))); |
39 | if (cgit_query_has_symref) | 39 | if (cgit_query_has_symref) |
40 | item->ttl = cgit_cache_dynamic_ttl; | 40 | item->ttl = cgit_cache_dynamic_ttl; |
41 | else if (cgit_query_has_sha1) | 41 | else if (cgit_query_has_sha1) |
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 | ||
49 | static void cgit_print_repo_page(struct cacheitem *item) | 49 | static 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_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_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_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_head, cgit_query_sha1, cgit_query_sha2, |
107 | cgit_query_path); | 107 | cgit_query_path); |
108 | break; | 108 | break; |
109 | default: | 109 | default: |
110 | cgit_print_error("Invalid request"); | 110 | cgit_print_error("Invalid request"); |
111 | } | 111 | } |
112 | cgit_print_docend(); | 112 | cgit_print_docend(); |
113 | } | 113 | } |
114 | 114 | ||
115 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) | 115 | static void cgit_fill_cache(struct cacheitem *item, int use_cache) |
116 | { | 116 | { |
117 | static char buf[PATH_MAX]; | 117 | static char buf[PATH_MAX]; |
118 | int stdout2; | 118 | int stdout2; |
119 | 119 | ||
120 | getcwd(buf, sizeof(buf)); | 120 | getcwd(buf, sizeof(buf)); |
121 | item->st.st_mtime = time(NULL); | 121 | item->st.st_mtime = time(NULL); |
122 | 122 | ||
123 | if (use_cache) { | 123 | if (use_cache) { |
124 | stdout2 = chk_positive(dup(STDOUT_FILENO), | 124 | stdout2 = chk_positive(dup(STDOUT_FILENO), |
125 | "Preserving STDOUT"); | 125 | "Preserving STDOUT"); |
126 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); | 126 | chk_zero(close(STDOUT_FILENO), "Closing STDOUT"); |
127 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); | 127 | chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)"); |
128 | } | 128 | } |
129 | 129 | ||
130 | if (cgit_repo) | 130 | if (cgit_repo) |
131 | cgit_print_repo_page(item); | 131 | cgit_print_repo_page(item); |
132 | else | 132 | else |
133 | cgit_print_repolist(item); | 133 | cgit_print_repolist(item); |
134 | 134 | ||
135 | if (use_cache) { | 135 | if (use_cache) { |
136 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); | 136 | chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT"); |
137 | chk_positive(dup2(stdout2, STDOUT_FILENO), | 137 | chk_positive(dup2(stdout2, STDOUT_FILENO), |
138 | "Restoring original STDOUT"); | 138 | "Restoring original STDOUT"); |
139 | chk_zero(close(stdout2), "Closing temporary STDOUT"); | 139 | chk_zero(close(stdout2), "Closing temporary STDOUT"); |
140 | } | 140 | } |
141 | 141 | ||
142 | chdir(buf); | 142 | chdir(buf); |
143 | } | 143 | } |
144 | 144 | ||
145 | static void cgit_check_cache(struct cacheitem *item) | 145 | static void cgit_check_cache(struct cacheitem *item) |
146 | { | 146 | { |
147 | int i = 0; | 147 | int i = 0; |
148 | 148 | ||
149 | top: | 149 | top: |
150 | if (++i > cgit_max_lock_attempts) { | 150 | if (++i > cgit_max_lock_attempts) { |
151 | die("cgit_refresh_cache: unable to lock %s: %s", | 151 | die("cgit_refresh_cache: unable to lock %s: %s", |
152 | item->name, strerror(errno)); | 152 | item->name, strerror(errno)); |
153 | } | 153 | } |
154 | if (!cache_exist(item)) { | 154 | if (!cache_exist(item)) { |
155 | if (!cache_lock(item)) { | 155 | if (!cache_lock(item)) { |
156 | sleep(1); | 156 | sleep(1); |
157 | goto top; | 157 | goto top; |
158 | } | 158 | } |
159 | if (!cache_exist(item)) { | 159 | if (!cache_exist(item)) { |
160 | cgit_fill_cache(item, 1); | 160 | cgit_fill_cache(item, 1); |
161 | cache_unlock(item); | 161 | cache_unlock(item); |
162 | } else { | 162 | } else { |
163 | cache_cancel_lock(item); | 163 | cache_cancel_lock(item); |
164 | } | 164 | } |
165 | } else if (cache_expired(item) && cache_lock(item)) { | 165 | } else if (cache_expired(item) && cache_lock(item)) { |
166 | if (cache_expired(item)) { | 166 | if (cache_expired(item)) { |
167 | cgit_fill_cache(item, 1); | 167 | cgit_fill_cache(item, 1); |
168 | cache_unlock(item); | 168 | cache_unlock(item); |
169 | } else { | 169 | } else { |
170 | cache_cancel_lock(item); | 170 | cache_cancel_lock(item); |
171 | } | 171 | } |
172 | } | 172 | } |
173 | } | 173 | } |
174 | 174 | ||
175 | static void cgit_print_cache(struct cacheitem *item) | 175 | static void cgit_print_cache(struct cacheitem *item) |
176 | { | 176 | { |
177 | static char buf[4096]; | 177 | static char buf[4096]; |
178 | ssize_t i; | 178 | ssize_t i; |
179 | 179 | ||
180 | int fd = open(item->name, O_RDONLY); | 180 | int fd = open(item->name, O_RDONLY); |
181 | if (fd<0) | 181 | if (fd<0) |
182 | die("Unable to open cached file %s", item->name); | 182 | die("Unable to open cached file %s", item->name); |
183 | 183 | ||
184 | while((i=read(fd, buf, sizeof(buf))) > 0) | 184 | while((i=read(fd, buf, sizeof(buf))) > 0) |
185 | write(STDOUT_FILENO, buf, i); | 185 | write(STDOUT_FILENO, buf, i); |
186 | 186 | ||
187 | close(fd); | 187 | close(fd); |
188 | } | 188 | } |
189 | 189 | ||
190 | static void cgit_parse_args(int argc, const char **argv) | 190 | static void cgit_parse_args(int argc, const char **argv) |
191 | { | 191 | { |
192 | int i; | 192 | int i; |
193 | 193 | ||
194 | for (i = 1; i < argc; i++) { | 194 | for (i = 1; i < argc; i++) { |
195 | if (!strncmp(argv[i], "--cache=", 8)) { | 195 | if (!strncmp(argv[i], "--cache=", 8)) { |
196 | cgit_cache_root = xstrdup(argv[i]+8); | 196 | cgit_cache_root = xstrdup(argv[i]+8); |
197 | } | 197 | } |
198 | if (!strcmp(argv[i], "--nocache")) { | 198 | if (!strcmp(argv[i], "--nocache")) { |
199 | cgit_nocache = 1; | 199 | cgit_nocache = 1; |