global: make 'char *path' const where possible

[cgit.git] / parsing.c

diff --git a/parsing.c b/parsing.c
index 66e8b3db21fd4369f62f3ba8b0029276ea9e9cd5..7b3980e6b1d0dca661183ddfcb45ab491354ce2d 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -1,6 +1,6 @@
-/* config.c: parsing of config files
+/* parsing.c: parsing of config files

  *
  *

- * Copyright (C) 2006 Lars Hjemli
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)


@@ -17,28 +17,33 @@
  */
 void cgit_parse_url(const char *url)
 {
  */
 void cgit_parse_url(const char *url)
 {

-       char *cmd, *p;
+       char *c, *cmd, *p;
+       struct cgit_repo *repo;

 
 

-       ctx.repo = NULL;

        if (!url || url[0] == '\0')
                return;
 
        if (!url || url[0] == '\0')
                return;
 

+       ctx.qry.page = NULL;

        ctx.repo = cgit_get_repoinfo(url);
        if (ctx.repo) {
                ctx.qry.repo = ctx.repo->url;
                return;
        }
 
        ctx.repo = cgit_get_repoinfo(url);
        if (ctx.repo) {
                ctx.qry.repo = ctx.repo->url;
                return;
        }
 

-       cmd = strchr(url, '/');
-       while (!ctx.repo && cmd) {
-               cmd[0] = '\0';
-               ctx.repo = cgit_get_repoinfo(url);
-               if (ctx.repo == NULL) {
-                       cmd[0] = '/';
-                       cmd = strchr(cmd + 1, '/');
-                       continue;
+       cmd = NULL;
+       c = strchr(url, '/');
+       while (c) {
+               c[0] = '\0';
+               repo = cgit_get_repoinfo(url);
+               if (repo) {
+                       ctx.repo = repo;
+                       cmd = c;

                }
                }

+               c[0] = '/';
+               c = strchr(c + 1, '/');
+       }

 
 

+       if (ctx.repo) {

                ctx.qry.repo = ctx.repo->url;
                p = strchr(cmd + 1, '/');
                if (p) {
                ctx.qry.repo = ctx.repo->url;
                p = strchr(cmd + 1, '/');
                if (p) {


@@ -48,161 +53,172 @@ void cgit_parse_url(const char *url)
                }
                if (cmd[1])
                        ctx.qry.page = xstrdup(cmd + 1);
                }
                if (cmd[1])
                        ctx.qry.page = xstrdup(cmd + 1);

-               return;

        }
 }
 
        }
 }
 

-char *substr(const char *head, const char *tail)
+static char *substr(const char *head, const char *tail)

 {
        char *buf;
 
 {
        char *buf;
 

+       if (tail < head)
+               return xstrdup("");

        buf = xmalloc(tail - head + 1);
        buf = xmalloc(tail - head + 1);

-       strncpy(buf, head, tail - head);
-       buf[tail - head] = '\0';
+       strlcpy(buf, head, tail - head + 1);

        return buf;
 }
 
        return buf;
 }
 

+static void parse_user(const char *t, char **name, char **email, unsigned long *date, int *tz)
+{
+       struct ident_split ident;
+       unsigned email_len;
+
+       if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) {
+               *name = substr(ident.name_begin, ident.name_end);
+
+               email_len = ident.mail_end - ident.mail_begin;
+               *email = xmalloc(strlen("<") + email_len + strlen(">") + 1);
+               xsnprintf(*email, email_len + 3, "<%.*s>", email_len, ident.mail_begin);
+
+               if (ident.date_begin)
+                       *date = strtoul(ident.date_begin, NULL, 10);
+               if (ident.tz_begin)
+                       *tz = atoi(ident.tz_begin);
+       }
+}
+
+#ifdef NO_ICONV
+#define reencode(a, b, c)
+#else
+static const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
+{
+       char *tmp;
+
+       if (!txt)
+               return NULL;
+
+       if (!*txt || !src_enc || !dst_enc)
+               return *txt;
+
+       /* no encoding needed if src_enc equals dst_enc */
+       if (!strcasecmp(src_enc, dst_enc))
+               return *txt;
+
+       tmp = reencode_string(*txt, dst_enc, src_enc);
+       if (tmp) {
+               free(*txt);
+               *txt = tmp;
+       }
+       return *txt;
+}
+#endif
+
+static const char *next_header_line(const char *p)
+{
+       p = strchr(p, '\n');
+       if (!p)
+               return NULL;
+       return p + 1;
+}
+
+static int end_of_header(const char *p)
+{
+       return !p || (*p == '\n');
+}
+

 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {
 struct commitinfo *cgit_parse_commit(struct commit *commit)
 {

+       const int sha1hex_len = 40;

        struct commitinfo *ret;
        struct commitinfo *ret;

-       char *p = commit->buffer, *t = commit->buffer;
+       const char *p = get_cached_commit_buffer(the_repository, commit, NULL);
+       const char *t;

 
 

-       ret = xmalloc(sizeof(*ret));
+       ret = xcalloc(1, sizeof(struct commitinfo));

        ret->commit = commit;
        ret->commit = commit;

-       ret->author = NULL;
-       ret->author_email = NULL;
-       ret->committer = NULL;
-       ret->committer_email = NULL;
-       ret->subject = NULL;
-       ret->msg = NULL;
-       ret->msg_encoding = NULL;
-
-       if (p == NULL)
+
+       if (!p)

                return ret;
 
                return ret;
 

-       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+1);
-               p = strchr(t, '\n') + 1;
-       }
+       if (!skip_prefix(p, "tree ", &p))
+               die("Bad commit: %s", oid_to_hex(&commit->object.oid));
+       p += sha1hex_len + 1;
+
+       while (skip_prefix(p, "parent ", &p))
+               p += sha1hex_len + 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+1);
-               p = strchr(t, '\n') + 1;
+       if (p && skip_prefix(p, "author ", &p)) {
+               parse_user(p, &ret->author, &ret->author_email,
+                       &ret->author_date, &ret->author_tz);
+               p = next_header_line(p);

        }
 
        }
 

-       if (!strncmp(p, "encoding ", 9)) {
-               p += 9;
-               t = strchr(p, '\n') + 1;
-               ret->msg_encoding = substr(p, t);
-               p = t;
-       } else
-               ret->msg_encoding = xstrdup(PAGE_ENCODING);
-
-       while (*p && (*p != '\n'))
-               p = strchr(p, '\n') + 1; // skip unknown header fields
-
-       while (*p == '\n')
-               p = strchr(p, '\n') + 1;
-
-       t = strchr(p, '\n');
-       if (t) {
-               if (*t == '\0')
-                       ret->subject = "** empty **";
-               else
-                       ret->subject = substr(p, t);
-               p = t + 1;
-
-               while (*p == '\n')
-                       p = strchr(p, '\n') + 1;
-               ret->msg = xstrdup(p);
-       } else
-               ret->subject = substr(p, p+strlen(p));
-
-       if(strcmp(ret->msg_encoding, PAGE_ENCODING)) {
-               t = reencode_string(ret->subject, PAGE_ENCODING,
-                                   ret->msg_encoding);
-               if(t) {
-                       free(ret->subject);
-                       ret->subject = t;
-               }
+       if (p && skip_prefix(p, "committer ", &p)) {
+               parse_user(p, &ret->committer, &ret->committer_email,
+                       &ret->committer_date, &ret->committer_tz);
+               p = next_header_line(p);
+       }

 
 

-               t = reencode_string(ret->msg, PAGE_ENCODING,
-                                   ret->msg_encoding);
-               if(t) {
-                       free(ret->msg);
-                       ret->msg = t;
+       if (p && skip_prefix(p, "encoding ", &p)) {
+               t = strchr(p, '\n');
+               if (t) {
+                       ret->msg_encoding = substr(p, t + 1);
+                       p = t + 1;

                }
        }
 
                }
        }
 

+       if (!ret->msg_encoding)
+               ret->msg_encoding = xstrdup("UTF-8");
+
+       while (!end_of_header(p))
+               p = next_header_line(p);
+       while (p && *p == '\n')
+               p++;
+       if (!p)
+               return ret;
+
+       t = strchrnul(p, '\n');
+       ret->subject = substr(p, t);
+       while (*t == '\n')
+               t++;
+       ret->msg = xstrdup(t);
+
+       reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->committer, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->committer_email, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->subject, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->msg, ret->msg_encoding, PAGE_ENCODING);
+

        return ret;
 }
 
        return ret;
 }
 

-

 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
        void *data;
        enum object_type type;
        unsigned long size;
 struct taginfo *cgit_parse_tag(struct tag *tag)
 {
        void *data;
        enum object_type type;
        unsigned long size;

-       char *p, *t;
-       struct taginfo *ret;
+       const char *p;
+       struct taginfo *ret = NULL;

 
 

-       data = read_sha1_file(tag->object.sha1, &type, &size);
-       if (!data || type != OBJ_TAG) {
-               free(data);
-               return 0;
-       }
+       data = read_object_file(&tag->object.oid, &type, &size);
+       if (!data || type != OBJ_TAG)
+               goto cleanup;

 
 

-       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+1);
+       ret = xcalloc(1, sizeof(struct taginfo));
+
+       for (p = data; !end_of_header(p); p = next_header_line(p)) {
+               if (skip_prefix(p, "tagger ", &p)) {
+                       parse_user(p, &ret->tagger, &ret->tagger_email,
+                               &ret->tagger_date, &ret->tagger_tz);

                }
                }

-               p = strchr(p, '\n') + 1;

        }
 
        }
 

-       while (p && *p && (*p != '\n'))
-               p = strchr(p, '\n') + 1; // skip unknown tag fields
+       while (p && *p == '\n')
+               p++;

 
 

-       while (p && (*p == '\n'))
-               p = strchr(p, '\n') + 1;

        if (p && *p)
                ret->msg = xstrdup(p);
        if (p && *p)
                ret->msg = xstrdup(p);

+
+cleanup:

        free(data);
        return ret;
 }
        free(data);
        return ret;
 }