aboutsummaryrefslogtreecommitdiff
path: root/parsing.c
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat (limited to 'parsing.c')
-rw-r--r--parsing.c201
1 files changed, 117 insertions, 84 deletions
diff --git a/parsing.c b/parsing.c
index bdaed25..599f61e 100644
--- a/parsing.c
+++ b/parsing.c
@@ -6,8 +6,6 @@
* (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,8 +48,8 @@ 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)
@@ -67,27 +59,43 @@ static char *substr(const char *head, const char *tail)
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)
+static char *parse_user(char *t, char **name, char **email, unsigned long *date)
{
- struct ident_split ident;
- unsigned email_len;
+ char *p = t;
+ int mode = 1;
- 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);
+ while (p && *p) {
+ if (mode == 1 && *p == '<') {
+ *name = substr(t, p - 1);
+ t = p;
+ mode++;
+ } else if (mode == 1 && *p == '\n') {
+ *name = substr(t, p);
+ p++;
+ break;
+ } else if (mode == 2 && *p == '>') {
+ *email = substr(t, p + 1);
+ t = p;
+ mode++;
+ } else if (mode == 2 && *p == '\n') {
+ *email = substr(t, p);
+ p++;
+ break;
+ } else if (mode == 3 && isdigit(*p)) {
+ *date = atol(p);
+ mode++;
+ } else if (*p == '\n') {
+ p++;
+ break;
+ }
+ p++;
}
+ return p;
}
#ifdef NO_ICONV
@@ -116,51 +124,44 @@ static const char *reencode(char **txt, const char *src_enc, const char *dst_enc
}
#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;
- 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 (prefixcmp(p, "tree "))
+ 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 (!prefixcmp(p, "parent "))
+ 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 (p && !prefixcmp(p, "author ")) {
+ p = parse_user(p + 7, &ret->author, &ret->author_email,
+ &ret->author_date);
}
- 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 (p && !prefixcmp(p, "committer ")) {
+ p = parse_user(p + 10, &ret->committer, &ret->committer_email,
+ &ret->committer_date);
}
- if (p && skip_prefix(p, "encoding ", &p)) {
+ if (p && !prefixcmp(p, "encoding ")) {
+ p += 9;
t = strchr(p, '\n');
if (t) {
ret->msg_encoding = substr(p, t + 1);
@@ -168,21 +169,38 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
}
}
+ /* if no special encoding is found, assume UTF-8 */
if (!ret->msg_encoding)
ret->msg_encoding = xstrdup("UTF-8");
- while (!end_of_header(p))
- p = next_header_line(p);
+ // skip unknown header fields
+ while (p && *p && (*p != '\n')) {
+ p = strchr(p, '\n');
+ if (p)
+ p++;
+ }
+
+ // skip empty lines between headers and message
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);
+ t = strchr(p, '\n');
+ if (t) {
+ ret->subject = substr(p, t);
+ p = t + 1;
+
+ while (p && *p == '\n') {
+ p = strchr(p, '\n');
+ if (p)
+ p++;
+ }
+ if (p)
+ ret->msg = xstrdup(p);
+ } else
+ ret->subject = xstrdup(p);
reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);
@@ -194,34 +212,49 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
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;
+ 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;
- data = odb_read_object(the_repository->objects, &tag->object.oid, &type, &size);
- if (!data || type != OBJ_TAG)
- goto cleanup;
+ p = data;
- ret = xcalloc(1, sizeof(struct taginfo));
+ while (p && *p) {
+ if (*p == '\n')
+ break;
- 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);
+ if (!prefixcmp(p, "tagger ")) {
+ p = parse_user(p + 7, &ret->tagger, &ret->tagger_email,
+ &ret->tagger_date);
+ } else {
+ p = strchr(p, '\n');
+ if (p)
+ p++;
}
}
+ // skip empty lines between headers and message
while (p && *p == '\n')
p++;
if (p && *p)
ret->msg = xstrdup(p);
-
-cleanup:
free(data);
return ret;
}
generated by cgitext v1.3.1+16 (git 2.54.0) at 2026-09-07 19:48:13 +0000