aboutsummaryrefslogtreecommitdiffstats
path: root/ui-shared.c
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2008-10-05 20:13:33 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2008-10-05 20:13:33 (JST)
commit20c895f6889a66d7cf43c67a7c22df6ef324ed5d (patch)
tree4fc0c044fa0919cab562b371191add67114d07a9 /ui-shared.c
parent204669ff4a4028a82cc48e9319632595ba3ff703 (diff)
parentb575115d9d93e45cdbcd5d066cc445d34639ae6a (diff)
downloadcgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.zip
cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.gz
Merge branch 'lh/escape-urls'
* lh/escape-urls: ui-shared.c: use html_url_arg() html.c: add html_url_arg
Diffstat (limited to 'ui-shared.c')
-rw-r--r--ui-shared.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/ui-shared.c b/ui-shared.c
index c23bc75..a2f636c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -221,21 +221,21 @@ static char *repolink(char *title, char *class, char *page, char *head,
221 } else { 221 } else {
222 html(ctx.cfg.script_name); 222 html(ctx.cfg.script_name);
223 html("?url="); 223 html("?url=");
224 html_attr(ctx.repo->url); 224 html_url_arg(ctx.repo->url);
225 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') 225 if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
226 html("/"); 226 html("/");
227 if (page) { 227 if (page) {
228 html(page); 228 html_url_arg(page);
229 html("/"); 229 html("/");
230 if (path) 230 if (path)
231 html_attr(path); 231 html_url_arg(path);
232 } 232 }
233 delim = "&amp;"; 233 delim = "&amp;";
234 } 234 }
235 if (head && strcmp(head, ctx.repo->defbranch)) { 235 if (head && strcmp(head, ctx.repo->defbranch)) {
236 html(delim); 236 html(delim);
237 html("h="); 237 html("h=");
238 html_attr(head); 238 html_url_arg(head);
239 delim = "&amp;"; 239 delim = "&amp;";
240 } 240 }
241 return fmt("%s", delim); 241 return fmt("%s", delim);
@@ -250,7 +250,7 @@ static void reporevlink(char *page, char *name, char *title, char *class,
250 if (rev && strcmp(rev, ctx.qry.head)) { 250 if (rev && strcmp(rev, ctx.qry.head)) {
251 html(delim); 251 html(delim);
252 html("id="); 252 html("id=");
253 html_attr(rev); 253 html_url_arg(rev);
254 } 254 }
255 html("'>"); 255 html("'>");
256 html_txt(name); 256 html_txt(name);
@@ -278,17 +278,17 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
278 if (rev && strcmp(rev, ctx.qry.head)) { 278 if (rev && strcmp(rev, ctx.qry.head)) {
279 html(delim); 279 html(delim);
280 html("id="); 280 html("id=");
281 html_attr(rev); 281 html_url_arg(rev);
282 delim = "&"; 282 delim = "&";
283 } 283 }
284 if (grep && pattern) { 284 if (grep && pattern) {
285 html(delim); 285 html(delim);
286 html("qt="); 286 html("qt=");
287 html_attr(grep); 287 html_url_arg(grep);
288 delim = "&"; 288 delim = "&";
289 html(delim); 289 html(delim);
290 html("q="); 290 html("q=");
291 html_attr(pattern); 291 html_url_arg(pattern);
292 } 292 }
293 if (ofs > 0) { 293 if (ofs > 0) {
294 html(delim); 294 html(delim);
@@ -333,13 +333,13 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
333 if (new_rev && strcmp(new_rev, ctx.qry.head)) { 333 if (new_rev && strcmp(new_rev, ctx.qry.head)) {
334 html(delim); 334 html(delim);
335 html("id="); 335 html("id=");
336 html_attr(new_rev); 336 html_url_arg(new_rev);
337 delim = "&amp;"; 337 delim = "&amp;";
338 } 338 }
339 if (old_rev) { 339 if (old_rev) {
340 html(delim); 340 html(delim);
341 html("id2="); 341 html("id2=");
342 html_attr(old_rev); 342 html_url_arg(old_rev);
343 } 343 }
344 html("'>"); 344 html("'>");
345 html_txt(name); 345 html_txt(name);