|
diff --git a/cgit.h b/cgit.h index f8f0316..0baa679 100644 --- a/ cgit.h+++ b/ cgit.h |
|
@@ -159,96 +159,97 @@ extern char *cgit_query_repo; |
159 | extern char *cgit_query_page; |
159 | extern char *cgit_query_page; |
160 | extern char *cgit_query_search; |
160 | extern char *cgit_query_search; |
161 | extern char *cgit_query_head; |
161 | extern char *cgit_query_head; |
162 | extern char *cgit_query_sha1; |
162 | extern char *cgit_query_sha1; |
163 | extern char *cgit_query_sha2; |
163 | extern char *cgit_query_sha2; |
164 | extern char *cgit_query_path; |
164 | extern char *cgit_query_path; |
165 | extern char *cgit_query_name; |
165 | extern char *cgit_query_name; |
166 | extern int cgit_query_ofs; |
166 | extern int cgit_query_ofs; |
167 | |
167 | |
168 | extern int htmlfd; |
168 | extern int htmlfd; |
169 | |
169 | |
170 | extern int cgit_get_cmd_index(const char *cmd); |
170 | extern int cgit_get_cmd_index(const char *cmd); |
171 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
171 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
172 | extern void cgit_global_config_cb(const char *name, const char *value); |
172 | extern void cgit_global_config_cb(const char *name, const char *value); |
173 | extern void cgit_repo_config_cb(const char *name, const char *value); |
173 | extern void cgit_repo_config_cb(const char *name, const char *value); |
174 | extern void cgit_querystring_cb(const char *name, const char *value); |
174 | extern void cgit_querystring_cb(const char *name, const char *value); |
175 | |
175 | |
176 | extern int chk_zero(int result, char *msg); |
176 | extern int chk_zero(int result, char *msg); |
177 | extern int chk_positive(int result, char *msg); |
177 | extern int chk_positive(int result, char *msg); |
178 | extern int chk_non_negative(int result, char *msg); |
178 | extern int chk_non_negative(int result, char *msg); |
179 | |
179 | |
180 | extern int hextoint(char c); |
180 | extern int hextoint(char c); |
181 | extern char *trim_end(const char *str, char c); |
181 | extern char *trim_end(const char *str, char c); |
182 | |
182 | |
183 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
183 | extern void cgit_add_ref(struct reflist *list, struct refinfo *ref); |
184 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
184 | extern int cgit_refs_cb(const char *refname, const unsigned char *sha1, |
185 | int flags, void *cb_data); |
185 | int flags, void *cb_data); |
186 | |
186 | |
187 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
187 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
188 | |
188 | |
189 | extern int cgit_diff_files(const unsigned char *old_sha1, |
189 | extern int cgit_diff_files(const unsigned char *old_sha1, |
190 | const unsigned char *new_sha1, |
190 | const unsigned char *new_sha1, |
191 | linediff_fn fn); |
191 | linediff_fn fn); |
192 | |
192 | |
193 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
193 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
194 | const unsigned char *new_sha1, |
194 | const unsigned char *new_sha1, |
195 | filepair_fn fn, const char *prefix); |
195 | filepair_fn fn, const char *prefix); |
196 | |
196 | |
197 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
197 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
198 | |
198 | |
199 | extern char *fmt(const char *format,...); |
199 | extern char *fmt(const char *format,...); |
200 | |
200 | |
201 | extern void html(const char *txt); |
201 | extern void html(const char *txt); |
202 | extern void htmlf(const char *format,...); |
202 | extern void htmlf(const char *format,...); |
203 | extern void html_txt(char *txt); |
203 | extern void html_txt(char *txt); |
204 | extern void html_ntxt(int len, char *txt); |
204 | extern void html_ntxt(int len, char *txt); |
205 | extern void html_attr(char *txt); |
205 | extern void html_attr(char *txt); |
206 | extern void html_hidden(char *name, char *value); |
206 | extern void html_hidden(char *name, char *value); |
| |
207 | extern void html_option(char *value, char *text, char *selected_value); |
207 | extern void html_link_open(char *url, char *title, char *class); |
208 | extern void html_link_open(char *url, char *title, char *class); |
208 | extern void html_link_close(void); |
209 | extern void html_link_close(void); |
209 | extern void html_filemode(unsigned short mode); |
210 | extern void html_filemode(unsigned short mode); |
210 | extern int html_include(const char *filename); |
211 | extern int html_include(const char *filename); |
211 | |
212 | |
212 | extern int cgit_read_config(const char *filename, configfn fn); |
213 | extern int cgit_read_config(const char *filename, configfn fn); |
213 | extern int cgit_parse_query(char *txt, configfn fn); |
214 | extern int cgit_parse_query(char *txt, configfn fn); |
214 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
215 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
215 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
216 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
216 | extern void cgit_parse_url(const char *url); |
217 | extern void cgit_parse_url(const char *url); |
217 | |
218 | |
218 | extern char *cache_safe_filename(const char *unsafe); |
219 | extern char *cache_safe_filename(const char *unsafe); |
219 | extern int cache_lock(struct cacheitem *item); |
220 | extern int cache_lock(struct cacheitem *item); |
220 | extern int cache_unlock(struct cacheitem *item); |
221 | extern int cache_unlock(struct cacheitem *item); |
221 | extern int cache_cancel_lock(struct cacheitem *item); |
222 | extern int cache_cancel_lock(struct cacheitem *item); |
222 | extern int cache_exist(struct cacheitem *item); |
223 | extern int cache_exist(struct cacheitem *item); |
223 | extern int cache_expired(struct cacheitem *item); |
224 | extern int cache_expired(struct cacheitem *item); |
224 | |
225 | |
225 | extern char *cgit_repourl(const char *reponame); |
226 | extern char *cgit_repourl(const char *reponame); |
226 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
227 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
227 | const char *filename, const char *query); |
228 | const char *filename, const char *query); |
228 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
229 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
229 | const char *query); |
230 | const char *query); |
230 | |
231 | |
231 | extern const char *cgit_repobasename(const char *reponame); |
232 | extern const char *cgit_repobasename(const char *reponame); |
232 | |
233 | |
233 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
234 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
234 | char *rev, char *path); |
235 | char *rev, char *path); |
235 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
236 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
236 | char *rev, char *path, int ofs); |
237 | char *rev, char *path, int ofs); |
237 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
238 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
238 | char *rev); |
239 | char *rev); |
239 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
240 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
240 | char *rev, char *path); |
241 | char *rev, char *path); |
241 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
242 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
242 | char *head, char *rev, char *archivename); |
243 | char *head, char *rev, char *archivename); |
243 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
244 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
244 | char *new_rev, char *old_rev, char *path); |
245 | char *new_rev, char *old_rev, char *path); |
245 | |
246 | |
246 | extern void cgit_object_link(struct object *obj); |
247 | extern void cgit_object_link(struct object *obj); |
247 | |
248 | |
248 | extern void cgit_print_error(char *msg); |
249 | extern void cgit_print_error(char *msg); |
249 | extern void cgit_print_date(time_t secs, char *format); |
250 | extern void cgit_print_date(time_t secs, char *format); |
250 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
251 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
251 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
252 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
252 | extern void cgit_print_docend(); |
253 | extern void cgit_print_docend(); |
253 | extern void cgit_print_pageheader(char *title, int show_search); |
254 | extern void cgit_print_pageheader(char *title, int show_search); |
254 | extern void cgit_print_snapshot_start(const char *mimetype, |
255 | extern void cgit_print_snapshot_start(const char *mimetype, |
|
|
diff --git a/html.c b/html.c index 76fa6c4..6c9cc8b 100644 --- a/ html.c+++ b/ html.c |
|
@@ -81,96 +81,108 @@ void html_ntxt(int len, char *txt) |
81 | else if (c=='&') |
81 | else if (c=='&') |
82 | html("&"); |
82 | html("&"); |
83 | txt = t+1; |
83 | txt = t+1; |
84 | } |
84 | } |
85 | t++; |
85 | t++; |
86 | } |
86 | } |
87 | if (t!=txt) { |
87 | if (t!=txt) { |
88 | char c = *t; |
88 | char c = *t; |
89 | *t = '\0'; |
89 | *t = '\0'; |
90 | html(txt); |
90 | html(txt); |
91 | *t = c; |
91 | *t = c; |
92 | } |
92 | } |
93 | if (len<0) |
93 | if (len<0) |
94 | html("..."); |
94 | html("..."); |
95 | } |
95 | } |
96 | |
96 | |
97 | void html_attr(char *txt) |
97 | void html_attr(char *txt) |
98 | { |
98 | { |
99 | char *t = txt; |
99 | char *t = txt; |
100 | while(t && *t){ |
100 | while(t && *t){ |
101 | int c = *t; |
101 | int c = *t; |
102 | if (c=='<' || c=='>' || c=='\'') { |
102 | if (c=='<' || c=='>' || c=='\'') { |
103 | *t = '\0'; |
103 | *t = '\0'; |
104 | html(txt); |
104 | html(txt); |
105 | *t = c; |
105 | *t = c; |
106 | if (c=='>') |
106 | if (c=='>') |
107 | html(">"); |
107 | html(">"); |
108 | else if (c=='<') |
108 | else if (c=='<') |
109 | html("<"); |
109 | html("<"); |
110 | else if (c=='\'') |
110 | else if (c=='\'') |
111 | html(""e;"); |
111 | html(""e;"); |
112 | txt = t+1; |
112 | txt = t+1; |
113 | } |
113 | } |
114 | t++; |
114 | t++; |
115 | } |
115 | } |
116 | if (t!=txt) |
116 | if (t!=txt) |
117 | html(txt); |
117 | html(txt); |
118 | } |
118 | } |
119 | |
119 | |
120 | void html_hidden(char *name, char *value) |
120 | void html_hidden(char *name, char *value) |
121 | { |
121 | { |
122 | html("<input type='hidden' name='"); |
122 | html("<input type='hidden' name='"); |
123 | html_attr(name); |
123 | html_attr(name); |
124 | html("' value='"); |
124 | html("' value='"); |
125 | html_attr(value); |
125 | html_attr(value); |
126 | html("'/>"); |
126 | html("'/>"); |
127 | } |
127 | } |
128 | |
128 | |
| |
129 | void html_option(char *value, char *text, char *selected_value) |
| |
130 | { |
| |
131 | html("<option value='"); |
| |
132 | html_attr(value); |
| |
133 | html("'"); |
| |
134 | if (selected_value && !strcmp(selected_value, value)) |
| |
135 | html(" selected"); |
| |
136 | html(">"); |
| |
137 | html_txt(text); |
| |
138 | html("</option>\n"); |
| |
139 | } |
| |
140 | |
129 | void html_link_open(char *url, char *title, char *class) |
141 | void html_link_open(char *url, char *title, char *class) |
130 | { |
142 | { |
131 | html("<a href='"); |
143 | html("<a href='"); |
132 | html_attr(url); |
144 | html_attr(url); |
133 | if (title) { |
145 | if (title) { |
134 | html("' title='"); |
146 | html("' title='"); |
135 | html_attr(title); |
147 | html_attr(title); |
136 | } |
148 | } |
137 | if (class) { |
149 | if (class) { |
138 | html("' class='"); |
150 | html("' class='"); |
139 | html_attr(class); |
151 | html_attr(class); |
140 | } |
152 | } |
141 | html("'>"); |
153 | html("'>"); |
142 | } |
154 | } |
143 | |
155 | |
144 | void html_link_close(void) |
156 | void html_link_close(void) |
145 | { |
157 | { |
146 | html("</a>"); |
158 | html("</a>"); |
147 | } |
159 | } |
148 | |
160 | |
149 | void html_fileperm(unsigned short mode) |
161 | void html_fileperm(unsigned short mode) |
150 | { |
162 | { |
151 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
163 | htmlf("%c%c%c", (mode & 4 ? 'r' : '-'), |
152 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
164 | (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-')); |
153 | } |
165 | } |
154 | |
166 | |
155 | void html_filemode(unsigned short mode) |
167 | void html_filemode(unsigned short mode) |
156 | { |
168 | { |
157 | if (S_ISDIR(mode)) |
169 | if (S_ISDIR(mode)) |
158 | html("d"); |
170 | html("d"); |
159 | else if (S_ISLNK(mode)) |
171 | else if (S_ISLNK(mode)) |
160 | html("l"); |
172 | html("l"); |
161 | else if (S_ISGITLINK(mode)) |
173 | else if (S_ISGITLINK(mode)) |
162 | html("m"); |
174 | html("m"); |
163 | else |
175 | else |
164 | html("-"); |
176 | html("-"); |
165 | html_fileperm(mode >> 6); |
177 | html_fileperm(mode >> 6); |
166 | html_fileperm(mode >> 3); |
178 | html_fileperm(mode >> 3); |
167 | html_fileperm(mode); |
179 | html_fileperm(mode); |
168 | } |
180 | } |
169 | |
181 | |
170 | int html_include(const char *filename) |
182 | int html_include(const char *filename) |
171 | { |
183 | { |
172 | FILE *f; |
184 | FILE *f; |
173 | char buf[4096]; |
185 | char buf[4096]; |
174 | size_t len; |
186 | size_t len; |
175 | |
187 | |
176 | if (!(f = fopen(filename, "r"))) |
188 | if (!(f = fopen(filename, "r"))) |
|