author | Lars Hjemli <hjemli@gmail.com> | 2006-12-10 21:41:14 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-10 21:41:14 (UTC) |
commit | 7640d90b73c01b16bb04ce4c541f52cbaae5f82a (patch) (unidiff) | |
tree | a0ec3e5222dbb0cff965487def39f5781e5cb231 | |
parent | 25105d7ecaba474d4b7c364ebb586aac3dfc5abb (diff) | |
download | cgit-7640d90b73c01b16bb04ce4c541f52cbaae5f82a.zip cgit-7640d90b73c01b16bb04ce4c541f52cbaae5f82a.tar.gz cgit-7640d90b73c01b16bb04ce4c541f52cbaae5f82a.tar.bz2 |
Add license file and copyright notices
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | COPYING | 340 | ||||
-rw-r--r-- | cache.c | 8 | ||||
-rw-r--r-- | cgit.c | 8 | ||||
-rw-r--r-- | config.c | 8 | ||||
-rw-r--r-- | html.c | 8 |
5 files changed, 372 insertions, 0 deletions
@@ -0,0 +1,340 @@ | |||
1 | GNU GENERAL PUBLIC LICENSE | ||
2 | Version 2, June 1991 | ||
3 | |||
4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc. | ||
5 | 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
6 | Everyone is permitted to copy and distribute verbatim copies | ||
7 | of this license document, but changing it is not allowed. | ||
8 | |||
9 | Preamble | ||
10 | |||
11 | The licenses for most software are designed to take away your | ||
12 | freedom to share and change it. By contrast, the GNU General Public | ||
13 | License is intended to guarantee your freedom to share and change free | ||
14 | software--to make sure the software is free for all its users. This | ||
15 | General Public License applies to most of the Free Software | ||
16 | Foundation's software and to any other program whose authors commit to | ||
17 | using it. (Some other Free Software Foundation software is covered by | ||
18 | the GNU Library General Public License instead.) You can apply it to | ||
19 | your programs, too. | ||
20 | |||
21 | When we speak of free software, we are referring to freedom, not | ||
22 | price. Our General Public Licenses are designed to make sure that you | ||
23 | have the freedom to distribute copies of free software (and charge for | ||
24 | this service if you wish), that you receive source code or can get it | ||
25 | if you want it, that you can change the software or use pieces of it | ||
26 | in new free programs; and that you know you can do these things. | ||
27 | |||
28 | To protect your rights, we need to make restrictions that forbid | ||
29 | anyone to deny you these rights or to ask you to surrender the rights. | ||
30 | These restrictions translate to certain responsibilities for you if you | ||
31 | distribute copies of the software, or if you modify it. | ||
32 | |||
33 | For example, if you distribute copies of such a program, whether | ||
34 | gratis or for a fee, you must give the recipients all the rights that | ||
35 | you have. You must make sure that they, too, receive or can get the | ||
36 | source code. And you must show them these terms so they know their | ||
37 | rights. | ||
38 | |||
39 | We protect your rights with two steps: (1) copyright the software, and | ||
40 | (2) offer you this license which gives you legal permission to copy, | ||
41 | distribute and/or modify the software. | ||
42 | |||
43 | Also, for each author's protection and ours, we want to make certain | ||
44 | that everyone understands that there is no warranty for this free | ||
45 | software. If the software is modified by someone else and passed on, we | ||
46 | want its recipients to know that what they have is not the original, so | ||
47 | that any problems introduced by others will not reflect on the original | ||
48 | authors' reputations. | ||
49 | |||
50 | Finally, any free program is threatened constantly by software | ||
51 | patents. We wish to avoid the danger that redistributors of a free | ||
52 | program will individually obtain patent licenses, in effect making the | ||
53 | program proprietary. To prevent this, we have made it clear that any | ||
54 | patent must be licensed for everyone's free use or not licensed at all. | ||
55 | |||
56 | The precise terms and conditions for copying, distribution and | ||
57 | modification follow. | ||
58 | |||
59 | GNU GENERAL PUBLIC LICENSE | ||
60 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
61 | |||
62 | 0. This License applies to any program or other work which contains | ||
63 | a notice placed by the copyright holder saying it may be distributed | ||
64 | under the terms of this General Public License. The "Program", below, | ||
65 | refers to any such program or work, and a "work based on the Program" | ||
66 | means either the Program or any derivative work under copyright law: | ||
67 | that is to say, a work containing the Program or a portion of it, | ||
68 | either verbatim or with modifications and/or translated into another | ||
69 | language. (Hereinafter, translation is included without limitation in | ||
70 | the term "modification".) Each licensee is addressed as "you". | ||
71 | |||
72 | Activities other than copying, distribution and modification are not | ||
73 | covered by this License; they are outside its scope. The act of | ||
74 | running the Program is not restricted, and the output from the Program | ||
75 | is covered only if its contents constitute a work based on the | ||
76 | Program (independent of having been made by running the Program). | ||
77 | Whether that is true depends on what the Program does. | ||
78 | |||
79 | 1. You may copy and distribute verbatim copies of the Program's | ||
80 | source code as you receive it, in any medium, provided that you | ||
81 | conspicuously and appropriately publish on each copy an appropriate | ||
82 | copyright notice and disclaimer of warranty; keep intact all the | ||
83 | notices that refer to this License and to the absence of any warranty; | ||
84 | and give any other recipients of the Program a copy of this License | ||
85 | along with the Program. | ||
86 | |||
87 | You may charge a fee for the physical act of transferring a copy, and | ||
88 | you may at your option offer warranty protection in exchange for a fee. | ||
89 | |||
90 | 2. You may modify your copy or copies of the Program or any portion | ||
91 | of it, thus forming a work based on the Program, and copy and | ||
92 | distribute such modifications or work under the terms of Section 1 | ||
93 | above, provided that you also meet all of these conditions: | ||
94 | |||
95 | a) You must cause the modified files to carry prominent notices | ||
96 | stating that you changed the files and the date of any change. | ||
97 | |||
98 | b) You must cause any work that you distribute or publish, that in | ||
99 | whole or in part contains or is derived from the Program or any | ||
100 | part thereof, to be licensed as a whole at no charge to all third | ||
101 | parties under the terms of this License. | ||
102 | |||
103 | c) If the modified program normally reads commands interactively | ||
104 | when run, you must cause it, when started running for such | ||
105 | interactive use in the most ordinary way, to print or display an | ||
106 | announcement including an appropriate copyright notice and a | ||
107 | notice that there is no warranty (or else, saying that you provide | ||
108 | a warranty) and that users may redistribute the program under | ||
109 | these conditions, and telling the user how to view a copy of this | ||
110 | License. (Exception: if the Program itself is interactive but | ||
111 | does not normally print such an announcement, your work based on | ||
112 | the Program is not required to print an announcement.) | ||
113 | |||
114 | These requirements apply to the modified work as a whole. If | ||
115 | identifiable sections of that work are not derived from the Program, | ||
116 | and can be reasonably considered independent and separate works in | ||
117 | themselves, then this License, and its terms, do not apply to those | ||
118 | sections when you distribute them as separate works. But when you | ||
119 | distribute the same sections as part of a whole which is a work based | ||
120 | on the Program, the distribution of the whole must be on the terms of | ||
121 | this License, whose permissions for other licensees extend to the | ||
122 | entire whole, and thus to each and every part regardless of who wrote it. | ||
123 | |||
124 | Thus, it is not the intent of this section to claim rights or contest | ||
125 | your rights to work written entirely by you; rather, the intent is to | ||
126 | exercise the right to control the distribution of derivative or | ||
127 | collective works based on the Program. | ||
128 | |||
129 | In addition, mere aggregation of another work not based on the Program | ||
130 | with the Program (or with a work based on the Program) on a volume of | ||
131 | a storage or distribution medium does not bring the other work under | ||
132 | the scope of this License. | ||
133 | |||
134 | 3. You may copy and distribute the Program (or a work based on it, | ||
135 | under Section 2) in object code or executable form under the terms of | ||
136 | Sections 1 and 2 above provided that you also do one of the following: | ||
137 | |||
138 | a) Accompany it with the complete corresponding machine-readable | ||
139 | source code, which must be distributed under the terms of Sections | ||
140 | 1 and 2 above on a medium customarily used for software interchange; or, | ||
141 | |||
142 | b) Accompany it with a written offer, valid for at least three | ||
143 | years, to give any third party, for a charge no more than your | ||
144 | cost of physically performing source distribution, a complete | ||
145 | machine-readable copy of the corresponding source code, to be | ||
146 | distributed under the terms of Sections 1 and 2 above on a medium | ||
147 | customarily used for software interchange; or, | ||
148 | |||
149 | c) Accompany it with the information you received as to the offer | ||
150 | to distribute corresponding source code. (This alternative is | ||
151 | allowed only for noncommercial distribution and only if you | ||
152 | received the program in object code or executable form with such | ||
153 | an offer, in accord with Subsection b above.) | ||
154 | |||
155 | The source code for a work means the preferred form of the work for | ||
156 | making modifications to it. For an executable work, complete source | ||
157 | code means all the source code for all modules it contains, plus any | ||
158 | associated interface definition files, plus the scripts used to | ||
159 | control compilation and installation of the executable. However, as a | ||
160 | special exception, the source code distributed need not include | ||
161 | anything that is normally distributed (in either source or binary | ||
162 | form) with the major components (compiler, kernel, and so on) of the | ||
163 | operating system on which the executable runs, unless that component | ||
164 | itself accompanies the executable. | ||
165 | |||
166 | If distribution of executable or object code is made by offering | ||
167 | access to copy from a designated place, then offering equivalent | ||
168 | access to copy the source code from the same place counts as | ||
169 | distribution of the source code, even though third parties are not | ||
170 | compelled to copy the source along with the object code. | ||
171 | |||
172 | 4. You may not copy, modify, sublicense, or distribute the Program | ||
173 | except as expressly provided under this License. Any attempt | ||
174 | otherwise to copy, modify, sublicense or distribute the Program is | ||
175 | void, and will automatically terminate your rights under this License. | ||
176 | However, parties who have received copies, or rights, from you under | ||
177 | this License will not have their licenses terminated so long as such | ||
178 | parties remain in full compliance. | ||
179 | |||
180 | 5. You are not required to accept this License, since you have not | ||
181 | signed it. However, nothing else grants you permission to modify or | ||
182 | distribute the Program or its derivative works. These actions are | ||
183 | prohibited by law if you do not accept this License. Therefore, by | ||
184 | modifying or distributing the Program (or any work based on the | ||
185 | Program), you indicate your acceptance of this License to do so, and | ||
186 | all its terms and conditions for copying, distributing or modifying | ||
187 | the Program or works based on it. | ||
188 | |||
189 | 6. Each time you redistribute the Program (or any work based on the | ||
190 | Program), the recipient automatically receives a license from the | ||
191 | original licensor to copy, distribute or modify the Program subject to | ||
192 | these terms and conditions. You may not impose any further | ||
193 | restrictions on the recipients' exercise of the rights granted herein. | ||
194 | You are not responsible for enforcing compliance by third parties to | ||
195 | this License. | ||
196 | |||
197 | 7. If, as a consequence of a court judgment or allegation of patent | ||
198 | infringement or for any other reason (not limited to patent issues), | ||
199 | conditions are imposed on you (whether by court order, agreement or | ||
200 | otherwise) that contradict the conditions of this License, they do not | ||
201 | excuse you from the conditions of this License. If you cannot | ||
202 | distribute so as to satisfy simultaneously your obligations under this | ||
203 | License and any other pertinent obligations, then as a consequence you | ||
204 | may not distribute the Program at all. For example, if a patent | ||
205 | license would not permit royalty-free redistribution of the Program by | ||
206 | all those who receive copies directly or indirectly through you, then | ||
207 | the only way you could satisfy both it and this License would be to | ||
208 | refrain entirely from distribution of the Program. | ||
209 | |||
210 | If any portion of this section is held invalid or unenforceable under | ||
211 | any particular circumstance, the balance of the section is intended to | ||
212 | apply and the section as a whole is intended to apply in other | ||
213 | circumstances. | ||
214 | |||
215 | It is not the purpose of this section to induce you to infringe any | ||
216 | patents or other property right claims or to contest validity of any | ||
217 | such claims; this section has the sole purpose of protecting the | ||
218 | integrity of the free software distribution system, which is | ||
219 | implemented by public license practices. Many people have made | ||
220 | generous contributions to the wide range of software distributed | ||
221 | through that system in reliance on consistent application of that | ||
222 | system; it is up to the author/donor to decide if he or she is willing | ||
223 | to distribute software through any other system and a licensee cannot | ||
224 | impose that choice. | ||
225 | |||
226 | This section is intended to make thoroughly clear what is believed to | ||
227 | be a consequence of the rest of this License. | ||
228 | |||
229 | 8. If the distribution and/or use of the Program is restricted in | ||
230 | certain countries either by patents or by copyrighted interfaces, the | ||
231 | original copyright holder who places the Program under this License | ||
232 | may add an explicit geographical distribution limitation excluding | ||
233 | those countries, so that distribution is permitted only in or among | ||
234 | countries not thus excluded. In such case, this License incorporates | ||
235 | the limitation as if written in the body of this License. | ||
236 | |||
237 | 9. The Free Software Foundation may publish revised and/or new versions | ||
238 | of the General Public License from time to time. Such new versions will | ||
239 | be similar in spirit to the present version, but may differ in detail to | ||
240 | address new problems or concerns. | ||
241 | |||
242 | Each version is given a distinguishing version number. If the Program | ||
243 | specifies a version number of this License which applies to it and "any | ||
244 | later version", you have the option of following the terms and conditions | ||
245 | either of that version or of any later version published by the Free | ||
246 | Software Foundation. If the Program does not specify a version number of | ||
247 | this License, you may choose any version ever published by the Free Software | ||
248 | Foundation. | ||
249 | |||
250 | 10. If you wish to incorporate parts of the Program into other free | ||
251 | programs whose distribution conditions are different, write to the author | ||
252 | to ask for permission. For software which is copyrighted by the Free | ||
253 | Software Foundation, write to the Free Software Foundation; we sometimes | ||
254 | make exceptions for this. Our decision will be guided by the two goals | ||
255 | of preserving the free status of all derivatives of our free software and | ||
256 | of promoting the sharing and reuse of software generally. | ||
257 | |||
258 | NO WARRANTY | ||
259 | |||
260 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY | ||
261 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN | ||
262 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES | ||
263 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED | ||
264 | OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
265 | MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS | ||
266 | TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE | ||
267 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, | ||
268 | REPAIR OR CORRECTION. | ||
269 | |||
270 | 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
271 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR | ||
272 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, | ||
273 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING | ||
274 | OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED | ||
275 | TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY | ||
276 | YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER | ||
277 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | ||
278 | POSSIBILITY OF SUCH DAMAGES. | ||
279 | |||
280 | END OF TERMS AND CONDITIONS | ||
281 | |||
282 | How to Apply These Terms to Your New Programs | ||
283 | |||
284 | If you develop a new program, and you want it to be of the greatest | ||
285 | possible use to the public, the best way to achieve this is to make it | ||
286 | free software which everyone can redistribute and change under these terms. | ||
287 | |||
288 | To do so, attach the following notices to the program. It is safest | ||
289 | to attach them to the start of each source file to most effectively | ||
290 | convey the exclusion of warranty; and each file should have at least | ||
291 | the "copyright" line and a pointer to where the full notice is found. | ||
292 | |||
293 | <one line to give the program's name and a brief idea of what it does.> | ||
294 | Copyright (C) <year> <name of author> | ||
295 | |||
296 | This program is free software; you can redistribute it and/or modify | ||
297 | it under the terms of the GNU General Public License as published by | ||
298 | the Free Software Foundation; either version 2 of the License, or | ||
299 | (at your option) any later version. | ||
300 | |||
301 | This program is distributed in the hope that it will be useful, | ||
302 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
303 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
304 | GNU General Public License for more details. | ||
305 | |||
306 | You should have received a copy of the GNU General Public License | ||
307 | along with this program; if not, write to the Free Software | ||
308 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
309 | |||
310 | |||
311 | Also add information on how to contact you by electronic and paper mail. | ||
312 | |||
313 | If the program is interactive, make it output a short notice like this | ||
314 | when it starts in an interactive mode: | ||
315 | |||
316 | Gnomovision version 69, Copyright (C) year name of author | ||
317 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
318 | This is free software, and you are welcome to redistribute it | ||
319 | under certain conditions; type `show c' for details. | ||
320 | |||
321 | The hypothetical commands `show w' and `show c' should show the appropriate | ||
322 | parts of the General Public License. Of course, the commands you use may | ||
323 | be called something other than `show w' and `show c'; they could even be | ||
324 | mouse-clicks or menu items--whatever suits your program. | ||
325 | |||
326 | You should also get your employer (if you work as a programmer) or your | ||
327 | school, if any, to sign a "copyright disclaimer" for the program, if | ||
328 | necessary. Here is a sample; alter the names: | ||
329 | |||
330 | Yoyodyne, Inc., hereby disclaims all copyright interest in the program | ||
331 | `Gnomovision' (which makes passes at compilers) written by James Hacker. | ||
332 | |||
333 | <signature of Ty Coon>, 1 April 1989 | ||
334 | Ty Coon, President of Vice | ||
335 | |||
336 | This General Public License does not permit incorporating your program into | ||
337 | proprietary programs. If your program is a subroutine library, you may | ||
338 | consider it more useful to permit linking proprietary applications with the | ||
339 | library. If this is what you want to do, use the GNU Library General | ||
340 | Public License instead of this License. | ||
@@ -1,86 +1,94 @@ | |||
1 | /* cache.c: cache management | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
1 | #include "cgit.h" | 9 | #include "cgit.h" |
2 | 10 | ||
3 | const int NOLOCK = -1; | 11 | const int NOLOCK = -1; |
4 | 12 | ||
5 | int cache_lookup(struct cacheitem *item) | 13 | int cache_lookup(struct cacheitem *item) |
6 | { | 14 | { |
7 | if (!cgit_query_repo) { | 15 | if (!cgit_query_repo) { |
8 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); | 16 | item->name = xstrdup(fmt("%s/index.html", cgit_cache_root)); |
9 | item->ttl = cgit_cache_root_ttl; | 17 | item->ttl = cgit_cache_root_ttl; |
10 | } else if (!cgit_query_page) { | 18 | } else if (!cgit_query_page) { |
11 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, | 19 | item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, |
12 | cgit_query_repo)); | 20 | cgit_query_repo)); |
13 | item->ttl = cgit_cache_repo_ttl; | 21 | item->ttl = cgit_cache_repo_ttl; |
14 | } else { | 22 | } else { |
15 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, | 23 | item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, |
16 | cgit_query_repo, cgit_query_page, | 24 | cgit_query_repo, cgit_query_page, |
17 | cgit_querystring)); | 25 | cgit_querystring)); |
18 | if (cgit_query_has_symref) | 26 | if (cgit_query_has_symref) |
19 | item->ttl = cgit_cache_dynamic_ttl; | 27 | item->ttl = cgit_cache_dynamic_ttl; |
20 | else if (cgit_query_has_sha1) | 28 | else if (cgit_query_has_sha1) |
21 | item->ttl = cgit_cache_static_ttl; | 29 | item->ttl = cgit_cache_static_ttl; |
22 | else | 30 | else |
23 | item->ttl = cgit_cache_repo_ttl; | 31 | item->ttl = cgit_cache_repo_ttl; |
24 | } | 32 | } |
25 | if (stat(item->name, &item->st)) { | 33 | if (stat(item->name, &item->st)) { |
26 | item->st.st_mtime = 0; | 34 | item->st.st_mtime = 0; |
27 | return 0; | 35 | return 0; |
28 | } | 36 | } |
29 | return 1; | 37 | return 1; |
30 | } | 38 | } |
31 | 39 | ||
32 | int cache_create_dirs() | 40 | int cache_create_dirs() |
33 | { | 41 | { |
34 | char *path; | 42 | char *path; |
35 | 43 | ||
36 | if (!cgit_query_repo) | 44 | if (!cgit_query_repo) |
37 | return 0; | 45 | return 0; |
38 | 46 | ||
39 | path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); | 47 | path = fmt("%s/%s", cgit_cache_root, cgit_query_repo); |
40 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 48 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
41 | return 0; | 49 | return 0; |
42 | 50 | ||
43 | if (cgit_query_page) { | 51 | if (cgit_query_page) { |
44 | path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, | 52 | path = fmt("%s/%s/%s", cgit_cache_root, cgit_query_repo, |
45 | cgit_query_page); | 53 | cgit_query_page); |
46 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) | 54 | if (mkdir(path, S_IRWXU) && errno!=EEXIST) |
47 | return 0; | 55 | return 0; |
48 | } | 56 | } |
49 | return 1; | 57 | return 1; |
50 | } | 58 | } |
51 | 59 | ||
52 | int cache_lock(struct cacheitem *item) | 60 | int cache_lock(struct cacheitem *item) |
53 | { | 61 | { |
54 | int ret; | 62 | int ret; |
55 | char *lockfile = fmt("%s.lock", item->name); | 63 | char *lockfile = fmt("%s.lock", item->name); |
56 | 64 | ||
57 | top: | 65 | top: |
58 | item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR); | 66 | item->fd = open(lockfile, O_WRONLY | O_CREAT | O_EXCL, S_IRUSR|S_IWUSR); |
59 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) | 67 | if (item->fd == NOLOCK && errno == ENOENT && cache_create_dirs()) |
60 | goto top; | 68 | goto top; |
61 | if (item->fd == NOLOCK && errno == EEXIST) { | 69 | if (item->fd == NOLOCK && errno == EEXIST) { |
62 | struct stat st; | 70 | struct stat st; |
63 | time_t t; | 71 | time_t t; |
64 | if (stat(lockfile, &st)) | 72 | if (stat(lockfile, &st)) |
65 | return ret; | 73 | return ret; |
66 | t = time(NULL); | 74 | t = time(NULL); |
67 | if (t-st.st_mtime > cgit_cache_max_create_time && | 75 | if (t-st.st_mtime > cgit_cache_max_create_time && |
68 | !unlink(lockfile)) | 76 | !unlink(lockfile)) |
69 | goto top; | 77 | goto top; |
70 | return 0; | 78 | return 0; |
71 | } | 79 | } |
72 | return (item->fd > 0); | 80 | return (item->fd > 0); |
73 | } | 81 | } |
74 | 82 | ||
75 | int cache_unlock(struct cacheitem *item) | 83 | int cache_unlock(struct cacheitem *item) |
76 | { | 84 | { |
77 | close(item->fd); | 85 | close(item->fd); |
78 | return (rename(fmt("%s.lock", item->name), item->name) == 0); | 86 | return (rename(fmt("%s.lock", item->name), item->name) == 0); |
79 | } | 87 | } |
80 | 88 | ||
81 | int cache_expired(struct cacheitem *item) | 89 | int cache_expired(struct cacheitem *item) |
82 | { | 90 | { |
83 | if (item->ttl < 0) | 91 | if (item->ttl < 0) |
84 | return 0; | 92 | return 0; |
85 | return item->st.st_mtime + item->ttl * 60 < time(NULL); | 93 | return item->st.st_mtime + item->ttl * 60 < time(NULL); |
86 | } | 94 | } |
@@ -1,497 +1,505 @@ | |||
1 | /* cgit.c: cgi for the git scm | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
1 | #include "cgit.h" | 9 | #include "cgit.h" |
2 | 10 | ||
3 | static const char cgit_doctype[] = | 11 | static const char cgit_doctype[] = |
4 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" | 12 | "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n" |
5 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; | 13 | " \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n"; |
6 | 14 | ||
7 | static const char cgit_error[] = | 15 | static const char cgit_error[] = |
8 | "<div class='error'>%s</div>"; | 16 | "<div class='error'>%s</div>"; |
9 | 17 | ||
10 | static const char cgit_lib_error[] = | 18 | static const char cgit_lib_error[] = |
11 | "<div class='error'>%s: %s</div>"; | 19 | "<div class='error'>%s: %s</div>"; |
12 | 20 | ||
13 | int htmlfd = 0; | 21 | int htmlfd = 0; |
14 | 22 | ||
15 | char *cgit_root = "/usr/src/git"; | 23 | char *cgit_root = "/usr/src/git"; |
16 | char *cgit_root_title = "Git repository browser"; | 24 | char *cgit_root_title = "Git repository browser"; |
17 | char *cgit_css = "/cgit.css"; | 25 | char *cgit_css = "/cgit.css"; |
18 | char *cgit_logo = "/git-logo.png"; | 26 | char *cgit_logo = "/git-logo.png"; |
19 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; | 27 | char *cgit_logo_link = "http://www.kernel.org/pub/software/scm/git/docs/"; |
20 | char *cgit_virtual_root = NULL; | 28 | char *cgit_virtual_root = NULL; |
21 | 29 | ||
22 | char *cgit_cache_root = "/var/cache/cgit"; | 30 | char *cgit_cache_root = "/var/cache/cgit"; |
23 | 31 | ||
24 | int cgit_cache_root_ttl = 5; | 32 | int cgit_cache_root_ttl = 5; |
25 | int cgit_cache_repo_ttl = 5; | 33 | int cgit_cache_repo_ttl = 5; |
26 | int cgit_cache_dynamic_ttl = 5; | 34 | int cgit_cache_dynamic_ttl = 5; |
27 | int cgit_cache_static_ttl = -1; | 35 | int cgit_cache_static_ttl = -1; |
28 | int cgit_cache_max_create_time = 5; | 36 | int cgit_cache_max_create_time = 5; |
29 | 37 | ||
30 | char *cgit_repo_name = NULL; | 38 | char *cgit_repo_name = NULL; |
31 | char *cgit_repo_desc = NULL; | 39 | char *cgit_repo_desc = NULL; |
32 | char *cgit_repo_owner = NULL; | 40 | char *cgit_repo_owner = NULL; |
33 | 41 | ||
34 | int cgit_query_has_symref = 0; | 42 | int cgit_query_has_symref = 0; |
35 | int cgit_query_has_sha1 = 0; | 43 | int cgit_query_has_sha1 = 0; |
36 | 44 | ||
37 | char *cgit_querystring = NULL; | 45 | char *cgit_querystring = NULL; |
38 | char *cgit_query_repo = NULL; | 46 | char *cgit_query_repo = NULL; |
39 | char *cgit_query_page = NULL; | 47 | char *cgit_query_page = NULL; |
40 | char *cgit_query_head = NULL; | 48 | char *cgit_query_head = NULL; |
41 | char *cgit_query_sha1 = NULL; | 49 | char *cgit_query_sha1 = NULL; |
42 | 50 | ||
43 | struct cacheitem cacheitem; | 51 | struct cacheitem cacheitem; |
44 | 52 | ||
45 | int cgit_parse_query(char *txt, configfn fn) | 53 | int cgit_parse_query(char *txt, configfn fn) |
46 | { | 54 | { |
47 | char *t, *value = NULL, c; | 55 | char *t, *value = NULL, c; |
48 | 56 | ||
49 | if (!txt) | 57 | if (!txt) |
50 | return 0; | 58 | return 0; |
51 | 59 | ||
52 | t = txt = xstrdup(txt); | 60 | t = txt = xstrdup(txt); |
53 | 61 | ||
54 | while((c=*t) != '\0') { | 62 | while((c=*t) != '\0') { |
55 | if (c=='=') { | 63 | if (c=='=') { |
56 | *t = '\0'; | 64 | *t = '\0'; |
57 | value = t+1; | 65 | value = t+1; |
58 | } else if (c=='&') { | 66 | } else if (c=='&') { |
59 | *t = '\0'; | 67 | *t = '\0'; |
60 | (*fn)(txt, value); | 68 | (*fn)(txt, value); |
61 | txt = t+1; | 69 | txt = t+1; |
62 | value = NULL; | 70 | value = NULL; |
63 | } | 71 | } |
64 | t++; | 72 | t++; |
65 | } | 73 | } |
66 | if (t!=txt) | 74 | if (t!=txt) |
67 | (*fn)(txt, value); | 75 | (*fn)(txt, value); |
68 | return 0; | 76 | return 0; |
69 | } | 77 | } |
70 | 78 | ||
71 | void cgit_global_config_cb(const char *name, const char *value) | 79 | void cgit_global_config_cb(const char *name, const char *value) |
72 | { | 80 | { |
73 | if (!strcmp(name, "root")) | 81 | if (!strcmp(name, "root")) |
74 | cgit_root = xstrdup(value); | 82 | cgit_root = xstrdup(value); |
75 | else if (!strcmp(name, "root-title")) | 83 | else if (!strcmp(name, "root-title")) |
76 | cgit_root_title = xstrdup(value); | 84 | cgit_root_title = xstrdup(value); |
77 | else if (!strcmp(name, "css")) | 85 | else if (!strcmp(name, "css")) |
78 | cgit_css = xstrdup(value); | 86 | cgit_css = xstrdup(value); |
79 | else if (!strcmp(name, "logo")) | 87 | else if (!strcmp(name, "logo")) |
80 | cgit_logo = xstrdup(value); | 88 | cgit_logo = xstrdup(value); |
81 | else if (!strcmp(name, "logo-link")) | 89 | else if (!strcmp(name, "logo-link")) |
82 | cgit_logo_link = xstrdup(value); | 90 | cgit_logo_link = xstrdup(value); |
83 | else if (!strcmp(name, "virtual-root")) | 91 | else if (!strcmp(name, "virtual-root")) |
84 | cgit_virtual_root = xstrdup(value); | 92 | cgit_virtual_root = xstrdup(value); |
85 | } | 93 | } |
86 | 94 | ||
87 | void cgit_repo_config_cb(const char *name, const char *value) | 95 | void cgit_repo_config_cb(const char *name, const char *value) |
88 | { | 96 | { |
89 | if (!strcmp(name, "name")) | 97 | if (!strcmp(name, "name")) |
90 | cgit_repo_name = xstrdup(value); | 98 | cgit_repo_name = xstrdup(value); |
91 | else if (!strcmp(name, "desc")) | 99 | else if (!strcmp(name, "desc")) |
92 | cgit_repo_desc = xstrdup(value); | 100 | cgit_repo_desc = xstrdup(value); |
93 | else if (!strcmp(name, "owner")) | 101 | else if (!strcmp(name, "owner")) |
94 | cgit_repo_owner = xstrdup(value); | 102 | cgit_repo_owner = xstrdup(value); |
95 | } | 103 | } |
96 | 104 | ||
97 | void cgit_querystring_cb(const char *name, const char *value) | 105 | void cgit_querystring_cb(const char *name, const char *value) |
98 | { | 106 | { |
99 | if (!strcmp(name,"r")) | 107 | if (!strcmp(name,"r")) |
100 | cgit_query_repo = xstrdup(value); | 108 | cgit_query_repo = xstrdup(value); |
101 | else if (!strcmp(name, "p")) | 109 | else if (!strcmp(name, "p")) |
102 | cgit_query_page = xstrdup(value); | 110 | cgit_query_page = xstrdup(value); |
103 | else if (!strcmp(name, "h")) { | 111 | else if (!strcmp(name, "h")) { |
104 | cgit_query_head = xstrdup(value); | 112 | cgit_query_head = xstrdup(value); |
105 | cgit_query_has_symref = 1; | 113 | cgit_query_has_symref = 1; |
106 | } else if (!strcmp(name, "id")) { | 114 | } else if (!strcmp(name, "id")) { |
107 | cgit_query_sha1 = xstrdup(value); | 115 | cgit_query_sha1 = xstrdup(value); |
108 | cgit_query_has_sha1 = 1; | 116 | cgit_query_has_sha1 = 1; |
109 | } | 117 | } |
110 | } | 118 | } |
111 | 119 | ||
112 | char *cgit_repourl(const char *reponame) | 120 | char *cgit_repourl(const char *reponame) |
113 | { | 121 | { |
114 | if (cgit_virtual_root) { | 122 | if (cgit_virtual_root) { |
115 | return fmt("%s/%s/", cgit_virtual_root, reponame); | 123 | return fmt("%s/%s/", cgit_virtual_root, reponame); |
116 | } else { | 124 | } else { |
117 | return fmt("?r=%s", reponame); | 125 | return fmt("?r=%s", reponame); |
118 | } | 126 | } |
119 | } | 127 | } |
120 | 128 | ||
121 | char *cgit_pageurl(const char *reponame, const char *pagename, | 129 | char *cgit_pageurl(const char *reponame, const char *pagename, |
122 | const char *query) | 130 | const char *query) |
123 | { | 131 | { |
124 | if (cgit_virtual_root) { | 132 | if (cgit_virtual_root) { |
125 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, | 133 | return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame, |
126 | pagename, query); | 134 | pagename, query); |
127 | } else { | 135 | } else { |
128 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); | 136 | return fmt("?r=%s&p=%s&%s", reponame, pagename, query); |
129 | } | 137 | } |
130 | } | 138 | } |
131 | 139 | ||
132 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, | 140 | static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1, |
133 | int flags, void *cb_data) | 141 | int flags, void *cb_data) |
134 | { | 142 | { |
135 | struct commit *commit; | 143 | struct commit *commit; |
136 | char buf[256], *url; | 144 | char buf[256], *url; |
137 | 145 | ||
138 | commit = lookup_commit(sha1); | 146 | commit = lookup_commit(sha1); |
139 | if (commit && !parse_commit(commit)){ | 147 | if (commit && !parse_commit(commit)){ |
140 | html("<tr><td>"); | 148 | html("<tr><td>"); |
141 | url = cgit_pageurl(cgit_query_repo, "log", | 149 | url = cgit_pageurl(cgit_query_repo, "log", |
142 | fmt("h=%s", refname)); | 150 | fmt("h=%s", refname)); |
143 | html_link_open(url, NULL, NULL); | 151 | html_link_open(url, NULL, NULL); |
144 | strncpy(buf, refname, sizeof(buf)); | 152 | strncpy(buf, refname, sizeof(buf)); |
145 | html_txt(buf); | 153 | html_txt(buf); |
146 | html_link_close(); | 154 | html_link_close(); |
147 | html("</td><td>"); | 155 | html("</td><td>"); |
148 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, | 156 | pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0, buf, |
149 | sizeof(buf), 0, NULL, NULL, 0); | 157 | sizeof(buf), 0, NULL, NULL, 0); |
150 | html_txt(buf); | 158 | html_txt(buf); |
151 | html("</td></tr>\n"); | 159 | html("</td></tr>\n"); |
152 | } else { | 160 | } else { |
153 | html("<tr><td>"); | 161 | html("<tr><td>"); |
154 | html_txt(buf); | 162 | html_txt(buf); |
155 | html("</td><td>"); | 163 | html("</td><td>"); |
156 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); | 164 | htmlf("*** bad ref %s", sha1_to_hex(sha1)); |
157 | html("</td></tr>\n"); | 165 | html("</td></tr>\n"); |
158 | } | 166 | } |
159 | return 0; | 167 | return 0; |
160 | } | 168 | } |
161 | 169 | ||
162 | /* Sun, 06 Nov 1994 08:49:37 GMT */ | 170 | /* Sun, 06 Nov 1994 08:49:37 GMT */ |
163 | static char *http_date(time_t t) | 171 | static char *http_date(time_t t) |
164 | { | 172 | { |
165 | static char day[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; | 173 | static char day[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"}; |
166 | static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", | 174 | static char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", |
167 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; | 175 | "Jul", "Aug", "Sep", "Oct", "Now", "Dec"}; |
168 | struct tm *tm = gmtime(&t); | 176 | struct tm *tm = gmtime(&t); |
169 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], | 177 | return fmt("%s, %02d %s %04d %02d:%02d:%02d GMT", day[tm->tm_wday], |
170 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, | 178 | tm->tm_mday, month[tm->tm_mon], 1900+tm->tm_year, |
171 | tm->tm_hour, tm->tm_min, tm->tm_sec); | 179 | tm->tm_hour, tm->tm_min, tm->tm_sec); |
172 | } | 180 | } |
173 | 181 | ||
174 | static int ttl_seconds(int ttl) | 182 | static int ttl_seconds(int ttl) |
175 | { | 183 | { |
176 | if (ttl<0) | 184 | if (ttl<0) |
177 | return 60 * 60 * 24 * 365; | 185 | return 60 * 60 * 24 * 365; |
178 | else | 186 | else |
179 | return ttl * 60; | 187 | return ttl * 60; |
180 | } | 188 | } |
181 | 189 | ||
182 | static void cgit_print_docstart(char *title) | 190 | static void cgit_print_docstart(char *title) |
183 | { | 191 | { |
184 | html("Content-Type: text/html; charset=utf-8\n"); | 192 | html("Content-Type: text/html; charset=utf-8\n"); |
185 | htmlf("Last-Modified: %s\n", http_date(cacheitem.st.st_mtime)); | 193 | htmlf("Last-Modified: %s\n", http_date(cacheitem.st.st_mtime)); |
186 | htmlf("Expires: %s\n", http_date(cacheitem.st.st_mtime + | 194 | htmlf("Expires: %s\n", http_date(cacheitem.st.st_mtime + |
187 | ttl_seconds(cacheitem.ttl))); | 195 | ttl_seconds(cacheitem.ttl))); |
188 | html("\n"); | 196 | html("\n"); |
189 | html(cgit_doctype); | 197 | html(cgit_doctype); |
190 | html("<html>\n"); | 198 | html("<html>\n"); |
191 | html("<head>\n"); | 199 | html("<head>\n"); |
192 | html("<title>"); | 200 | html("<title>"); |
193 | html_txt(title); | 201 | html_txt(title); |
194 | html("</title>\n"); | 202 | html("</title>\n"); |
195 | html("<link rel='stylesheet' type='text/css' href='"); | 203 | html("<link rel='stylesheet' type='text/css' href='"); |
196 | html_attr(cgit_css); | 204 | html_attr(cgit_css); |
197 | html("'/>\n"); | 205 | html("'/>\n"); |
198 | html("</head>\n"); | 206 | html("</head>\n"); |
199 | html("<body>\n"); | 207 | html("<body>\n"); |
200 | } | 208 | } |
201 | 209 | ||
202 | static void cgit_print_docend() | 210 | static void cgit_print_docend() |
203 | { | 211 | { |
204 | html("</body>\n</html>\n"); | 212 | html("</body>\n</html>\n"); |
205 | } | 213 | } |
206 | 214 | ||
207 | static void cgit_print_pageheader(char *title) | 215 | static void cgit_print_pageheader(char *title) |
208 | { | 216 | { |
209 | html("<div id='header'>"); | 217 | html("<div id='header'>"); |
210 | htmlf("<a href='%s'>", cgit_logo_link); | 218 | htmlf("<a href='%s'>", cgit_logo_link); |
211 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); | 219 | htmlf("<img id='logo' src='%s'/>\n", cgit_logo); |
212 | htmlf("</a>"); | 220 | htmlf("</a>"); |
213 | html_txt(title); | 221 | html_txt(title); |
214 | html("</div>"); | 222 | html("</div>"); |
215 | } | 223 | } |
216 | 224 | ||
217 | static void cgit_print_repolist() | 225 | static void cgit_print_repolist() |
218 | { | 226 | { |
219 | DIR *d; | 227 | DIR *d; |
220 | struct dirent *de; | 228 | struct dirent *de; |
221 | struct stat st; | 229 | struct stat st; |
222 | char *name; | 230 | char *name; |
223 | 231 | ||
224 | chdir(cgit_root); | 232 | chdir(cgit_root); |
225 | cgit_print_docstart(cgit_root_title); | 233 | cgit_print_docstart(cgit_root_title); |
226 | cgit_print_pageheader(cgit_root_title); | 234 | cgit_print_pageheader(cgit_root_title); |
227 | 235 | ||
228 | if (!(d = opendir("."))) { | 236 | if (!(d = opendir("."))) { |
229 | htmlf(cgit_lib_error, "Unable to scan repository directory", | 237 | htmlf(cgit_lib_error, "Unable to scan repository directory", |
230 | strerror(errno)); | 238 | strerror(errno)); |
231 | cgit_print_docend(); | 239 | cgit_print_docend(); |
232 | return; | 240 | return; |
233 | } | 241 | } |
234 | 242 | ||
235 | html("<h2>Repositories</h2>\n"); | 243 | html("<h2>Repositories</h2>\n"); |
236 | html("<table class='list'>"); | 244 | html("<table class='list'>"); |
237 | html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n"); | 245 | html("<tr><th>Name</th><th>Description</th><th>Owner</th></tr>\n"); |
238 | while ((de = readdir(d)) != NULL) { | 246 | while ((de = readdir(d)) != NULL) { |
239 | if (de->d_name[0] == '.') | 247 | if (de->d_name[0] == '.') |
240 | continue; | 248 | continue; |
241 | if (stat(de->d_name, &st) < 0) | 249 | if (stat(de->d_name, &st) < 0) |
242 | continue; | 250 | continue; |
243 | if (!S_ISDIR(st.st_mode)) | 251 | if (!S_ISDIR(st.st_mode)) |
244 | continue; | 252 | continue; |
245 | 253 | ||
246 | cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL; | 254 | cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL; |
247 | name = fmt("%s/info/cgit", de->d_name); | 255 | name = fmt("%s/info/cgit", de->d_name); |
248 | if (cgit_read_config(name, cgit_repo_config_cb)) | 256 | if (cgit_read_config(name, cgit_repo_config_cb)) |
249 | continue; | 257 | continue; |
250 | 258 | ||
251 | html("<tr><td>"); | 259 | html("<tr><td>"); |
252 | html_link_open(cgit_repourl(de->d_name), NULL, NULL); | 260 | html_link_open(cgit_repourl(de->d_name), NULL, NULL); |
253 | html_txt(cgit_repo_name); | 261 | html_txt(cgit_repo_name); |
254 | html_link_close(); | 262 | html_link_close(); |
255 | html("</td><td>"); | 263 | html("</td><td>"); |
256 | html_txt(cgit_repo_desc); | 264 | html_txt(cgit_repo_desc); |
257 | html("</td><td>"); | 265 | html("</td><td>"); |
258 | html_txt(cgit_repo_owner); | 266 | html_txt(cgit_repo_owner); |
259 | html("</td></tr>\n"); | 267 | html("</td></tr>\n"); |
260 | } | 268 | } |
261 | closedir(d); | 269 | closedir(d); |
262 | html("</table>"); | 270 | html("</table>"); |
263 | cgit_print_docend(); | 271 | cgit_print_docend(); |
264 | } | 272 | } |
265 | 273 | ||
266 | static void cgit_print_branches() | 274 | static void cgit_print_branches() |
267 | { | 275 | { |
268 | html("<table class='list'>"); | 276 | html("<table class='list'>"); |
269 | html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); | 277 | html("<tr><th>Branch name</th><th>Head commit</th></tr>\n"); |
270 | for_each_branch_ref(cgit_print_branch_cb, NULL); | 278 | for_each_branch_ref(cgit_print_branch_cb, NULL); |
271 | html("</table>"); | 279 | html("</table>"); |
272 | } | 280 | } |
273 | 281 | ||
274 | static int get_one_line(char *txt) | 282 | static int get_one_line(char *txt) |
275 | { | 283 | { |
276 | char *t; | 284 | char *t; |
277 | 285 | ||
278 | for(t=txt; *t != '\n' && t != '\0'; t++) | 286 | for(t=txt; *t != '\n' && t != '\0'; t++) |
279 | ; | 287 | ; |
280 | *t = '\0'; | 288 | *t = '\0'; |
281 | return t-txt-1; | 289 | return t-txt-1; |
282 | } | 290 | } |
283 | 291 | ||
284 | static void cgit_print_commit_shortlog(struct commit *commit) | 292 | static void cgit_print_commit_shortlog(struct commit *commit) |
285 | { | 293 | { |
286 | char *h, *t, *p; | 294 | char *h, *t, *p; |
287 | char *tree = NULL, *author = NULL, *subject = NULL; | 295 | char *tree = NULL, *author = NULL, *subject = NULL; |
288 | int len; | 296 | int len; |
289 | time_t sec; | 297 | time_t sec; |
290 | struct tm *time; | 298 | struct tm *time; |
291 | char buf[32]; | 299 | char buf[32]; |
292 | 300 | ||
293 | h = t = commit->buffer; | 301 | h = t = commit->buffer; |
294 | 302 | ||
295 | if (strncmp(h, "tree ", 5)) | 303 | if (strncmp(h, "tree ", 5)) |
296 | die("Bad commit format: %s", | 304 | die("Bad commit format: %s", |
297 | sha1_to_hex(commit->object.sha1)); | 305 | sha1_to_hex(commit->object.sha1)); |
298 | 306 | ||
299 | len = get_one_line(h); | 307 | len = get_one_line(h); |
300 | tree = h+5; | 308 | tree = h+5; |
301 | h += len + 2; | 309 | h += len + 2; |
302 | 310 | ||
303 | while (!strncmp(h, "parent ", 7)) | 311 | while (!strncmp(h, "parent ", 7)) |
304 | h += get_one_line(h) + 2; | 312 | h += get_one_line(h) + 2; |
305 | 313 | ||
306 | if (!strncmp(h, "author ", 7)) { | 314 | if (!strncmp(h, "author ", 7)) { |
307 | author = h+7; | 315 | author = h+7; |
308 | h += get_one_line(h) + 2; | 316 | h += get_one_line(h) + 2; |
309 | t = author; | 317 | t = author; |
310 | while(t!=h && *t!='<') | 318 | while(t!=h && *t!='<') |
311 | t++; | 319 | t++; |
312 | *t='\0'; | 320 | *t='\0'; |
313 | p = t; | 321 | p = t; |
314 | while(--t!=author && *t==' ') | 322 | while(--t!=author && *t==' ') |
315 | *t='\0'; | 323 | *t='\0'; |
316 | while(++p!=h && *p!='>') | 324 | while(++p!=h && *p!='>') |
317 | ; | 325 | ; |
318 | while(++p!=h && !isdigit(*p)) | 326 | while(++p!=h && !isdigit(*p)) |
319 | ; | 327 | ; |
320 | 328 | ||
321 | t = p; | 329 | t = p; |
322 | while(++p && isdigit(*p)) | 330 | while(++p && isdigit(*p)) |
323 | ; | 331 | ; |
324 | *p = '\0'; | 332 | *p = '\0'; |
325 | sec = atoi(t); | 333 | sec = atoi(t); |
326 | time = gmtime(&sec); | 334 | time = gmtime(&sec); |
327 | } | 335 | } |
328 | 336 | ||
329 | while((len = get_one_line(h)) > 0) | 337 | while((len = get_one_line(h)) > 0) |
330 | h += len+2; | 338 | h += len+2; |
331 | 339 | ||
332 | h++; | 340 | h++; |
333 | len = get_one_line(h); | 341 | len = get_one_line(h); |
334 | 342 | ||
335 | subject = h; | 343 | subject = h; |
336 | 344 | ||
337 | html("<tr><td>"); | 345 | html("<tr><td>"); |
338 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); | 346 | strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); |
339 | html_txt(buf); | 347 | html_txt(buf); |
340 | html("</td><td>"); | 348 | html("</td><td>"); |
341 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 349 | char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
342 | char *url = cgit_pageurl(cgit_query_repo, "view", qry); | 350 | char *url = cgit_pageurl(cgit_query_repo, "view", qry); |
343 | html_link_open(url, NULL, NULL); | 351 | html_link_open(url, NULL, NULL); |
344 | html_txt(subject); | 352 | html_txt(subject); |
345 | html_link_close(); | 353 | html_link_close(); |
346 | html("</td><td>"); | 354 | html("</td><td>"); |
347 | html_txt(author); | 355 | html_txt(author); |
348 | html("</td></tr>\n"); | 356 | html("</td></tr>\n"); |
349 | } | 357 | } |
350 | 358 | ||
351 | static void cgit_print_log(const char *tip, int ofs, int cnt) | 359 | static void cgit_print_log(const char *tip, int ofs, int cnt) |
352 | { | 360 | { |
353 | struct rev_info rev; | 361 | struct rev_info rev; |
354 | struct commit *commit; | 362 | struct commit *commit; |
355 | const char *argv[2] = {NULL, tip}; | 363 | const char *argv[2] = {NULL, tip}; |
356 | int n = 0; | 364 | int n = 0; |
357 | 365 | ||
358 | init_revisions(&rev, NULL); | 366 | init_revisions(&rev, NULL); |
359 | rev.abbrev = DEFAULT_ABBREV; | 367 | rev.abbrev = DEFAULT_ABBREV; |
360 | rev.commit_format = CMIT_FMT_DEFAULT; | 368 | rev.commit_format = CMIT_FMT_DEFAULT; |
361 | rev.verbose_header = 1; | 369 | rev.verbose_header = 1; |
362 | rev.show_root_diff = 0; | 370 | rev.show_root_diff = 0; |
363 | setup_revisions(2, argv, &rev, NULL); | 371 | setup_revisions(2, argv, &rev, NULL); |
364 | prepare_revision_walk(&rev); | 372 | prepare_revision_walk(&rev); |
365 | 373 | ||
366 | html("<h2>Log</h2>"); | 374 | html("<h2>Log</h2>"); |
367 | html("<table class='list'>"); | 375 | html("<table class='list'>"); |
368 | html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); | 376 | html("<tr><th>Date</th><th>Message</th><th>Author</th></tr>\n"); |
369 | while ((commit = get_revision(&rev)) != NULL && n++ < 100) { | 377 | while ((commit = get_revision(&rev)) != NULL && n++ < 100) { |
370 | cgit_print_commit_shortlog(commit); | 378 | cgit_print_commit_shortlog(commit); |
371 | free(commit->buffer); | 379 | free(commit->buffer); |
372 | commit->buffer = NULL; | 380 | commit->buffer = NULL; |
373 | free_commit_list(commit->parents); | 381 | free_commit_list(commit->parents); |
374 | commit->parents = NULL; | 382 | commit->parents = NULL; |
375 | } | 383 | } |
376 | html("</table>\n"); | 384 | html("</table>\n"); |
377 | } | 385 | } |
378 | 386 | ||
379 | static void cgit_print_repo_summary() | 387 | static void cgit_print_repo_summary() |
380 | { | 388 | { |
381 | html("<h2>"); | 389 | html("<h2>"); |
382 | html_txt("Repo summary page"); | 390 | html_txt("Repo summary page"); |
383 | html("</h2>"); | 391 | html("</h2>"); |
384 | cgit_print_branches(); | 392 | cgit_print_branches(); |
385 | } | 393 | } |
386 | 394 | ||
387 | static void cgit_print_object(char *hex) | 395 | static void cgit_print_object(char *hex) |
388 | { | 396 | { |
389 | unsigned char sha1[20]; | 397 | unsigned char sha1[20]; |
390 | //struct object *object; | 398 | //struct object *object; |
391 | char type[20]; | 399 | char type[20]; |
392 | unsigned char *buf; | 400 | unsigned char *buf; |
393 | unsigned long size; | 401 | unsigned long size; |
394 | 402 | ||
395 | if (get_sha1_hex(hex, sha1)){ | 403 | if (get_sha1_hex(hex, sha1)){ |
396 | htmlf(cgit_error, "Bad hex value"); | 404 | htmlf(cgit_error, "Bad hex value"); |
397 | return; | 405 | return; |
398 | } | 406 | } |
399 | 407 | ||
400 | if (sha1_object_info(sha1, type, NULL)){ | 408 | if (sha1_object_info(sha1, type, NULL)){ |
401 | htmlf(cgit_error, "Bad object name"); | 409 | htmlf(cgit_error, "Bad object name"); |
402 | return; | 410 | return; |
403 | } | 411 | } |
404 | 412 | ||
405 | buf = read_sha1_file(sha1, type, &size); | 413 | buf = read_sha1_file(sha1, type, &size); |
406 | if (!buf) { | 414 | if (!buf) { |
407 | htmlf(cgit_error, "Error reading object"); | 415 | htmlf(cgit_error, "Error reading object"); |
408 | return; | 416 | return; |
409 | } | 417 | } |
410 | 418 | ||
411 | buf[size] = '\0'; | 419 | buf[size] = '\0'; |
412 | html("<h2>Object view</h2>"); | 420 | html("<h2>Object view</h2>"); |
413 | htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size); | 421 | htmlf("sha1=%s<br/>type=%s<br/>size=%i<br/>", hex, type, size); |
414 | html("<pre>"); | 422 | html("<pre>"); |
415 | html_txt(buf); | 423 | html_txt(buf); |
416 | html("</pre>"); | 424 | html("</pre>"); |
417 | } | 425 | } |
418 | 426 | ||
419 | static void cgit_print_repo_page() | 427 | static void cgit_print_repo_page() |
420 | { | 428 | { |
421 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 429 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
422 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 430 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
423 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 431 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
424 | cgit_print_docstart(title); | 432 | cgit_print_docstart(title); |
425 | cgit_print_pageheader(title); | 433 | cgit_print_pageheader(title); |
426 | htmlf(cgit_lib_error, "Unable to scan repository", | 434 | htmlf(cgit_lib_error, "Unable to scan repository", |
427 | strerror(errno)); | 435 | strerror(errno)); |
428 | cgit_print_docend(); | 436 | cgit_print_docend(); |
429 | return; | 437 | return; |
430 | } | 438 | } |
431 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); | 439 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
432 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); | 440 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
433 | cgit_print_docstart(title); | 441 | cgit_print_docstart(title); |
434 | cgit_print_pageheader(title); | 442 | cgit_print_pageheader(title); |
435 | if (!cgit_query_page) | 443 | if (!cgit_query_page) |
436 | cgit_print_repo_summary(); | 444 | cgit_print_repo_summary(); |
437 | else if (!strcmp(cgit_query_page, "log")) { | 445 | else if (!strcmp(cgit_query_page, "log")) { |
438 | cgit_print_log(cgit_query_head, 0, 100); | 446 | cgit_print_log(cgit_query_head, 0, 100); |
439 | } else if (!strcmp(cgit_query_page, "view")) { | 447 | } else if (!strcmp(cgit_query_page, "view")) { |
440 | cgit_print_object(cgit_query_sha1); | 448 | cgit_print_object(cgit_query_sha1); |
441 | } | 449 | } |
442 | cgit_print_docend(); | 450 | cgit_print_docend(); |
443 | } | 451 | } |
444 | 452 | ||
445 | static void cgit_fill_cache(struct cacheitem *item) | 453 | static void cgit_fill_cache(struct cacheitem *item) |
446 | { | 454 | { |
447 | htmlfd = item->fd; | 455 | htmlfd = item->fd; |
448 | item->st.st_mtime = time(NULL); | 456 | item->st.st_mtime = time(NULL); |
449 | if (cgit_query_repo) | 457 | if (cgit_query_repo) |
450 | cgit_print_repo_page(); | 458 | cgit_print_repo_page(); |
451 | else | 459 | else |
452 | cgit_print_repolist(); | 460 | cgit_print_repolist(); |
453 | } | 461 | } |
454 | 462 | ||
455 | static void cgit_refresh_cache(struct cacheitem *item) | 463 | static void cgit_refresh_cache(struct cacheitem *item) |
456 | { | 464 | { |
457 | top: | 465 | top: |
458 | if (!cache_lookup(item)) { | 466 | if (!cache_lookup(item)) { |
459 | if (cache_lock(item)) { | 467 | if (cache_lock(item)) { |
460 | cgit_fill_cache(item); | 468 | cgit_fill_cache(item); |
461 | cache_unlock(item); | 469 | cache_unlock(item); |
462 | } else { | 470 | } else { |
463 | sched_yield(); | 471 | sched_yield(); |
464 | goto top; | 472 | goto top; |
465 | } | 473 | } |
466 | } else if (cache_expired(item)) { | 474 | } else if (cache_expired(item)) { |
467 | if (cache_lock(item)) { | 475 | if (cache_lock(item)) { |
468 | cgit_fill_cache(item); | 476 | cgit_fill_cache(item); |
469 | cache_unlock(item); | 477 | cache_unlock(item); |
470 | } | 478 | } |
471 | } | 479 | } |
472 | } | 480 | } |
473 | 481 | ||
474 | static void cgit_print_cache(struct cacheitem *item) | 482 | static void cgit_print_cache(struct cacheitem *item) |
475 | { | 483 | { |
476 | static char buf[4096]; | 484 | static char buf[4096]; |
477 | ssize_t i; | 485 | ssize_t i; |
478 | 486 | ||
479 | int fd = open(item->name, O_RDONLY); | 487 | int fd = open(item->name, O_RDONLY); |
480 | if (fd<0) | 488 | if (fd<0) |
481 | die("Unable to open cached file %s", item->name); | 489 | die("Unable to open cached file %s", item->name); |
482 | 490 | ||
483 | while((i=read(fd, buf, sizeof(buf))) > 0) | 491 | while((i=read(fd, buf, sizeof(buf))) > 0) |
484 | write(STDOUT_FILENO, buf, i); | 492 | write(STDOUT_FILENO, buf, i); |
485 | 493 | ||
486 | close(fd); | 494 | close(fd); |
487 | } | 495 | } |
488 | 496 | ||
489 | int main(int argc, const char **argv) | 497 | int main(int argc, const char **argv) |
490 | { | 498 | { |
491 | cgit_read_config("/etc/cgitrc", cgit_global_config_cb); | 499 | cgit_read_config("/etc/cgitrc", cgit_global_config_cb); |
492 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); | 500 | cgit_querystring = xstrdup(getenv("QUERY_STRING")); |
493 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); | 501 | cgit_parse_query(cgit_querystring, cgit_querystring_cb); |
494 | cgit_refresh_cache(&cacheitem); | 502 | cgit_refresh_cache(&cacheitem); |
495 | cgit_print_cache(&cacheitem); | 503 | cgit_print_cache(&cacheitem); |
496 | return 0; | 504 | return 0; |
497 | } | 505 | } |
@@ -1,73 +1,81 @@ | |||
1 | /* config.c: parsing of config files | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
1 | #include "cgit.h" | 9 | #include "cgit.h" |
2 | 10 | ||
3 | int next_char(FILE *f) | 11 | int next_char(FILE *f) |
4 | { | 12 | { |
5 | int c = fgetc(f); | 13 | int c = fgetc(f); |
6 | if (c=='\r') { | 14 | if (c=='\r') { |
7 | c = fgetc(f); | 15 | c = fgetc(f); |
8 | if (c!='\n') { | 16 | if (c!='\n') { |
9 | ungetc(c, f); | 17 | ungetc(c, f); |
10 | c = '\r'; | 18 | c = '\r'; |
11 | } | 19 | } |
12 | } | 20 | } |
13 | return c; | 21 | return c; |
14 | } | 22 | } |
15 | 23 | ||
16 | void skip_line(FILE *f) | 24 | void skip_line(FILE *f) |
17 | { | 25 | { |
18 | int c; | 26 | int c; |
19 | 27 | ||
20 | while((c=next_char(f)) && c!='\n' && c!=EOF) | 28 | while((c=next_char(f)) && c!='\n' && c!=EOF) |
21 | ; | 29 | ; |
22 | } | 30 | } |
23 | 31 | ||
24 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) | 32 | int read_config_line(FILE *f, char *line, const char **value, int bufsize) |
25 | { | 33 | { |
26 | int i = 0, isname = 0; | 34 | int i = 0, isname = 0; |
27 | 35 | ||
28 | *value = NULL; | 36 | *value = NULL; |
29 | while(i<bufsize-1) { | 37 | while(i<bufsize-1) { |
30 | int c = next_char(f); | 38 | int c = next_char(f); |
31 | if (!isname && (c=='#' || c==';')) { | 39 | if (!isname && (c=='#' || c==';')) { |
32 | skip_line(f); | 40 | skip_line(f); |
33 | continue; | 41 | continue; |
34 | } | 42 | } |
35 | if (!isname && isspace(c)) | 43 | if (!isname && isspace(c)) |
36 | continue; | 44 | continue; |
37 | 45 | ||
38 | if (c=='=' && !*value) { | 46 | if (c=='=' && !*value) { |
39 | line[i] = 0; | 47 | line[i] = 0; |
40 | *value = &line[i+1]; | 48 | *value = &line[i+1]; |
41 | } else if (c=='\n' && !isname) { | 49 | } else if (c=='\n' && !isname) { |
42 | i = 0; | 50 | i = 0; |
43 | continue; | 51 | continue; |
44 | } else if (c=='\n' || c==EOF) { | 52 | } else if (c=='\n' || c==EOF) { |
45 | line[i] = 0; | 53 | line[i] = 0; |
46 | break; | 54 | break; |
47 | } else { | 55 | } else { |
48 | line[i]=c; | 56 | line[i]=c; |
49 | } | 57 | } |
50 | isname = 1; | 58 | isname = 1; |
51 | i++; | 59 | i++; |
52 | } | 60 | } |
53 | line[i+1] = 0; | 61 | line[i+1] = 0; |
54 | return i; | 62 | return i; |
55 | } | 63 | } |
56 | 64 | ||
57 | int cgit_read_config(const char *filename, configfn fn) | 65 | int cgit_read_config(const char *filename, configfn fn) |
58 | { | 66 | { |
59 | int ret = 0, len; | 67 | int ret = 0, len; |
60 | char line[256]; | 68 | char line[256]; |
61 | const char *value; | 69 | const char *value; |
62 | FILE *f = fopen(filename, "r"); | 70 | FILE *f = fopen(filename, "r"); |
63 | 71 | ||
64 | if (!f) | 72 | if (!f) |
65 | return -1; | 73 | return -1; |
66 | 74 | ||
67 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) | 75 | while((len = read_config_line(f, line, &value, sizeof(line))) > 0) |
68 | (*fn)(line, value); | 76 | (*fn)(line, value); |
69 | 77 | ||
70 | fclose(f); | 78 | fclose(f); |
71 | return ret; | 79 | return ret; |
72 | } | 80 | } |
73 | 81 | ||
@@ -1,102 +1,110 @@ | |||
1 | /* html.c: helper functions for html output | ||
2 | * | ||
3 | * Copyright (C) 2006 Lars Hjemli | ||
4 | * | ||
5 | * Licensed under GNU General Public License v2 | ||
6 | * (see COPYING for full license text) | ||
7 | */ | ||
8 | |||
1 | #include "cgit.h" | 9 | #include "cgit.h" |
2 | 10 | ||
3 | char *fmt(const char *format, ...) | 11 | char *fmt(const char *format, ...) |
4 | { | 12 | { |
5 | static char buf[8][1024]; | 13 | static char buf[8][1024]; |
6 | static int bufidx; | 14 | static int bufidx; |
7 | int len; | 15 | int len; |
8 | va_list args; | 16 | va_list args; |
9 | 17 | ||
10 | bufidx++; | 18 | bufidx++; |
11 | bufidx &= 7; | 19 | bufidx &= 7; |
12 | 20 | ||
13 | va_start(args, format); | 21 | va_start(args, format); |
14 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); | 22 | len = vsnprintf(buf[bufidx], sizeof(buf[bufidx]), format, args); |
15 | va_end(args); | 23 | va_end(args); |
16 | if (len>sizeof(buf[bufidx])) | 24 | if (len>sizeof(buf[bufidx])) |
17 | die("[html.c] string truncated: %s", format); | 25 | die("[html.c] string truncated: %s", format); |
18 | return buf[bufidx]; | 26 | return buf[bufidx]; |
19 | } | 27 | } |
20 | 28 | ||
21 | void html(const char *txt) | 29 | void html(const char *txt) |
22 | { | 30 | { |
23 | write(htmlfd, txt, strlen(txt)); | 31 | write(htmlfd, txt, strlen(txt)); |
24 | } | 32 | } |
25 | 33 | ||
26 | void htmlf(const char *format, ...) | 34 | void htmlf(const char *format, ...) |
27 | { | 35 | { |
28 | static char buf[65536]; | 36 | static char buf[65536]; |
29 | va_list args; | 37 | va_list args; |
30 | 38 | ||
31 | va_start(args, format); | 39 | va_start(args, format); |
32 | vsnprintf(buf, sizeof(buf), format, args); | 40 | vsnprintf(buf, sizeof(buf), format, args); |
33 | va_end(args); | 41 | va_end(args); |
34 | html(buf); | 42 | html(buf); |
35 | } | 43 | } |
36 | 44 | ||
37 | void html_txt(char *txt) | 45 | void html_txt(char *txt) |
38 | { | 46 | { |
39 | char *t = txt; | 47 | char *t = txt; |
40 | while(*t){ | 48 | while(*t){ |
41 | int c = *t; | 49 | int c = *t; |
42 | if (c=='<' || c=='>' || c=='&') { | 50 | if (c=='<' || c=='>' || c=='&') { |
43 | *t = '\0'; | 51 | *t = '\0'; |
44 | html(txt); | 52 | html(txt); |
45 | *t = c; | 53 | *t = c; |
46 | if (c=='>') | 54 | if (c=='>') |
47 | html(">"); | 55 | html(">"); |
48 | else if (c=='<') | 56 | else if (c=='<') |
49 | html("<"); | 57 | html("<"); |
50 | else if (c=='&') | 58 | else if (c=='&') |
51 | html("&"); | 59 | html("&"); |
52 | txt = t+1; | 60 | txt = t+1; |
53 | } | 61 | } |
54 | t++; | 62 | t++; |
55 | } | 63 | } |
56 | if (t!=txt) | 64 | if (t!=txt) |
57 | html(txt); | 65 | html(txt); |
58 | } | 66 | } |
59 | 67 | ||
60 | 68 | ||
61 | void html_attr(char *txt) | 69 | void html_attr(char *txt) |
62 | { | 70 | { |
63 | char *t = txt; | 71 | char *t = txt; |
64 | while(*t){ | 72 | while(*t){ |
65 | int c = *t; | 73 | int c = *t; |
66 | if (c=='<' || c=='>' || c=='\'') { | 74 | if (c=='<' || c=='>' || c=='\'') { |
67 | *t = '\0'; | 75 | *t = '\0'; |
68 | html(txt); | 76 | html(txt); |
69 | *t = c; | 77 | *t = c; |
70 | if (c=='>') | 78 | if (c=='>') |
71 | html(">"); | 79 | html(">"); |
72 | else if (c=='<') | 80 | else if (c=='<') |
73 | html("<"); | 81 | html("<"); |
74 | else if (c=='\'') | 82 | else if (c=='\'') |
75 | html(""e;"); | 83 | html(""e;"); |
76 | txt = t+1; | 84 | txt = t+1; |
77 | } | 85 | } |
78 | t++; | 86 | t++; |
79 | } | 87 | } |
80 | if (t!=txt) | 88 | if (t!=txt) |
81 | html(txt); | 89 | html(txt); |
82 | } | 90 | } |
83 | 91 | ||
84 | void html_link_open(char *url, char *title, char *class) | 92 | void html_link_open(char *url, char *title, char *class) |
85 | { | 93 | { |
86 | html("<a href='"); | 94 | html("<a href='"); |
87 | html_attr(url); | 95 | html_attr(url); |
88 | if (title) { | 96 | if (title) { |
89 | html("' title='"); | 97 | html("' title='"); |
90 | html_attr(title); | 98 | html_attr(title); |
91 | } | 99 | } |
92 | if (class) { | 100 | if (class) { |
93 | html("' class='"); | 101 | html("' class='"); |
94 | html_attr(class); | 102 | html_attr(class); |
95 | } | 103 | } |
96 | html("'>"); | 104 | html("'>"); |
97 | } | 105 | } |
98 | 106 | ||
99 | void html_link_close(void) | 107 | void html_link_close(void) |
100 | { | 108 | { |
101 | html("</a>"); | 109 | html("</a>"); |
102 | } | 110 | } |