aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Ondrej Jirman <ondrej.jirman@zonio.net>2007-05-26 08:15:10 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2007-05-31 17:18:38 (JST)
commit1a63cfcc3d83919e790e7e279eb35fc75adb0e3c (patch)
treea2c613c6ae642dd6a4015142ccf04ed7c5629b8f
parent0928d8827a714f3908efa7eb9eb4cde28761af26 (diff)
downloadcgit-1a63cfcc3d83919e790e7e279eb35fc75adb0e3c.zip
cgit-1a63cfcc3d83919e790e7e279eb35fc75adb0e3c.tar.gz
Use &amp; instead of & in URLs.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--ui-commit.c8
-rw-r--r--ui-log.c4
-rw-r--r--ui-shared.c4
-rw-r--r--ui-summary.c2
-rw-r--r--ui-tree.c6
-rw-r--r--ui-view.c2
6 files changed, 13 insertions, 13 deletions
diff --git a/ui-commit.c b/ui-commit.c
index 6b135aa..1d12bbb 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,7 +75,7 @@ void print_fileinfo(struct fileinfo *info)
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 query = fmt("id=%s&id2=%s&path=%s", sha1_to_hex(info->old_sha1), 78 query = fmt("id=%s&amp;id2=%s&amp;path=%s", sha1_to_hex(info->old_sha1),
79 sha1_to_hex(info->new_sha1), info->new_path); 79 sha1_to_hex(info->new_sha1), info->new_path);
80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), 80 html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
81 NULL, NULL); 81 NULL, NULL);
@@ -182,7 +182,7 @@ void cgit_print_commit(const char *hex)
182 cgit_print_date(info->committer_date, FMT_LONGDATE); 182 cgit_print_date(info->committer_date, FMT_LONGDATE);
183 html("</td></tr>\n"); 183 html("</td></tr>\n");
184 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 184 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
185 query = fmt("h=%s&id=%s", sha1_to_hex(commit->object.sha1), 185 query = fmt("h=%s&amp;id=%s", sha1_to_hex(commit->object.sha1),
186 sha1_to_hex(commit->tree->object.sha1)); 186 sha1_to_hex(commit->tree->object.sha1));
187 html_attr(cgit_pageurl(cgit_query_repo, "tree", query)); 187 html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
188 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 188 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
@@ -201,7 +201,7 @@ void cgit_print_commit(const char *hex)
201 html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); 201 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
202 htmlf("'>%s</a> (<a href='", 202 htmlf("'>%s</a> (<a href='",
203 sha1_to_hex(p->item->object.sha1)); 203 sha1_to_hex(p->item->object.sha1));
204 query = fmt("id=%s&id2=%s", sha1_to_hex(parent->tree->object.sha1), 204 query = fmt("id=%s&amp;id2=%s", sha1_to_hex(parent->tree->object.sha1),
205 sha1_to_hex(commit->tree->object.sha1)); 205 sha1_to_hex(commit->tree->object.sha1));
206 html_attr(cgit_pageurl(cgit_query_repo, "diff", query)); 206 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
207 html("'>diff</a>)</td></tr>"); 207 html("'>diff</a>)</td></tr>");
@@ -210,7 +210,7 @@ void cgit_print_commit(const char *hex)
210 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); 210 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
211 filename = fmt("%s-%s.zip", cgit_query_repo, hex); 211 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
212 html_attr(cgit_pageurl(cgit_query_repo, "snapshot", 212 html_attr(cgit_pageurl(cgit_query_repo, "snapshot",
213 fmt("id=%s&name=%s", hex, filename))); 213 fmt("id=%s&amp;name=%s", hex, filename)));
214 htmlf("'>%s</a></td></tr>", filename); 214 htmlf("'>%s</a></td></tr>", filename);
215 } 215 }
216 html("</table>\n"); 216 html("</table>\n");
diff --git a/ui-log.c b/ui-log.c
index c80fd73..75bbbe4 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -114,14 +114,14 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
114 if (ofs > 0) { 114 if (ofs > 0) {
115 html("&nbsp;<a href='"); 115 html("&nbsp;<a href='");
116 html(cgit_pageurl(cgit_query_repo, cgit_query_page, 116 html(cgit_pageurl(cgit_query_repo, cgit_query_page,
117 fmt("h=%s&ofs=%d", tip, ofs-cnt))); 117 fmt("h=%s&amp;ofs=%d", tip, ofs-cnt)));
118 html("'>[prev]</a>&nbsp;"); 118 html("'>[prev]</a>&nbsp;");
119 } 119 }
120 120
121 if ((commit = get_revision(&rev)) != NULL) { 121 if ((commit = get_revision(&rev)) != NULL) {
122 html("&nbsp;<a href='"); 122 html("&nbsp;<a href='");
123 html(cgit_pageurl(cgit_query_repo, "log", 123 html(cgit_pageurl(cgit_query_repo, "log",
124 fmt("h=%s&ofs=%d", tip, ofs+cnt))); 124 fmt("h=%s&amp;ofs=%d", tip, ofs+cnt)));
125 html("'>[next]</a>&nbsp;"); 125 html("'>[next]</a>&nbsp;");
126 } 126 }
127 html("</div>"); 127 html("</div>");
diff --git a/ui-shared.c b/ui-shared.c
index c8c1c21..aba93e8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -69,9 +69,9 @@ char *cgit_pageurl(const char *reponame, const char *pagename,
69 pagename); 69 pagename);
70 } else { 70 } else {
71 if (query) 71 if (query)
72 return fmt("?r=%s&p=%s&%s", reponame, pagename, query); 72 return fmt("?r=%s&amp;p=%s&amp;%s", reponame, pagename, query);
73 else 73 else
74 return fmt("?r=%s&p=%s", reponame, pagename); 74 return fmt("?r=%s&amp;p=%s", reponame, pagename);
75 } 75 }
76} 76}
77 77
diff --git a/ui-summary.c b/ui-summary.c
index 18608b8..15e8aec 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -159,7 +159,7 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
159 } 159 }
160 html("<tr><td>"); 160 html("<tr><td>");
161 url = cgit_pageurl(cgit_query_repo, "blob", 161 url = cgit_pageurl(cgit_query_repo, "blob",
162 fmt("id=%s&path=%s", sha1_to_hex(fileid), 162 fmt("id=%s&amp;path=%s", sha1_to_hex(fileid),
163 buf)); 163 buf));
164 html_link_open(url, NULL, NULL); 164 html_link_open(url, NULL, NULL);
165 html_txt(buf); 165 html_txt(buf);
diff --git a/ui-tree.c b/ui-tree.c
index 006ca47..cb57d8d 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -37,7 +37,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
37 } else if (S_ISDIR(mode)) { 37 } else if (S_ISDIR(mode)) {
38 html("class='ls-dir'><a href='"); 38 html("class='ls-dir'><a href='");
39 html_attr(cgit_pageurl(cgit_query_repo, "tree", 39 html_attr(cgit_pageurl(cgit_query_repo, "tree",
40 fmt("h=%s&id=%s&path=%s%s/", 40 fmt("h=%s&amp;id=%s&amp;path=%s%s/",
41 curr_rev, 41 curr_rev,
42 sha1_to_hex(sha1), 42 sha1_to_hex(sha1),
43 cgit_query_path ? cgit_query_path : "", 43 cgit_query_path ? cgit_query_path : "",
@@ -45,7 +45,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
45 } else { 45 } else {
46 html("class='ls-blob'><a href='"); 46 html("class='ls-blob'><a href='");
47 html_attr(cgit_pageurl(cgit_query_repo, "view", 47 html_attr(cgit_pageurl(cgit_query_repo, "view",
48 fmt("h=%s&id=%s&path=%s%s", curr_rev, 48 fmt("h=%s&amp;id=%s&amp;path=%s%s", curr_rev,
49 sha1_to_hex(sha1), 49 sha1_to_hex(sha1),
50 cgit_query_path ? cgit_query_path : "", 50 cgit_query_path ? cgit_query_path : "",
51 pathname))); 51 pathname)));
@@ -55,7 +55,7 @@ static int print_entry(const unsigned char *sha1, const char *base,
55 55
56 html("<td class='links'><a href='"); 56 html("<td class='links'><a href='");
57 html_attr(cgit_pageurl(cgit_query_repo, "log", 57 html_attr(cgit_pageurl(cgit_query_repo, "log",
58 fmt("h=%s&path=%s%s", 58 fmt("h=%s&amp;path=%s%s",
59 curr_rev, 59 curr_rev,
60 cgit_query_path ? cgit_query_path : "", 60 cgit_query_path ? cgit_query_path : "",
61 pathname))); 61 pathname)));
diff --git a/ui-view.c b/ui-view.c
index dbe4b29..8873415 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -43,7 +43,7 @@ void cgit_print_view(const char *hex, char *path)
43 43
44 html(" <a href='"); 44 html(" <a href='");
45 html_attr(cgit_pageurl(cgit_query_repo, "blob", 45 html_attr(cgit_pageurl(cgit_query_repo, "blob",
46 fmt("id=%s&path=%s", 46 fmt("id=%s&amp;path=%s",
47 hex, 47 hex,
48 path))); 48 path)));
49 html("'>download</a>"); 49 html("'>download</a>");