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) (unidiff) | |
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 | |||
@@ -101,87 +101,90 @@ static int cgit_print_tag_cb(const char *refname, const unsigned char *sha1, | |||
101 | fmt("id=%s", sha1_to_hex(sha1))); | 101 | fmt("id=%s", sha1_to_hex(sha1))); |
102 | html_link_open(url, NULL, NULL); | 102 | html_link_open(url, NULL, NULL); |
103 | html_txt(buf); | 103 | html_txt(buf); |
104 | html_link_close(); | 104 | html_link_close(); |
105 | html("</td><td>"); | 105 | html("</td><td>"); |
106 | if (info->tagger_date > 0) | 106 | if (info->tagger_date > 0) |
107 | cgit_print_date(info->tagger_date); | 107 | cgit_print_date(info->tagger_date); |
108 | html("</td><td>"); | 108 | html("</td><td>"); |
109 | if (info->tagger) | 109 | if (info->tagger) |
110 | html(info->tagger); | 110 | html(info->tagger); |
111 | html("</td><td>"); | 111 | html("</td><td>"); |
112 | cgit_print_object_ref(tag->tagged); | 112 | cgit_print_object_ref(tag->tagged); |
113 | html("</td></tr>\n"); | 113 | html("</td></tr>\n"); |
114 | } else { | 114 | } else { |
115 | if (!header) | 115 | if (!header) |
116 | print_tag_header(); | 116 | print_tag_header(); |
117 | html("<tr><td>"); | 117 | html("<tr><td>"); |
118 | html_txt(buf); | 118 | html_txt(buf); |
119 | html("</td><td colspan='2'/><td>"); | 119 | html("</td><td colspan='2'/><td>"); |
120 | cgit_print_object_ref(obj); | 120 | cgit_print_object_ref(obj); |
121 | html("</td></tr>\n"); | 121 | html("</td></tr>\n"); |
122 | } | 122 | } |
123 | return 0; | 123 | return 0; |
124 | } | 124 | } |
125 | 125 | ||
126 | static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, | 126 | static int cgit_print_archive_cb(const char *refname, const unsigned char *sha1, |
127 | int flags, void *cb_data) | 127 | int flags, void *cb_data) |
128 | { | 128 | { |
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)); |
137 | obj = parse_object(sha1); | 138 | obj = parse_object(sha1); |
138 | if (!obj) | 139 | if (!obj) |
139 | return 1; | 140 | return 1; |
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(); |
160 | html("</td><tr>"); | 163 | html("</td><tr>"); |
161 | return 0; | 164 | return 0; |
162 | } | 165 | } |
163 | 166 | ||
164 | static void cgit_print_branches() | 167 | static void cgit_print_branches() |
165 | { | 168 | { |
166 | html("<tr class='nohover'><th class='left'>Branch</th>" | 169 | html("<tr class='nohover'><th class='left'>Branch</th>" |
167 | "<th class='left'>Updated</th>" | 170 | "<th class='left'>Updated</th>" |
168 | "<th class='left'>Author</th>" | 171 | "<th class='left'>Author</th>" |
169 | "<th class='left'>Head commit</th></tr>\n"); | 172 | "<th class='left'>Head commit</th></tr>\n"); |
170 | for_each_branch_ref(cgit_print_branch_cb, NULL); | 173 | for_each_branch_ref(cgit_print_branch_cb, NULL); |
171 | } | 174 | } |
172 | 175 | ||
173 | static void cgit_print_tags() | 176 | static void cgit_print_tags() |
174 | { | 177 | { |
175 | header = 0; | 178 | header = 0; |
176 | for_each_tag_ref(cgit_print_tag_cb, NULL); | 179 | for_each_tag_ref(cgit_print_tag_cb, NULL); |
177 | } | 180 | } |
178 | 181 | ||
179 | static void cgit_print_archives() | 182 | static void cgit_print_archives() |
180 | { | 183 | { |
181 | header = 0; | 184 | header = 0; |
182 | for_each_ref(cgit_print_archive_cb, NULL); | 185 | for_each_ref(cgit_print_archive_cb, NULL); |
183 | if (header) | 186 | if (header) |
184 | html("</table>"); | 187 | html("</table>"); |
185 | } | 188 | } |
186 | 189 | ||
187 | void cgit_print_summary() | 190 | void cgit_print_summary() |