summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-05-14 23:05:39 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-14 23:05:39 (UTC)
commitcfd2aa079770ddb4c93d5995b2cd7b5f25da3681 (patch) (unidiff)
tree44dd0fba85d035e445168b365618000ff82239f3
parentea2831f1c826d92c0158474c2d07837ec2f9fd6c (diff)
downloadcgit-cfd2aa079770ddb4c93d5995b2cd7b5f25da3681.zip
cgit-cfd2aa079770ddb4c93d5995b2cd7b5f25da3681.tar.gz
cgit-cfd2aa079770ddb4c93d5995b2cd7b5f25da3681.tar.bz2
Do not alter incoming sha1 when handling the download refs.
The code used to overwrite the const sha1 parameter just to avoid declaring an extra variable. Fix it. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-summary.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui-summary.c b/ui-summary.c
index 3410e1a..b99ea98 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -129,8 +129,9 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
129 struct tag *tag; 129 struct tag *tag;
130 struct taginfo *info; 130 struct taginfo *info;
131 struct object *obj; 131 struct object *obj;
132 char buf[256], *url; 132 char buf[256], *url;
133 unsigned char fileid[20];
133 134
134 if (prefixcmp(refname, "refs/archives")) 135 if (prefixcmp(refname, "refs/archives"))
135 return 0; 136 return 0;
136 strncpy(buf, refname+14, sizeof(buf)); 137 strncpy(buf, refname+14, sizeof(buf));
@@ -140,20 +141,22 @@ static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1,
140 if (obj->type == OBJ_TAG) { 141 if (obj->type == OBJ_TAG) {
141 tag = lookup_tag(sha1); 142 tag = lookup_tag(sha1);
142 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) 143 if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag)))
143 return 0; 144 return 0;
144 hashcpy(sha1, tag->tagged->sha1); 145 hashcpy(fileid, tag->tagged->sha1);
145 } else if (obj->type != OBJ_BLOB) { 146 } else if (obj->type != OBJ_BLOB) {
146 return 0; 147 return 0;
148 } else {
149 hashcpy(fileid, sha1);
147 } 150 }
148 if (!header) { 151 if (!header) {
149 html("<table>"); 152 html("<table>");
150 html("<tr><th>Downloads</th></tr>"); 153 html("<tr><th>Downloads</th></tr>");
151 header = 1; 154 header = 1;
152 } 155 }
153 html("<tr><td>"); 156 html("<tr><td>");
154 url = cgit_pageurl(cgit_query_repo, "blob", 157 url = cgit_pageurl(cgit_query_repo, "blob",
155 fmt("id=%s&path=%s", sha1_to_hex(sha1), 158 fmt("id=%s&path=%s", sha1_to_hex(fileid),
156 buf)); 159 buf));
157 html_link_open(url, NULL, NULL); 160 html_link_open(url, NULL, NULL);
158 html_txt(buf); 161 html_txt(buf);
159 html_link_close(); 162 html_link_close();