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
@@ -62,33 +62,33 @@ void print_fileinfo(struct fileinfo *info)
         html("<tr>");
         htmlf("<td class='mode'>");
         if (is_null_sha1(info->new_sha1)) {
                 html_filemode(info->old_mode);
         } else {
                 html_filemode(info->new_mode);
         }
 
         if (info->old_mode != info->new_mode &&
             !is_null_sha1(info->old_sha1) &&
             !is_null_sha1(info->new_sha1)) {
                 html("<span class='modechange'>[");
                 html_filemode(info->old_mode);
                 html("]</span>");
         }
         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);
         html_link_open(cgit_pageurl(cgit_query_repo, "diff", query),
                        NULL, NULL);
         if (info->status == DIFF_STATUS_COPIED ||
             info->status == DIFF_STATUS_RENAMED) {
                 html_txt(info->new_path);
                 htmlf("</a> (%s from ", info->status == DIFF_STATUS_COPIED ?
                       "copied" : "renamed");
                 query2 = fmt("id=%s", sha1_to_hex(info->old_sha1));
                 html_link_open(cgit_pageurl(cgit_query_repo, "view", query2),
                                NULL, NULL);
                 html_txt(info->old_path);
                 html("</a>)");
         } else {
                 html_txt(info->new_path);
                 html("</a>");
@@ -169,61 +169,61 @@ void cgit_print_commit(const char *hex)
         html("<table class='commit-info'>\n");
         html("<tr><th>author</th><td>");
         html_txt(info->author);
         html(" ");
         html_txt(info->author_email);
         html("</td><td class='right'>");
         cgit_print_date(info->author_date, FMT_LONGDATE);
         html("</td></tr>\n");
         html("<tr><th>committer</th><td>");
         html_txt(info->committer);
         html(" ");
         html_txt(info->committer_email);
         html("</td><td class='right'>");
         cgit_print_date(info->committer_date, FMT_LONGDATE);
         html("</td></tr>\n");
         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));
         html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
         htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
               for (p = commit->parents; p ; p = p->next) {
                 parent = lookup_commit_reference(p->item->object.sha1);
                 if (!parent) {
                         html("<tr><td colspan='3'>");
                         cgit_print_error("Error reading parent commit");
                         html("</td></tr>");
                         continue;
                 }
                 html("<tr><th>parent</th>"
                      "<td colspan='2' class='sha1'>"
                      "<a href='");
                 query = fmt("h=%s", sha1_to_hex(p->item->object.sha1));
                 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
                 htmlf("'>%s</a> (<a href='",
                       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));
                 html_attr(cgit_pageurl(cgit_query_repo, "diff", query));
                 html("'>diff</a>)</td></tr>");
         }
         if (cgit_repo->snapshots) {
                 htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='");
                 filename = fmt("%s-%s.zip", cgit_query_repo, hex);
                 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);
         }
         html("</table>\n");
         html("<div class='commit-subject'>");
         html_txt(info->subject);
         html("</div>");
         html("<div class='commit-msg'>");
         html_txt(info->msg);
         html("</div>");
         if (!(commit->parents && commit->parents->next && commit->parents->next->next)) {
                 html("<div class='diffstat-header'>Diffstat</div>");
                 html("<table class='diffstat'>");
                 max_changes = 0;
                 cgit_diff_commit(commit, inspect_filepair);
                 for(i = 0; i<files; i++)
                         print_fileinfo(&items[i]);
diff --git a/ui-log.c b/ui-log.c
index c80fd73..75bbbe4 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -101,28 +101,28 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
                 commit->parents = NULL;
         }
 
         for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
                 print_commit(commit);
                 free(commit->buffer);
                 commit->buffer = NULL;
                 free_commit_list(commit->parents);
                 commit->parents = NULL;
         }
         html("</table>\n");
 
         html("<div class='pager'>");
         if (ofs > 0) {
                 html("&nbsp;<a href='");
                 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;");
                }
 
         if ((commit = get_revision(&rev)) != NULL) {
                 html("&nbsp;<a href='");
                 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("</div>");
 }
diff --git a/ui-shared.c b/ui-shared.c
index c8c1c21..aba93e8 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -56,35 +56,35 @@ char *cgit_repourl(const char *reponame)
                 return fmt("?r=%s", reponame);
         }
 }
 
 char *cgit_pageurl(const char *reponame, const char *pagename,
                    const char *query)
 {
         if (cgit_virtual_root) {
                 if (query)
                         return fmt("%s/%s/%s/?%s", cgit_virtual_root, reponame,
                                    pagename, query);
                 else
                         return fmt("%s/%s/%s/", cgit_virtual_root, reponame,
                                    pagename);
         } else {
                 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
-                        return fmt("?r=%s&p=%s", reponame, pagename);
+                        return fmt("?r=%s&amp;p=%s", reponame, pagename);
         }
 }
 
 char *cgit_currurl()
 {
         if (!cgit_virtual_root)
                 return cgit_script_name;
         else if (cgit_query_page)
                 return fmt("%s/%s/%s/", cgit_virtual_root, cgit_query_repo, cgit_query_page);
         else if (cgit_query_repo)
                 return fmt("%s/%s/", cgit_virtual_root, cgit_query_repo);
         else
                 return fmt("%s/", cgit_virtual_root);
 }
 
 
diff --git a/ui-summary.c b/ui-summary.c
index 18608b8..15e8aec 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -146,33 +146,33 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
                 tag = lookup_tag(sha1);
                 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
                         return 0;
                 hashcpy(fileid, tag->tagged->sha1);
         } else if (obj->type != OBJ_BLOB) {
                 return 0;
         } else {
                 hashcpy(fileid, sha1);
         }
         if (!header) {
                 html("<table id='downloads'>");
                 html("<tr><th>Downloads</th></tr>");
                 header = 1;
         }
         html("<tr><td>");
         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));
         html_link_open(url, NULL, NULL);
         html_txt(buf);
         html_link_close();
         html("</td></tr>");
         return 0;
 }
 
 static void cgit_print_branches()
 {
         html("<tr class='nohover'><th class='left'>Branch</th>"
              "<th class='left'>Idle</th>"
              "<th class='left'>Author</th>"
              "<th class='left'>Head commit</th></tr>\n");
         for_each_branch_ref(cgit_print_branch_cb, NULL);
 }
diff --git a/ui-tree.c b/ui-tree.c
index 006ca47..cb57d8d 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -24,51 +24,51 @@ static int print_entry(const unsigned char *sha1, const char *base,
                 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
                       name,
                       sha1_to_hex(sha1));
                 return 0;
         }
         html("<tr><td class='filemode'>");
         html_filemode(mode);
         html("</td><td ");
         if (S_ISDIRLNK(mode)) {
                 htmlf("class='ls-mod'><a href='");
                 html_attr(fmt(cgit_repo->module_link,
                               name,
                               sha1_to_hex(sha1)));
         } else if (S_ISDIR(mode)) {
                 html("class='ls-dir'><a href='");
                 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,
                                            sha1_to_hex(sha1),
                                            cgit_query_path ? cgit_query_path : "",
                                            pathname)));
         } else {
                 html("class='ls-blob'><a href='");
                 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),
                                           cgit_query_path ? cgit_query_path : "",
                                           pathname)));
         }
         htmlf("'>%s</a></td>", name);
         htmlf("<td class='filesize'>%li</td>", size);
 
         html("<td class='links'><a href='");
         html_attr(cgit_pageurl(cgit_query_repo, "log",
-                               fmt("h=%s&path=%s%s",
+                               fmt("h=%s&amp;path=%s%s",
                                    curr_rev,
                                    cgit_query_path ? cgit_query_path : "",
                                    pathname)));
         html("'>history</a></td>");
         html("</tr>\n");
         free(name);
         return 0;
 }
 
 void cgit_print_tree(const char *rev, const char *hex, char *path)
 {
         struct tree *tree;
         unsigned char sha1[20];
         struct commit *commit;
 
         curr_rev = xstrdup(rev);
diff --git a/ui-view.c b/ui-view.c
index dbe4b29..8873415 100644
--- a/ui-view.c
+++ b/ui-view.c
@@ -30,26 +30,26 @@ void cgit_print_view(const char *hex, char *path)
         if (!buf) {
                 cgit_print_error(fmt("Error reading object %s", hex));
                 return;
         }
 
         buf[size] = '\0';
         html("<table class='list'>\n");
         html("<tr class='nohover'><th class='left'>");
         if (path)
                 htmlf("%s (", path);
         htmlf("%s %s, %li bytes", typename(type), hex, size);
         if (path)
                 html(")");
 
         html(" <a href='");
         html_attr(cgit_pageurl(cgit_query_repo, "blob", 
-                               fmt("id=%s&path=%s", 
+                               fmt("id=%s&amp;path=%s", 
                                    hex,
                                    path)));
         html("'>download</a>");
         html("</th></tr>\n");
         html("<tr><td class='blob'>\n");
         html_txt(buf);
         html("\n</td></tr>\n");
         html("</table>\n");
 }