X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/9a8f88658d51aeb86a79ac1121de13562ad2601f..52e605caf573fa20fdd4fbac5e1cc69b7740b1f5:/parsing.c diff --git a/parsing.c b/parsing.c index be471b5..4173dd4 100644 --- a/parsing.c +++ b/parsing.c @@ -79,6 +79,25 @@ int cgit_read_config(const char *filename, configfn fn) return ret; } +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; @@ -92,6 +111,10 @@ int cgit_parse_query(char *txt, configfn fn) 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); @@ -135,14 +158,22 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) p += 7; t = strchr(p, '<') - 1; ret->author = substr(p, t); - p = strchr(p, '\n') + 1; + p = t; + t = strchr(t, '>') + 1; + ret->author_email = substr(p, t); + ret->author_date = atol(++t); + p = strchr(t, '\n') + 1; } if (!strncmp(p, "committer ", 9)) { p += 9; t = strchr(p, '<') - 1; ret->committer = substr(p, t); - p = strchr(p, '\n') + 1; + p = t; + t = strchr(t, '>') + 1; + ret->committer_email = substr(p, t); + ret->committer_date = atol(++t); + p = strchr(t, '\n') + 1; } while (*p == '\n')