author | Lars Hjemli <hjemli@gmail.com> | 2009-01-29 21:21:24 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-01-29 21:21:24 (UTC) |
commit | d6174b7aab476c2b6a86e59d98cf978d603045f4 (patch) (unidiff) | |
tree | ccc348a5887b2ca580aabfb3eca90bbd86a24386 /html.c | |
parent | a61871a18ffa9fc28e7ab0950415404350c8c857 (diff) | |
parent | 7efcef00b5aadf22f5be80ecd7b736398cf7f6b4 (diff) | |
download | cgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.zip cgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.tar.gz cgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | html.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -99,40 +99,42 @@ void html_ntxt(int len, char *txt) | |||
99 | html("&"); | 99 | html("&"); |
100 | txt = t+1; | 100 | txt = t+1; |
101 | } | 101 | } |
102 | t++; | 102 | t++; |
103 | } | 103 | } |
104 | if (t!=txt) | 104 | if (t!=txt) |
105 | write(htmlfd, txt, t - txt); | 105 | write(htmlfd, txt, t - txt); |
106 | if (len<0) | 106 | if (len<0) |
107 | html("..."); | 107 | html("..."); |
108 | } | 108 | } |
109 | 109 | ||
110 | void html_attr(char *txt) | 110 | void html_attr(char *txt) |
111 | { | 111 | { |
112 | char *t = txt; | 112 | char *t = txt; |
113 | while(t && *t){ | 113 | while(t && *t){ |
114 | int c = *t; | 114 | int c = *t; |
115 | if (c=='<' || c=='>' || c=='\'') { | 115 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { |
116 | write(htmlfd, txt, t - txt); | 116 | write(htmlfd, txt, t - txt); |
117 | if (c=='>') | 117 | if (c=='>') |
118 | html(">"); | 118 | html(">"); |
119 | else if (c=='<') | 119 | else if (c=='<') |
120 | html("<"); | 120 | html("<"); |
121 | else if (c=='\'') | 121 | else if (c=='\'') |
122 | html(""e;"); | 122 | html("'"); |
123 | else if (c=='"') | ||
124 | html("""); | ||
123 | txt = t+1; | 125 | txt = t+1; |
124 | } | 126 | } |
125 | t++; | 127 | t++; |
126 | } | 128 | } |
127 | if (t!=txt) | 129 | if (t!=txt) |
128 | html(txt); | 130 | html(txt); |
129 | } | 131 | } |
130 | 132 | ||
131 | void html_url_path(char *txt) | 133 | void html_url_path(char *txt) |
132 | { | 134 | { |
133 | char *t = txt; | 135 | char *t = txt; |
134 | while(t && *t){ | 136 | while(t && *t){ |
135 | int c = *t; | 137 | int c = *t; |
136 | if (c=='"' || c=='#' || c=='\'' || c=='?') { | 138 | if (c=='"' || c=='#' || c=='\'' || c=='?') { |
137 | write(htmlfd, txt, t - txt); | 139 | write(htmlfd, txt, t - txt); |
138 | write(htmlfd, fmt("%%%2x", c), 3); | 140 | write(htmlfd, fmt("%%%2x", c), 3); |