| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | html.c | 70 | ||||
| -rw-r--r-- | html.h | 18 | ||||
| -rw-r--r-- | shared.c | 8 | ||||
| -rw-r--r-- | ui-tree.c | 2 |
6 files changed, 31 insertions, 69 deletions
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> -GIT_VER = 1.7.0 +GIT_VER = 1.6.4.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install diff --git a/git b/git -Subproject e923eaeb901ff056421b9007adcbbce271caa7b +Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c @@ -13,32 +13,6 @@ #include <string.h> #include <errno.h> -/* Percent-encoding of each character, except: a-zA-Z0-9!$()*,./:;@- */ -static const char* url_escape_table[256] = { - "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", - "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", - "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", - "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, - "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", - "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%7b", - "%7c", "%7d", 0, "%7f", "%80", "%81", "%82", "%83", "%84", "%85", - "%86", "%87", "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f", - "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", - "%9a", "%9b", "%9c", "%9d", "%9e", "%9f", "%a0", "%a1", "%a2", "%a3", - "%a4", "%a5", "%a6", "%a7", "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", - "%ae", "%af", "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7", - "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf", "%c0", "%c1", - "%c2", "%c3", "%c4", "%c5", "%c6", "%c7", "%c8", "%c9", "%ca", "%cb", - "%cc", "%cd", "%ce", "%cf", "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", - "%d6", "%d7", "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df", - "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7", "%e8", "%e9", - "%ea", "%eb", "%ec", "%ed", "%ee", "%ef", "%f0", "%f1", "%f2", "%f3", - "%f4", "%f5", "%f6", "%f7", "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", - "%fe", "%ff" -}; - int htmlfd = STDOUT_FILENO; char *fmt(const char *format, ...) @@ -89,9 +63,9 @@ void html_status(int code, const char *msg, int more_headers) html("\n"); } -void html_txt(const char *txt) +void html_txt(char *txt) { - const char *t = txt; + char *t = txt; while(t && *t){ int c = *t; if (c=='<' || c=='>' || c=='&') { @@ -110,9 +84,9 @@ void html_txt(const char *txt) html(txt); } -void html_ntxt(int len, const char *txt) +void html_ntxt(int len, char *txt) { - const char *t = txt; + char *t = txt; while(t && *t && len--){ int c = *t; if (c=='<' || c=='>' || c=='&') { @@ -133,9 +107,9 @@ void html_ntxt(int len, const char *txt) html("..."); } -void html_attr(const char *txt) +void html_attr(char *txt) { - const char *t = txt; + char *t = txt; while(t && *t){ int c = *t; if (c=='<' || c=='>' || c=='\'' || c=='\"') { @@ -156,15 +130,14 @@ void html_attr(const char *txt) html(txt); } -void html_url_path(const char *txt) +void html_url_path(char *txt) { - const char *t = txt; + char *t = txt; while(t && *t){ int c = *t; - const char *e = url_escape_table[c]; - if (e && c!='+' && c!='&' && c!='+') { + if (c=='"' || c=='#' || c=='\'' || c=='?') { write(htmlfd, txt, t - txt); - write(htmlfd, e, 3); + write(htmlfd, fmt("%%%2x", c), 3); txt = t+1; } t++; @@ -173,15 +146,14 @@ void html_url_path(const char *txt) html(txt); } -void html_url_arg(const char *txt) +void html_url_arg(char *txt) { - const char *t = txt; + char *t = txt; while(t && *t){ int c = *t; - const char *e = url_escape_table[c]; - if (e) { + if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { write(htmlfd, txt, t - txt); - write(htmlfd, e, 3); + write(htmlfd, fmt("%%%2x", c), 3); txt = t+1; } t++; @@ -190,7 +162,7 @@ void html_url_arg(const char *txt) html(txt); } -void html_hidden(const char *name, const char *value) +void html_hidden(char *name, char *value) { html("<input type='hidden' name='"); html_attr(name); @@ -199,7 +171,7 @@ void html_hidden(const char *name, const char *value) html("'/>"); } -void html_option(const char *value, const char *text, const char *selected_value) +void html_option(char *value, char *text, char *selected_value) { html("<option value='"); html_attr(value); @@ -211,7 +183,7 @@ void html_option(const char *value, const char *text, const char *selected_value html("</option>\n"); } -void html_link_open(const char *url, const char *title, const char *class) +void html_link_open(char *url, char *title, char *class) { html("<a href='"); html_attr(url); @@ -285,14 +257,14 @@ char *convert_query_hexchar(char *txt) } } -int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) +int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)) { - char *t, *txt, *value = NULL, c; + char *t, *value = NULL, c; - if (!txt_) + if (!txt) return 0; - t = txt = strdup(txt_); + t = txt = strdup(txt); if (t == NULL) { printf("Out of memory\n"); exit(1); @@ -7,18 +7,18 @@ extern void html_raw(const char *txt, size_t size); extern void html(const char *txt); extern void htmlf(const char *format,...); extern void html_status(int code, const char *msg, int more_headers); -extern void html_txt(const char *txt); -extern void html_ntxt(int len, const char *txt); -extern void html_attr(const char *txt); -extern void html_url_path(const char *txt); -extern void html_url_arg(const char *txt); -extern void html_hidden(const char *name, const char *value); -extern void html_option(const char *value, const char *text, const char *selected_value); -extern void html_link_open(const char *url, const char *title, const char *class); +extern void html_txt(char *txt); +extern void html_ntxt(int len, char *txt); +extern void html_attr(char *txt); +extern void html_url_path(char *txt); +extern void html_url_arg(char *txt); +extern void html_hidden(char *name, char *value); +extern void html_option(char *value, char *text, char *selected_value); +extern void html_link_open(char *url, char *title, char *class); 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(const char *txt, void (*fn)(const char *name, const char *value)); +extern int http_parse_querystring(char *txt, void (*fn)(const char *name, const char *value)); #endif /* HTML_H */ @@ -280,10 +280,6 @@ int cgit_diff_files(const unsigned char *old_sha1, if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { *binary = 1; - if (file1.size) - free(file1.ptr); - if (file2.size) - free(file2.ptr); return 0; } @@ -296,10 +292,6 @@ int cgit_diff_files(const unsigned char *old_sha1, emit_cb.outf = filediff_cb; emit_cb.priv = fn; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); - if (file1.size) - free(file1.ptr); - if (file2.size) - free(file2.ptr); return 0; } @@ -175,8 +175,6 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen, if (ctx.repo->max_stats) cgit_stats_link("stats", NULL, "button", ctx.qry.head, fullpath); - cgit_plain_link("plain", NULL, "button", ctx.qry.head, curr_rev, - fullpath); html("</td></tr>\n"); free(name); return 0; |