Diffstat (limited to 'parsing.c')
| -rw-r--r-- | parsing.c | 261 |
1 files changed, 121 insertions, 140 deletions
@@ -1,13 +1,11 @@ -/* parsing.c: parsing of config files +/* config.c: parsing of config files * - * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> + * Copyright (C) 2006 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - #include "cgit.h" /* @@ -19,34 +17,28 @@ */ void cgit_parse_url(const char *url) { - char *c, *cmd, *p, *buf; - struct cgit_repo *repo; + char *cmd, *p; + ctx.repo = NULL; 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; } - buf = xstrdup(url); - cmd = NULL; - c = strchr(buf, '/'); - while (c) { - c[0] = '\0'; - repo = cgit_get_repoinfo(buf); - if (repo) { - ctx.repo = repo; - cmd = c; + 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; } - c[0] = '/'; - c = strchr(c + 1, '/'); - } - if (ctx.repo) { ctx.qry.repo = ctx.repo->url; p = strchr(cmd + 1, '/'); if (p) { @@ -56,172 +48,161 @@ void cgit_parse_url(const char *url) } if (cmd[1]) ctx.qry.page = xstrdup(cmd + 1); + return; } - free(buf); } -static char *substr(const char *head, const char *tail) +char *substr(const char *head, const char *tail) { char *buf; - if (tail < head) - return xstrdup(""); buf = xmalloc(tail - head + 1); - strlcpy(buf, head, tail - head + 1); + strncpy(buf, head, tail - head); + buf[tail - head] = '\0'; 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 *ret; - const char *p = repo_get_commit_buffer(the_repository, commit, NULL); - const char *t; + char *p = commit->buffer, *t = commit->buffer; - ret = xcalloc(1, sizeof(struct commitinfo)); + 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; + ret->msg_encoding = NULL; - if (!p) + if (p == NULL) return ret; - if (!skip_prefix(p, "tree ", &p)) - die("Bad commit: %s", oid_to_hex(&commit->object.oid)); - p += the_hash_algo->hexsz + 1; + if (strncmp(p, "tree ", 5)) + die("Bad commit: %s", sha1_to_hex(commit->object.sha1)); + else + p += 46; // "tree " + hex[40] + "\n" - while (skip_prefix(p, "parent ", &p)) - p += the_hash_algo->hexsz + 1; + while (!strncmp(p, "parent ", 7)) + p += 48; // "parent " + hex[40] + "\n" - 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, "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 (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); + 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, "encoding ", &p)) { - t = strchr(p, '\n'); - if (t) { - ret->msg_encoding = substr(p, t + 1); - p = t + 1; - } - } + 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); - if (!ret->msg_encoding) - ret->msg_encoding = xstrdup("UTF-8"); + while (*p && (*p != '\n')) + p = strchr(p, '\n') + 1; // skip unknown header fields - while (!end_of_header(p)) - p = next_header_line(p); - while (p && *p == '\n') - p++; - if (!p) - return ret; + while (*p == '\n') + p = strchr(p, '\n') + 1; - t = strchrnul(p, '\n'); - ret->subject = substr(p, t); - while (*t == '\n') - t++; - ret->msg = xstrdup(t); + t = strchr(p, '\n'); + if (t) { + if (*t == '\0') + ret->subject = "** empty **"; + else + ret->subject = substr(p, t); + p = t + 1; - 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); + 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; + } + + t = reencode_string(ret->msg, PAGE_ENCODING, + ret->msg_encoding); + if(t) { + free(ret->msg); + ret->msg = t; + } + } return ret; } + struct taginfo *cgit_parse_tag(struct tag *tag) { void *data; enum object_type type; unsigned long size; - const char *p; - struct taginfo *ret = NULL; + char *p, *t; + struct taginfo *ret; - data = odb_read_object(the_repository->objects, &tag->object.oid, &type, &size); - if (!data || type != OBJ_TAG) - goto cleanup; + 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; - ret = xcalloc(1, sizeof(struct taginfo)); + p = data; - 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); + 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); } + p = strchr(p, '\n') + 1; } - while (p && *p == '\n') - p++; + while (p && *p && (*p != '\n')) + p = strchr(p, '\n') + 1; // skip unknown tag fields + while (p && (*p == '\n')) + p = strchr(p, '\n') + 1; if (p && *p) ret->msg = xstrdup(p); - -cleanup: free(data); return ret; } |