Unidiff1 files changed, 5 insertions, 15 deletions
|
diff --git a/html.c b/html.c index eb163d9..339bf00 100644 --- a/ html.c+++ b/ html.c |
|
@@ -45,15 +45,13 @@ void htmlf(const char *format, ...) |
45 | void html_txt(char *txt) |
45 | void html_txt(char *txt) |
46 | { |
46 | { |
47 | char *t = txt; |
47 | char *t = txt; |
48 | while(t && *t){ |
48 | while(t && *t){ |
49 | int c = *t; |
49 | int c = *t; |
50 | if (c=='<' || c=='>' || c=='&') { |
50 | if (c=='<' || c=='>' || c=='&') { |
51 | *t = '\0'; |
51 | write(htmlfd, txt, t - txt); |
52 | html(txt); |
| |
53 | *t = c; |
| |
54 | if (c=='>') |
52 | if (c=='>') |
55 | html(">"); |
53 | html(">"); |
56 | else if (c=='<') |
54 | else if (c=='<') |
57 | html("<"); |
55 | html("<"); |
58 | else if (c=='&') |
56 | else if (c=='&') |
59 | html("&"); |
57 | html("&"); |
@@ -68,44 +66,36 @@ void html_txt(char *txt) |
68 | void html_ntxt(int len, char *txt) |
66 | void html_ntxt(int len, char *txt) |
69 | { |
67 | { |
70 | char *t = txt; |
68 | char *t = txt; |
71 | while(t && *t && len--){ |
69 | while(t && *t && len--){ |
72 | int c = *t; |
70 | int c = *t; |
73 | if (c=='<' || c=='>' || c=='&') { |
71 | if (c=='<' || c=='>' || c=='&') { |
74 | *t = '\0'; |
72 | write(htmlfd, txt, t - txt); |
75 | html(txt); |
| |
76 | *t = c; |
| |
77 | if (c=='>') |
73 | if (c=='>') |
78 | html(">"); |
74 | html(">"); |
79 | else if (c=='<') |
75 | else if (c=='<') |
80 | html("<"); |
76 | html("<"); |
81 | else if (c=='&') |
77 | else if (c=='&') |
82 | html("&"); |
78 | html("&"); |
83 | txt = t+1; |
79 | txt = t+1; |
84 | } |
80 | } |
85 | t++; |
81 | t++; |
86 | } |
82 | } |
87 | if (t!=txt) { |
83 | if (t!=txt) |
88 | char c = *t; |
84 | write(htmlfd, txt, t - txt); |
89 | *t = '\0'; |
| |
90 | html(txt); |
| |
91 | *t = c; |
| |
92 | } |
| |
93 | if (len<0) |
85 | if (len<0) |
94 | html("..."); |
86 | html("..."); |
95 | } |
87 | } |
96 | |
88 | |
97 | void html_attr(char *txt) |
89 | void html_attr(char *txt) |
98 | { |
90 | { |
99 | char *t = txt; |
91 | char *t = txt; |
100 | while(t && *t){ |
92 | while(t && *t){ |
101 | int c = *t; |
93 | int c = *t; |
102 | if (c=='<' || c=='>' || c=='\'') { |
94 | if (c=='<' || c=='>' || c=='\'') { |
103 | *t = '\0'; |
95 | write(htmlfd, txt, t - txt); |
104 | html(txt); |
| |
105 | *t = c; |
| |
106 | if (c=='>') |
96 | if (c=='>') |
107 | html(">"); |
97 | html(">"); |
108 | else if (c=='<') |
98 | else if (c=='<') |
109 | html("<"); |
99 | html("<"); |
110 | else if (c=='\'') |
100 | else if (c=='\'') |
111 | html(""e;"); |
101 | html(""e;"); |
|