6 files changed, 68 insertions, 64 deletions

diff --git a/cgit.c b/cgit.cindex 1f46e0d..763242a 100644--- a/cgit.c+++ b/cgit.c@@ -10,6 +10,7 @@ #include "cache.h" #include "cmd.h" #include "configfile.h"+#include "html.h" #include "ui-shared.h"  const char *cgit_version = CGIT_VERSION;@@ -444,7 +445,7 @@ int main(int argc, const char **argv) 	if (getenv("QUERY_STRING")) 		ctx.qry.raw = xstrdup(getenv("QUERY_STRING")); 	cgit_parse_args(argc, argv);-	cgit_parse_query(ctx.qry.raw, querystring_cb);+	http_parse_querystring(ctx.qry.raw, querystring_cb); 	if (!cgit_prepare_cache(&item)) 		return 0; 	if (ctx.cfg.nocache) {
diff --git a/cgit.c b/cgit.c
index 1f46e0d..763242a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -10,6 +10,7 @@
 #include "cache.h"
 #include "cmd.h"
 #include "configfile.h"
+#include "html.h"
 #include "ui-shared.h"
 
 const char *cgit_version = CGIT_VERSION;
@@ -444,7 +445,7 @@ int main(int argc, const char **argv)
 	if (getenv("QUERY_STRING"))
 		ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
 	cgit_parse_args(argc, argv);
-	cgit_parse_query(ctx.qry.raw, querystring_cb);
+	http_parse_querystring(ctx.qry.raw, querystring_cb);
 	if (!cgit_prepare_cache(&item))
 		return 0;
 	if (ctx.cfg.nocache) {
diff --git a/cgit.h b/cgit.hindex 91d18f8..ee8c716 100644--- a/cgit.h+++ b/cgit.h@@ -191,7 +191,6 @@ extern int chk_zero(int result, char *msg); extern int chk_positive(int result, char *msg); extern int chk_non_negative(int result, char *msg); -extern int hextoint(char c); extern char *trim_end(const char *str, char c); extern char *strlpart(char *txt, int maxlen); extern char *strrpart(char *txt, int maxlen);@@ -214,7 +213,6 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);  extern char *fmt(const char *format,...); -extern int cgit_parse_query(char *txt, configfn fn); extern struct commitinfo *cgit_parse_commit(struct commit *commit); extern struct taginfo *cgit_parse_tag(struct tag *tag); extern void cgit_parse_url(const char *url);
diff --git a/cgit.h b/cgit.h
index 91d18f8..ee8c716 100644
--- a/cgit.h
+++ b/cgit.h
@@ -191,7 +191,6 @@ extern int chk_zero(int result, char *msg);
 extern int chk_positive(int result, char *msg);
 extern int chk_non_negative(int result, char *msg);
 
-extern int hextoint(char c);
 extern char *trim_end(const char *str, char c);
 extern char *strlpart(char *txt, int maxlen);
 extern char *strrpart(char *txt, int maxlen);
@@ -214,7 +213,6 @@ extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
 
 extern char *fmt(const char *format,...);
 
-extern int cgit_parse_query(char *txt, configfn fn);
 extern struct commitinfo *cgit_parse_commit(struct commit *commit);
 extern struct taginfo *cgit_parse_tag(struct tag *tag);
 extern void cgit_parse_url(const char *url);
diff --git a/html.c b/html.cindex 0962e71..98ffaf9 100644--- a/html.c+++ b/html.c@@ -185,3 +185,67 @@ int html_include(const char *filename) 	fclose(f); 	return 0; }++int hextoint(char c)+{+	if (c >= 'a' && c <= 'f')+		return 10 + c - 'a';+	else if (c >= 'A' && c <= 'F')+		return 10 + c - 'A';+	else if (c >= '0' && c <= '9')+		return c - '0';+	else+		return -1;+}++char *convert_query_hexchar(char *txt)+{+	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;+	}+}++int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))+{+	char *t, *value = NULL, c;++	if (!txt)+		return 0;++	t = txt = strdup(txt);+	if (t == NULL) {+		printf("Out of memory\n");+		exit(1);+	}+	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;+}
diff --git a/html.c b/html.c
index 0962e71..98ffaf9 100644
--- a/html.c
+++ b/html.c
@@ -185,3 +185,67 @@ int html_include(const char *filename)
 	fclose(f);
 	return 0;
 }
+
+int hextoint(char c)
+{
+	if (c >= 'a' && c <= 'f')
+		return 10 + c - 'a';
+	else if (c >= 'A' && c <= 'F')
+		return 10 + c - 'A';
+	else if (c >= '0' && c <= '9')
+		return c - '0';
+	else
+		return -1;
+}
+
+char *convert_query_hexchar(char *txt)
+{
+	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;
+	}
+}
+
+int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value))
+{
+	char *t, *value = NULL, c;
+
+	if (!txt)
+		return 0;
+
+	t = txt = strdup(txt);
+	if (t == NULL) {
+		printf("Out of memory\n");
+		exit(1);
+	}
+	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;
+}
diff --git a/html.h b/html.hindex 63f4551..e6fdc54 100644--- a/html.h+++ b/html.h@@ -15,4 +15,6 @@ extern void html_link_close(void); extern void html_fileperm(unsigned short mode); extern int html_include(const char *filename); +extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));+ #endif /* HTML_H */
diff --git a/html.h b/html.h
index 63f4551..e6fdc54 100644
--- a/html.h
+++ b/html.h
@@ -15,4 +15,6 @@ extern void html_link_close(void);
 extern void html_fileperm(unsigned short mode);
 extern int html_include(const char *filename);
 
+extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value));
+
 #endif /* HTML_H */
diff --git a/parsing.c b/parsing.cindex 9a4a7a3..66e8b3d 100644--- a/parsing.c+++ b/parsing.c@@ -8,55 +8,6 @@  #include "cgit.h" -char *convert_query_hexchar(char *txt)-{-	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;-	}-}--int cgit_parse_query(char *txt, configfn fn)-{-	char *t, *value = NULL, c;--	if (!txt)-		return 0;--	t = txt = xstrdup(txt);--	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;-}- /*  * url syntax: [repo ['/' cmd [ '/' path]]]  *   repo: any valid repo url, may contain '/'
diff --git a/parsing.c b/parsing.c
index 9a4a7a3..66e8b3d 100644
--- a/parsing.c
+++ b/parsing.c
@@ -8,55 +8,6 @@
 
 #include "cgit.h"
 
-char *convert_query_hexchar(char *txt)
-{
-	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;
-	}
-}
-
-int cgit_parse_query(char *txt, configfn fn)
-{
-	char *t, *value = NULL, c;
-
-	if (!txt)
-		return 0;
-
-	t = txt = xstrdup(txt);
-
-	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;
-}
-
 /*
  * url syntax: [repo ['/' cmd [ '/' path]]]
  *   repo: any valid repo url, may contain '/'
diff --git a/shared.c b/shared.cindex 48002ac..f5875e4 100644--- a/shared.c+++ b/shared.c@@ -89,18 +89,6 @@ void *cgit_free_commitinfo(struct commitinfo *info) 	return NULL; } -int hextoint(char c)-{-	if (c >= 'a' && c <= 'f')-		return 10 + c - 'a';-	else if (c >= 'A' && c <= 'F')-		return 10 + c - 'A';-	else if (c >= '0' && c <= '9')-		return c - '0';-	else-		return -1;-}- char *trim_end(const char *str, char c) { 	int len;
diff --git a/shared.c b/shared.c
index 48002ac..f5875e4 100644
--- a/shared.c
+++ b/shared.c
@@ -89,18 +89,6 @@ void *cgit_free_commitinfo(struct commitinfo *info)
 	return NULL;
 }
 
-int hextoint(char c)
-{
-	if (c >= 'a' && c <= 'f')
-		return 10 + c - 'a';
-	else if (c >= 'A' && c <= 'F')
-		return 10 + c - 'A';
-	else if (c >= '0' && c <= '9')
-		return c - '0';
-	else
-		return -1;
-}
-
 char *trim_end(const char *str, char c)
 {
 	int len;