summaryrefslogtreecommitdiffabout
authorRémi Lagacé <rlagace@cld.ca>2010-07-13 17:15:09 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2010-07-13 17:24:55 (UTC)
commit73ac0fb6f217addbcd7878828407392418c973de (patch) (unidiff)
tree022166308396b5ef351f98a44390248f08cfd268
parentf072bc55b08675db93b2f892016e83d9f975dea2 (diff)
downloadcgit-73ac0fb6f217addbcd7878828407392418c973de.zip
cgit-73ac0fb6f217addbcd7878828407392418c973de.tar.gz
cgit-73ac0fb6f217addbcd7878828407392418c973de.tar.bz2
Reencode author and committer
When a commit has a specific encoding, this encoding also applies to the author and committer name and email. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/parsing.c b/parsing.c
index f3f3b15..f37c49d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -161,64 +161,68 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
161 } 161 }
162 162
163 // skip unknown header fields 163 // skip unknown header fields
164 while (p && *p && (*p != '\n')) { 164 while (p && *p && (*p != '\n')) {
165 p = strchr(p, '\n'); 165 p = strchr(p, '\n');
166 if (p) 166 if (p)
167 p++; 167 p++;
168 } 168 }
169 169
170 // skip empty lines between headers and message 170 // skip empty lines between headers and message
171 while (p && *p == '\n') 171 while (p && *p == '\n')
172 p++; 172 p++;
173 173
174 if (!p) 174 if (!p)
175 return ret; 175 return ret;
176 176
177 t = strchr(p, '\n'); 177 t = strchr(p, '\n');
178 if (t) { 178 if (t) {
179 ret->subject = substr(p, t); 179 ret->subject = substr(p, t);
180 p = t + 1; 180 p = t + 1;
181 181
182 while (p && *p == '\n') { 182 while (p && *p == '\n') {
183 p = strchr(p, '\n'); 183 p = strchr(p, '\n');
184 if (p) 184 if (p)
185 p++; 185 p++;
186 } 186 }
187 if (p) 187 if (p)
188 ret->msg = xstrdup(p); 188 ret->msg = xstrdup(p);
189 } else 189 } else
190 ret->subject = xstrdup(p); 190 ret->subject = xstrdup(p);
191 191
192 if (ret->msg_encoding) { 192 if (ret->msg_encoding) {
193 reencode(&ret->author, PAGE_ENCODING, ret->msg_encoding);
194 reencode(&ret->author_email, PAGE_ENCODING, ret->msg_encoding);
195 reencode(&ret->committer, PAGE_ENCODING, ret->msg_encoding);
196 reencode(&ret->committer_email, PAGE_ENCODING, ret->msg_encoding);
193 reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding); 197 reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding);
194 reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding); 198 reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding);
195 } 199 }
196 200
197 return ret; 201 return ret;
198} 202}
199 203
200 204
201struct taginfo *cgit_parse_tag(struct tag *tag) 205struct taginfo *cgit_parse_tag(struct tag *tag)
202{ 206{
203 void *data; 207 void *data;
204 enum object_type type; 208 enum object_type type;
205 unsigned long size; 209 unsigned long size;
206 char *p; 210 char *p;
207 struct taginfo *ret; 211 struct taginfo *ret;
208 212
209 data = read_sha1_file(tag->object.sha1, &type, &size); 213 data = read_sha1_file(tag->object.sha1, &type, &size);
210 if (!data || type != OBJ_TAG) { 214 if (!data || type != OBJ_TAG) {
211 free(data); 215 free(data);
212 return 0; 216 return 0;
213 } 217 }
214 218
215 ret = xmalloc(sizeof(*ret)); 219 ret = xmalloc(sizeof(*ret));
216 ret->tagger = NULL; 220 ret->tagger = NULL;
217 ret->tagger_email = NULL; 221 ret->tagger_email = NULL;
218 ret->tagger_date = 0; 222 ret->tagger_date = 0;
219 ret->msg = NULL; 223 ret->msg = NULL;
220 224
221 p = data; 225 p = data;
222 226
223 while (p && *p) { 227 while (p && *p) {
224 if (*p == '\n') 228 if (*p == '\n')