X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/756e3ea6392e30bcd0a41346d4ffa42c56d715e2..f43b228d0bca5791be98ff3fbb2f8743219635b6:/parsing.c

diff --git a/parsing.c b/parsing.c
index 602e3de..0062550 100644
--- 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)
@@ -52,17 +52,19 @@ void cgit_parse_url(const char *url)
 	}
 }
 
-char *substr(const char *head, const char *tail)
+static char *substr(const char *head, const char *tail)
 {
 	char *buf;
 
+	if (tail < head)
+		return xstrdup("");
 	buf = xmalloc(tail - head + 1);
 	strncpy(buf, head, tail - head);
 	buf[tail - head] = '\0';
 	return buf;
 }
 
-char *parse_user(char *t, char **name, char **email, unsigned long *date)
+static char *parse_user(char *t, char **name, char **email, unsigned long *date)
 {
 	char *p = t;
 	int mode = 1;
@@ -99,7 +101,7 @@ char *parse_user(char *t, char **name, char **email, unsigned long *date)
 #ifdef NO_ICONV
 #define reencode(a, b, c)
 #else
-const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
+static const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 {
 	char *tmp;
 
@@ -110,7 +112,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
 		return *txt;
 
 	/* no encoding needed if src_enc equals dst_enc */
-	if(!strcasecmp(src_enc, dst_enc))
+	if (!strcasecmp(src_enc, dst_enc))
 		return *txt;
 
 	tmp = reencode_string(*txt, dst_enc, src_enc);
@@ -140,25 +142,25 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 	if (p == NULL)
 		return ret;
 
-	if (strncmp(p, "tree ", 5))
+	if (prefixcmp(p, "tree "))
 		die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
 	else
 		p += 46; // "tree " + hex[40] + "\n"
 
-	while (!strncmp(p, "parent ", 7))
+	while (!prefixcmp(p, "parent "))
 		p += 48; // "parent " + hex[40] + "\n"
 
-	if (p && !strncmp(p, "author ", 7)) {
+	if (p && !prefixcmp(p, "author ")) {
 		p = parse_user(p + 7, &ret->author, &ret->author_email,
 			&ret->author_date);
 	}
 
-	if (p && !strncmp(p, "committer ", 9)) {
+	if (p && !prefixcmp(p, "committer ")) {
 		p = parse_user(p + 9, &ret->committer, &ret->committer_email,
 			&ret->committer_date);
 	}
 
-	if (p && !strncmp(p, "encoding ", 9)) {
+	if (p && !prefixcmp(p, "encoding ")) {
 		p += 9;
 		t = strchr(p, '\n');
 		if (t) {
@@ -168,7 +170,7 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
 	}
 
 	/* if no special encoding is found, assume UTF-8 */
-	if(!ret->msg_encoding)
+	if (!ret->msg_encoding)
 		ret->msg_encoding = xstrdup("UTF-8");
 
 	// skip unknown header fields
@@ -237,7 +239,7 @@ struct taginfo *cgit_parse_tag(struct tag *tag)
 		if (*p == '\n')
 			break;
 
-		if (!strncmp(p, "tagger ", 7)) {
+		if (!prefixcmp(p, "tagger ")) {
 			p = parse_user(p + 7, &ret->tagger, &ret->tagger_email,
 				&ret->tagger_date);
 		} else {