author | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 23:05:39 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-14 23:05:39 (UTC) |
commit | cfd2aa079770ddb4c93d5995b2cd7b5f25da3681 (patch) (side-by-side diff) | |
tree | 44dd0fba85d035e445168b365618000ff82239f3 | |
parent | ea2831f1c826d92c0158474c2d07837ec2f9fd6c (diff) | |
download | cgit-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>
-rw-r--r-- | ui-summary.c | 7 |
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 @@ -109,71 +109,74 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, if (info->tagger) html(info->tagger); html("</td><td>"); cgit_print_object_ref(tag->tagged); html("</td></tr>\n"); } else { if (!header) print_tag_header(); html("<tr><td>"); html_txt(buf); html("</td><td colspan='2'/><td>"); cgit_print_object_ref(obj); html("</td></tr>\n"); } return 0; } static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, int flags, void *cb_data) { struct tag *tag; struct taginfo *info; struct object *obj; char buf[256], *url; + unsigned char fileid[20]; if (prefixcmp(refname, "refs/archives")) return 0; strncpy(buf, refname+14, sizeof(buf)); obj = parse_object(sha1); if (!obj) return 1; if (obj->type == OBJ_TAG) { tag = lookup_tag(sha1); if (!tag || parse_tag(tag) || !(info = cgit_parse_tag(tag))) return 0; - hashcpy(sha1, tag->tagged->sha1); + hashcpy(fileid, tag->tagged->sha1); } else if (obj->type != OBJ_BLOB) { return 0; + } else { + hashcpy(fileid, sha1); } if (!header) { html("<table>"); 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(sha1), + fmt("id=%s&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'>Updated</th>" "<th class='left'>Author</th>" "<th class='left'>Head commit</th></tr>\n"); for_each_branch_ref(cgit_print_branch_cb, NULL); } static void cgit_print_tags() { header = 0; for_each_tag_ref(cgit_print_tag_cb, NULL); } static void cgit_print_archives() |