summaryrefslogtreecommitdiffabout
path: root/parsing.c
authorOndrej Jirman <ondrej.jirman@zonio.net>2007-05-26 00:19:38 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-05-31 08:21:50 (UTC)
commit3ce6fc16ef4670c535c6e35d48c7f980ff8a5532 (patch) (unidiff)
tree7a3359b2e2488f0eaf350ba6a5e7865bbbabc969 /parsing.c
parent1a63cfcc3d83919e790e7e279eb35fc75adb0e3c (diff)
downloadcgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.zip
cgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.gz
cgit-3ce6fc16ef4670c535c6e35d48c7f980ff8a5532.tar.bz2
Handle single-line and empty commit subjects
If commit object ends with \0 after subject line, then info->subject was not set. This commit fixes this and also sets subject to ** empty ** if it would otherwise be empty, so that there is something to click on. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to 'parsing.c') (more/less context) (ignore whitespace changes)
-rw-r--r--parsing.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/parsing.c b/parsing.c
index 4420e58..b86467a 100644
--- a/parsing.c
+++ b/parsing.c
@@ -225,32 +225,37 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
225 ret->committer = substr(p, t); 225 ret->committer = substr(p, t);
226 p = t; 226 p = t;
227 t = strchr(t, '>') + 1; 227 t = strchr(t, '>') + 1;
228 ret->committer_email = substr(p, t); 228 ret->committer_email = substr(p, t);
229 ret->committer_date = atol(++t); 229 ret->committer_date = atol(++t);
230 p = strchr(t, '\n') + 1; 230 p = strchr(t, '\n') + 1;
231 } 231 }
232 232
233 while (*p == '\n') 233 while (*p == '\n')
234 p = strchr(p, '\n') + 1; 234 p = strchr(p, '\n') + 1;
235 235
236 t = strchr(p, '\n'); 236 t = strchr(p, '\n');
237 if (t && *t) { 237 if (t) {
238 ret->subject = substr(p, t); 238 if (*t == '\0')
239 ret->subject = strdup("** empty **");
240 else
241 ret->subject = substr(p, t);
239 p = t + 1; 242 p = t + 1;
240 243
241 while (*p == '\n') 244 while (*p == '\n')
242 p = strchr(p, '\n') + 1; 245 p = strchr(p, '\n') + 1;
243 ret->msg = p; 246 ret->msg = p;
244 } 247 } else
248 ret->subject = substr(p, p+strlen(p));
249
245 return ret; 250 return ret;
246} 251}
247 252
248 253
249struct taginfo *cgit_parse_tag(struct tag *tag) 254struct taginfo *cgit_parse_tag(struct tag *tag)
250{ 255{
251 void *data; 256 void *data;
252 enum object_type type; 257 enum object_type type;
253 unsigned long size; 258 unsigned long size;
254 char *p, *t; 259 char *p, *t;
255 struct taginfo *ret; 260 struct taginfo *ret;
256 261