author | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-19 17:00:05 (UTC) |
commit | a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806 (patch) (unidiff) | |
tree | de8271ebfabd244437cd68021c8af86391afb9bd /html.c | |
parent | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (diff) | |
parent | d187b98557d91b874836f286b955ba76ab26fb02 (diff) | |
download | cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.zip cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.gz cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.bz2 |
Merge branch 'ml/bugfix'
-rw-r--r-- | html.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -97,3 +97,3 @@ void html_txt(const char *txt) | |||
97 | if (c=='<' || c=='>' || c=='&') { | 97 | if (c=='<' || c=='>' || c=='&') { |
98 | write(htmlfd, txt, t - txt); | 98 | html_raw(txt, t - txt); |
99 | if (c=='>') | 99 | if (c=='>') |
@@ -118,3 +118,3 @@ void html_ntxt(int len, const char *txt) | |||
118 | if (c=='<' || c=='>' || c=='&') { | 118 | if (c=='<' || c=='>' || c=='&') { |
119 | write(htmlfd, txt, t - txt); | 119 | html_raw(txt, t - txt); |
120 | if (c=='>') | 120 | if (c=='>') |
@@ -130,3 +130,3 @@ void html_ntxt(int len, const char *txt) | |||
130 | if (t!=txt) | 130 | if (t!=txt) |
131 | write(htmlfd, txt, t - txt); | 131 | html_raw(txt, t - txt); |
132 | if (len<0) | 132 | if (len<0) |
@@ -141,3 +141,3 @@ void html_attr(const char *txt) | |||
141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
142 | write(htmlfd, txt, t - txt); | 142 | html_raw(txt, t - txt); |
143 | if (c=='>') | 143 | if (c=='>') |
@@ -165,4 +165,4 @@ void html_url_path(const char *txt) | |||
165 | if (e && c!='+' && c!='&' && c!='+') { | 165 | if (e && c!='+' && c!='&' && c!='+') { |
166 | write(htmlfd, txt, t - txt); | 166 | html_raw(txt, t - txt); |
167 | write(htmlfd, e, 3); | 167 | html_raw(e, 3); |
168 | txt = t+1; | 168 | txt = t+1; |
@@ -182,4 +182,4 @@ void html_url_arg(const char *txt) | |||
182 | if (e) { | 182 | if (e) { |
183 | write(htmlfd, txt, t - txt); | 183 | html_raw(txt, t - txt); |
184 | write(htmlfd, e, 3); | 184 | html_raw(e, 3); |
185 | txt = t+1; | 185 | txt = t+1; |
@@ -251,3 +251,3 @@ int html_include(const char *filename) | |||
251 | while((len = fread(buf, 1, 4096, f)) > 0) | 251 | while((len = fread(buf, 1, 4096, f)) > 0) |
252 | write(htmlfd, buf, len); | 252 | html_raw(buf, len); |
253 | fclose(f); | 253 | fclose(f); |