Use & instead of & in URLs.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
This commit is contained in:
Ondrej Jirman 2007-05-26 01:15:10 +02:00 committed by Lars Hjemli
parent 0928d8827a
commit 1a63cfcc3d
6 changed files with 13 additions and 13 deletions

View File

@ -75,7 +75,7 @@ void print_fileinfo(struct fileinfo *info)
html("]</span>"); html("]</span>");
} }
htmlf("</td><td class='%s'>", class); htmlf("</td><td class='%s'>", class);
query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
sha1_to_hex(info->new_sha1), info->new_path); sha1_to_hex(info->new_sha1), info->new_path);
html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
NULL, NULL); NULL, NULL);
@ -182,7 +182,7 @@ void cgit_print_commit(const char *hex)
cgit_print_date(info->committer_date, FMT_LONGDATE); cgit_print_date(info->committer_date, FMT_LONGDATE);
html("</td></tr>\n"); html("</td></tr>\n");
html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), query = fmt("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1),
sha1_to_hex(commit->tree->object.sha1)); sha1_to_hex(commit->tree->object.sha1));
html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
@ -201,7 +201,7 @@ void cgit_print_commit(const char *hex)
html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
htmlf("'>%s</a> (<a href='", htmlf("'>%s</a> (<a href='",
sha1_to_hex(p->item->object.sha1)); sha1_to_hex(p->item->object.sha1));
query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
sha1_to_hex(commit->tree->object.sha1)); sha1_to_hex(commit->tree->object.sha1));
html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
html("'>diff</a>)</td></tr>"); html("'>diff</a>)</td></tr>");
@ -210,7 +210,7 @@ void cgit_print_commit(const char *hex)
htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
filename = fmt("%s-%s.zip", cgit_query_repo, hex); filename = fmt("%s-%s.zip", cgit_query_repo, hex);
html_attr(cgit_pageurl(cgit_query_repo, "snapshot", html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
fmt("id=%s&name=%s", hex, filename))); fmt("id=%s&amp;name=%s", hex, filename)));
htmlf("'>%s</a></td></tr>", filename); htmlf("'>%s</a></td></tr>", filename);
} }
html("</table>\n"); html("</table>\n");

View File

@ -114,14 +114,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
if (ofs > 0) { if (ofs > 0) {
html("&nbsp;<a href='"); html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, cgit_query_page, html(cgit_pageurl(cgit_query_repo, cgit_query_page,
fmt("h=%s&ofs=%d", tip, ofs-cnt))); fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
html("'>[prev]</a>&nbsp;"); html("'>[prev]</a>&nbsp;");
} }
if ((commit = get_revision(&rev)) != NULL) { if ((commit = get_revision(&rev)) != NULL) {
html("&nbsp;<a href='"); html("&nbsp;<a href='");
html(cgit_pageurl(cgit_query_repo, "log", html(cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s&ofs=%d", tip, ofs+cnt))); fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
html("'>[next]</a>&nbsp;"); html("'>[next]</a>&nbsp;");
} }
html("</div>"); html("</div>");

View File

@ -69,9 +69,9 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
pagename); pagename);
} else { } else {
if (query) if (query)
return fmt("?r=%s&p=%s&%s", reponame, pagename, query); return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
else else
return fmt("?r=%s&p=%s", reponame, pagename); return fmt("?r=%s&amp;p=%s", reponame, pagename);
} }
} }

View File

@ -159,7 +159,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
} }
html("<tr><td>"); html("<tr><td>");
url = cgit_pageurl(cgit_query_repo, "blob", url = cgit_pageurl(cgit_query_repo, "blob",
fmt("id=%s&path=%s", sha1_to_hex(fileid), fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
buf)); buf));
html_link_open(url, NULL, NULL); html_link_open(url, NULL, NULL);
html_txt(buf); html_txt(buf);

View File

@ -37,7 +37,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
} else if (S_ISDIR(mode)) { } else if (S_ISDIR(mode)) {
html("class='ls-dir'><a href='"); html("class='ls-dir'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "tree", html_attr(cgit_pageurl(cgit_query_repo, "tree",
fmt("h=%s&id=%s&path=%s%s/", fmt("h=%s&amp;id=%s&amp;path=%s%s/",
curr_rev, curr_rev,
sha1_to_hex(sha1), sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "", cgit_query_path ? cgit_query_path : "",
@ -45,7 +45,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
} else { } else {
html("class='ls-blob'><a href='"); html("class='ls-blob'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "view", html_attr(cgit_pageurl(cgit_query_repo, "view",
fmt("h=%s&id=%s&path=%s%s", curr_rev, fmt("h=%s&amp;id=%s&amp;path=%s%s", curr_rev,
sha1_to_hex(sha1), sha1_to_hex(sha1),
cgit_query_path ? cgit_query_path : "", cgit_query_path ? cgit_query_path : "",
pathname))); pathname)));
@ -55,7 +55,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
html("<td class='links'><a href='"); html("<td class='links'><a href='");
html_attr(cgit_pageurl(cgit_query_repo, "log", html_attr(cgit_pageurl(cgit_query_repo, "log",
fmt("h=%s&path=%s%s", fmt("h=%s&amp;path=%s%s",
curr_rev, curr_rev,
cgit_query_path ? cgit_query_path : "", cgit_query_path ? cgit_query_path : "",
pathname))); pathname)));

View File

@ -43,7 +43,7 @@ void cgit_print_view(const char *hex, char *path)
html(" <a href='"); html(" <a href='");
html_attr(cgit_pageurl(cgit_query_repo, "blob", html_attr(cgit_pageurl(cgit_query_repo, "blob",
fmt("id=%s&path=%s", fmt("id=%s&amp;path=%s",
hex, hex,
path))); path)));
html("'>download</a>"); html("'>download</a>");