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>

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
@@ -109,185 +109,190 @@ int cgit_parse_query(char *txt, configfn fn)
         if (!txt)
                 return 0;
 
         t = txt = xstrdup(txt);
 
         while((c=*t) != '\0') {
                 if (c=='=') {
                         *t = '\0';
                         value = t+1;
                 } else if (c=='+') {
                         *t = ' ';
                 } else if (c=='%') {
                         t = convert_query_hexchar(t);
                 } else if (c=='&') {
                         *t = '\0';
                         (*fn)(txt, value);
                         txt = t+1;
                         value = NULL;
                 }
                 t++;
         }
         if (t!=txt)
                 (*fn)(txt, value);
         return 0;
 }
 
 /*
  * url syntax: [repo ['/' cmd [ '/' path]]]
  *   repo: any valid repo url, may contain '/'
  *   cmd:  log | commit | diff | tree | view | blob | snapshot
  *   path: any valid path, may contain '/'
  *
  */
 void cgit_parse_url(const char *url)
 {
         char *cmd, *p;
 
         cgit_repo = NULL;
         if (!url || url[0] == '\0')
                 return;
 
         cgit_repo = cgit_get_repoinfo(url);
         if (cgit_repo) {
                 cgit_query_repo = cgit_repo->url;
                 return;
         }
 
         cmd = strchr(url, '/');
         while (!cgit_repo && cmd) {
                 cmd[0] = '\0';
                 cgit_repo = cgit_get_repoinfo(url);
                 if (cgit_repo == NULL) {
                         cmd[0] = '/';
                         cmd = strchr(cmd + 1, '/');
                         continue;
                 }
 
                 cgit_query_repo = cgit_repo->url;
                 p = strchr(cmd + 1, '/');
                 if (p) {
                         p[0] = '\0';
                         if (p[1])
                                 cgit_query_path = xstrdup(p + 1);
                 }
                 cgit_cmd = cgit_get_cmd_index(cmd + 1);
                 cgit_query_page = xstrdup(cmd + 1);
                 return;
         }
 }
 
 char *substr(const char *head, const char *tail)
 {
         char *buf;
 
         buf = xmalloc(tail - head + 1);
         strncpy(buf, head, tail - head);
         buf[tail - head] = '\0';
         return buf;
 }
 
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
         struct commitinfo *ret;
         char *p = commit->buffer, *t = commit->buffer;
 
         ret = xmalloc(sizeof(*ret));
         ret->commit = commit;
         ret->author = NULL;
         ret->author_email = NULL;
         ret->committer = NULL;
         ret->committer_email = NULL;
         ret->subject = NULL;
         ret->msg = NULL;
 
         if (strncmp(p, "tree ", 5))
                 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
         else
                 p += 46; // "tree " + hex[40] + "\n"
 
         while (!strncmp(p, "parent ", 7))
                 p += 48; // "parent " + hex[40] + "\n"
 
         if (!strncmp(p, "author ", 7)) {
                 p += 7;
                 t = strchr(p, '<') - 1;
                 ret->author = substr(p, t);
                 p = t;
                 t = strchr(t, '>') + 1;
                 ret->author_email = substr(p, t);
                 ret->author_date = atol(++t);
                 p = strchr(t, '\n') + 1;
         }
 
         if (!strncmp(p, "committer ", 9)) {
                 p += 9;
                 t = strchr(p, '<') - 1;
                 ret->committer = substr(p, t);
                 p = t;
                 t = strchr(t, '>') + 1;
                 ret->committer_email = substr(p, t);
                 ret->committer_date = atol(++t);
                 p = strchr(t, '\n') + 1;
         }
 
         while (*p == '\n')
                 p = strchr(p, '\n') + 1;
 
         t = strchr(p, '\n');
-        if (t && *t) {
-                ret->subject = substr(p, t);
+        if (t) {
+                if (*t == '\0')
+                        ret->subject = strdup("** empty **");
+                else
+                        ret->subject = substr(p, t);
                 p = t + 1;
 
                 while (*p == '\n')
                         p = strchr(p, '\n') + 1;
                 ret->msg = p;
-        }
+        } else
+                ret->subject = substr(p, p+strlen(p));
+
         return ret;
 }
 
 
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
         void *data;
         enum object_type type;
         unsigned long size;
         char *p, *t;
         struct taginfo *ret;
 
         data = read_sha1_file(tag->object.sha1, &type, &size);
         if (!data || type != OBJ_TAG) {
                 free(data);
                 return 0;
         }
 
         ret = xmalloc(sizeof(*ret));
         ret->tagger = NULL;
         ret->tagger_email = NULL;
         ret->tagger_date = 0;
         ret->msg = NULL;
 
         p = data;
 
         while (p && *p) {
                 if (*p == '\n')
                         break;
 
                 if (!strncmp(p, "tagger ", 7)) {
                         p += 7;
                         t = strchr(p, '<') - 1;
                         ret->tagger = substr(p, t);
                         p = t;
                         t = strchr(t, '>') + 1;
                         ret->tagger_email = substr(p, t);
                         ret->tagger_date = atol(++t);
                 }
                 p = strchr(p, '\n') + 1;
         }
 
         while (p && (*p == '\n'))
                 p = strchr(p, '\n') + 1;
         if (p && *p)
                 ret->msg = xstrdup(p);
         free(data);
         return ret;
 }