Diffstat (limited to 'parsing.c')
| -rw-r--r-- | parsing.c | 376 |
1 files changed, 228 insertions, 148 deletions
@@ -1,227 +1,307 @@ -/* 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" -/* - * 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) +int next_char(FILE *f) { - char *c, *cmd, *p, *buf; - struct cgit_repo *repo; + int c = fgetc(f); + if (c=='\r') { + c = fgetc(f); + if (c!='\n') { + ungetc(c, f); + c = '\r'; + } + } + return c; +} - if (!url || url[0] == '\0') - return; +void skip_line(FILE *f) +{ + int c; - ctx.qry.page = NULL; - ctx.repo = cgit_get_repoinfo(url); - if (ctx.repo) { - ctx.qry.repo = ctx.repo->url; - return; - } + while((c=next_char(f)) && c!='\n' && c!=EOF) + ; +} - 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; +int read_config_line(FILE *f, char *line, const char **value, int bufsize) +{ + int i = 0, isname = 0; + + *value = NULL; + while(i<bufsize-1) { + int c = next_char(f); + if (!isname && (c=='#' || c==';')) { + skip_line(f); + continue; } - c[0] = '/'; - c = strchr(c + 1, '/'); - } + if (!isname && isspace(c)) + continue; - if (ctx.repo) { - ctx.qry.repo = ctx.repo->url; - p = strchr(cmd + 1, '/'); - if (p) { - p[0] = '\0'; - if (p[1]) - ctx.qry.path = trim_end(p + 1, '/'); + if (c=='=' && !*value) { + line[i] = 0; + *value = &line[i+1]; + } else if (c=='\n' && !isname) { + i = 0; + continue; + } else if (c=='\n' || c==EOF) { + line[i] = 0; + break; + } else { + line[i]=c; } - if (cmd[1]) - ctx.qry.page = xstrdup(cmd + 1); + isname = 1; + i++; } - free(buf); + line[i+1] = 0; + return i; } -static char *substr(const char *head, const char *tail) +int cgit_read_config(const char *filename, configfn fn) { - char *buf; + static int nesting; + int len; + char line[256]; + const char *value; + FILE *f; - if (tail < head) - return xstrdup(""); - buf = xmalloc(tail - head + 1); - strlcpy(buf, head, tail - head + 1); - return buf; + /* cancel deeply nested include-commands */ + if (nesting > 8) + return -1; + if (!(f = fopen(filename, "r"))) + return -1; + nesting++; + while((len = read_config_line(f, line, &value, sizeof(line))) > 0) + (*fn)(line, value); + nesting--; + fclose(f); + return 0; } -static void parse_user(const char *t, char **name, char **email, unsigned long *date, int *tz) +char *convert_query_hexchar(char *txt) { - struct ident_split ident; - unsigned email_len; + int d1, d2; + if (strlen(txt) < 3) { + *txt = '\0'; + return txt-1; + } + d1 = hextoint(*(txt+1)); + d2 = hextoint(*(txt+2)); + if (d1<0 || d2<0) { + strcpy(txt, txt+3); + return txt-1; + } else { + *txt = d1 * 16 + d2; + strcpy(txt+1, txt+3); + return txt; + } +} - if (!split_ident_line(&ident, t, strchrnul(t, '\n') - t)) { - *name = substr(ident.name_begin, ident.name_end); +int cgit_parse_query(char *txt, configfn fn) +{ + char *t, *value = NULL, c; - 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 (!txt) + return 0; + + t = txt = xstrdup(txt); - if (ident.date_begin) - *date = strtoul(ident.date_begin, NULL, 10); - if (ident.tz_begin) - *tz = atoi(ident.tz_begin); + 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; } -#ifdef NO_ICONV -#define reencode(a, b, c) -#else -static const char *reencode(char **txt, const char *src_enc, const char *dst_enc) +/* + * 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 *tmp; + char *cmd, *p; - if (!txt) - return NULL; + cgit_repo = NULL; + if (!url || url[0] == '\0') + return; - if (!*txt || !src_enc || !dst_enc) - return *txt; + cgit_repo = cgit_get_repoinfo(url); + if (cgit_repo) { + cgit_query_repo = cgit_repo->url; + return; + } - /* no encoding needed if src_enc equals dst_enc */ - if (!strcasecmp(src_enc, dst_enc)) - return *txt; + 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; + } - tmp = reencode_string(*txt, dst_enc, src_enc); - if (tmp) { - free(*txt); - *txt = tmp; + cgit_query_repo = cgit_repo->url; + p = strchr(cmd + 1, '/'); + if (p) { + p[0] = '\0'; + if (p[1]) + cgit_query_path = trim_end(p + 1, '/'); + } + cgit_cmd = cgit_get_cmd_index(cmd + 1); + cgit_query_page = xstrdup(cmd + 1); + return; } - return *txt; } -#endif -static const char *next_header_line(const char *p) +char *substr(const char *head, const char *tail) { - p = strchr(p, '\n'); - if (!p) - return NULL; - return p + 1; -} + char *buf; -static int end_of_header(const char *p) -{ - return !p || (*p == '\n'); + 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; - 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; - 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; - - 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); - } + while (!strncmp(p, "parent ", 7)) + p += 48; // "parent " + hex[40] + "\n" - 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, "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 (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, "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; } - 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)); 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); } + 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; } |