diff options
| author |  Lars Hjemli <hjemli@gmail.com> | 2010-09-20 02:00:05 (JST) |
|---|---|---|
| committer | Lars Hjemli <hjemli@gmail.com> | 2010-09-20 02:00:05 (JST) |
| commit | a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806 (patch) | |
| tree | de8271ebfabd244437cd68021c8af86391afb9bd /html.c | |
| parent | 536c7a1eb201b44b9266babe087cb6f2b75e4a7f (diff) | |
| parent | d187b98557d91b874836f286b955ba76ab26fb02 (diff) | |
| download | cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.zip cgit-a9d6e6e695da6c6ed7f4bb32630ab2f3d9314806.tar.gz | |
Merge branch 'ml/bugfix'
Diffstat (limited to 'html.c')
| -rw-r--r-- | html.c | 18 |
1 files changed, 9 insertions, 9 deletions
| @@ -95,7 +95,7 @@ void html_txt(const char *txt) | |||
| 95 | while(t && *t){ | 95 | while(t && *t){ |
| 96 | int c = *t; | 96 | int c = *t; |
| 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=='>') |
| 100 | html(">"); | 100 | html(">"); |
| 101 | else if (c=='<') | 101 | else if (c=='<') |
| @@ -116,7 +116,7 @@ void html_ntxt(int len, const char *txt) | |||
| 116 | while(t && *t && len--){ | 116 | while(t && *t && len--){ |
| 117 | int c = *t; | 117 | int c = *t; |
| 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=='>') |
| 121 | html(">"); | 121 | html(">"); |
| 122 | else if (c=='<') | 122 | else if (c=='<') |
| @@ -128,7 +128,7 @@ void html_ntxt(int len, const char *txt) | |||
| 128 | t++; | 128 | t++; |
| 129 | } | 129 | } |
| 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) |
| 133 | html("..."); | 133 | html("..."); |
| 134 | } | 134 | } |
| @@ -139,7 +139,7 @@ void html_attr(const char *txt) | |||
| 139 | while(t && *t){ | 139 | while(t && *t){ |
| 140 | int c = *t; | 140 | int c = *t; |
| 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=='>') |
| 144 | html(">"); | 144 | html(">"); |
| 145 | else if (c=='<') | 145 | else if (c=='<') |
| @@ -163,8 +163,8 @@ void html_url_path(const char *txt) | |||
| 163 | int c = *t; | 163 | int c = *t; |
| 164 | const char *e = url_escape_table[c]; | 164 | const char *e = url_escape_table[c]; |
| 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; |
| 169 | } | 169 | } |
| 170 | t++; | 170 | t++; |
| @@ -180,8 +180,8 @@ void html_url_arg(const char *txt) | |||
| 180 | int c = *t; | 180 | int c = *t; |
| 181 | const char *e = url_escape_table[c]; | 181 | const char *e = url_escape_table[c]; |
| 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; |
| 186 | } | 186 | } |
| 187 | t++; | 187 | t++; |
| @@ -249,7 +249,7 @@ int html_include(const char *filename) | |||
| 249 | return -1; | 249 | return -1; |
| 250 | } | 250 | } |
| 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); |
| 254 | return 0; | 254 | return 0; |
| 255 | } | 255 | } |