diff options
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | parsing.c | 21 | ||||
-rw-r--r-- | shared.c | 13 |
3 files changed, 36 insertions, 0 deletions
diff --git a/cgit.h b/cgit.h index 249650e..eb8f08c 100644 --- a/cgit.h +++ b/cgit.h | |||
@@ -67,6 +67,8 @@ extern void cgit_global_config_cb(const char *name, const char *value); | |||
67 | extern void cgit_repo_config_cb(const char *name, const char *value); | 67 | extern void cgit_repo_config_cb(const char *name, const char *value); |
68 | extern void cgit_querystring_cb(const char *name, const char *value); | 68 | extern void cgit_querystring_cb(const char *name, const char *value); |
69 | 69 | ||
70 | extern int hextoint(char c); | ||
71 | |||
70 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 72 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
71 | 73 | ||
72 | extern char *fmt(const char *format,...); | 74 | extern char *fmt(const char *format,...); |
diff --git a/parsing.c b/parsing.c index 1b22fcf..4173dd4 100644 --- a/parsing.c +++ b/parsing.c | |||
@@ -79,6 +79,25 @@ int cgit_read_config(const char *filename, configfn fn) | |||
79 | return ret; | 79 | return ret; |
80 | } | 80 | } |
81 | 81 | ||
82 | char *convert_query_hexchar(char *txt) | ||
83 | { | ||
84 | int d1, d2; | ||
85 | if (strlen(txt) < 3) { | ||
86 | *txt = '\0'; | ||
87 | return txt-1; | ||
88 | } | ||
89 | d1 = hextoint(*(txt+1)); | ||
90 | d2 = hextoint(*(txt+2)); | ||
91 | if (d1<0 || d2<0) { | ||
92 | strcpy(txt, txt+3); | ||
93 | return txt-1; | ||
94 | } else { | ||
95 | *txt = d1 * 16 + d2; | ||
96 | strcpy(txt+1, txt+3); | ||
97 | return txt; | ||
98 | } | ||
99 | } | ||
100 | |||
82 | int cgit_parse_query(char *txt, configfn fn) | 101 | int cgit_parse_query(char *txt, configfn fn) |
83 | { | 102 | { |
84 | char *t, *value = NULL, c; | 103 | char *t, *value = NULL, c; |
@@ -94,6 +113,8 @@ int cgit_parse_query(char *txt, configfn fn) | |||
94 | value = t+1; | 113 | value = t+1; |
95 | } else if (c=='+') { | 114 | } else if (c=='+') { |
96 | *t = ' '; | 115 | *t = ' '; |
116 | } else if (c=='%') { | ||
117 | t = convert_query_hexchar(t); | ||
97 | } else if (c=='&') { | 118 | } else if (c=='&') { |
98 | *t = '\0'; | 119 | *t = '\0'; |
99 | (*fn)(txt, value); | 120 | (*fn)(txt, value); |
diff --git a/shared.c b/shared.c index 7def51a..e4595fa 100644 --- a/shared.c +++ b/shared.c | |||
@@ -113,3 +113,16 @@ void *cgit_free_commitinfo(struct commitinfo *info) | |||
113 | free(info); | 113 | free(info); |
114 | return NULL; | 114 | return NULL; |
115 | } | 115 | } |
116 | |||
117 | int hextoint(char c) | ||
118 | { | ||
119 | if (c >= 'a' && c <= 'f') | ||
120 | return 10 + c - 'a'; | ||
121 | else if (c >= 'A' && c <= 'F') | ||
122 | return 10 + c - 'A'; | ||
123 | else if (c >= '0' && c <= '9') | ||
124 | return c - '0'; | ||
125 | else | ||
126 | return -1; | ||
127 | } | ||
128 | |||