summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2009-01-29 21:21:24 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2009-01-29 21:21:24 (UTC)
commitd6174b7aab476c2b6a86e59d98cf978d603045f4 (patch) (unidiff)
treeccc348a5887b2ca580aabfb3eca90bbd86a24386
parenta61871a18ffa9fc28e7ab0950415404350c8c857 (diff)
parent7efcef00b5aadf22f5be80ecd7b736398cf7f6b4 (diff)
downloadcgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.zip
cgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.tar.gz
cgit-d6174b7aab476c2b6a86e59d98cf978d603045f4.tar.bz2
Merge branch 'stable'
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--html.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/html.c b/html.c
index d7d9fd7..66ba65d 100644
--- a/html.c
+++ b/html.c
@@ -67,104 +67,106 @@ void html_txt(char *txt)
67{ 67{
68 char *t = txt; 68 char *t = txt;
69 while(t && *t){ 69 while(t && *t){
70 int c = *t; 70 int c = *t;
71 if (c=='<' || c=='>' || c=='&') { 71 if (c=='<' || c=='>' || c=='&') {
72 write(htmlfd, txt, t - txt); 72 write(htmlfd, txt, t - txt);
73 if (c=='>') 73 if (c=='>')
74 html("&gt;"); 74 html("&gt;");
75 else if (c=='<') 75 else if (c=='<')
76 html("&lt;"); 76 html("&lt;");
77 else if (c=='&') 77 else if (c=='&')
78 html("&amp;"); 78 html("&amp;");
79 txt = t+1; 79 txt = t+1;
80 } 80 }
81 t++; 81 t++;
82 } 82 }
83 if (t!=txt) 83 if (t!=txt)
84 html(txt); 84 html(txt);
85} 85}
86 86
87void html_ntxt(int len, char *txt) 87void html_ntxt(int len, char *txt)
88{ 88{
89 char *t = txt; 89 char *t = txt;
90 while(t && *t && len--){ 90 while(t && *t && len--){
91 int c = *t; 91 int c = *t;
92 if (c=='<' || c=='>' || c=='&') { 92 if (c=='<' || c=='>' || c=='&') {
93 write(htmlfd, txt, t - txt); 93 write(htmlfd, txt, t - txt);
94 if (c=='>') 94 if (c=='>')
95 html("&gt;"); 95 html("&gt;");
96 else if (c=='<') 96 else if (c=='<')
97 html("&lt;"); 97 html("&lt;");
98 else if (c=='&') 98 else if (c=='&')
99 html("&amp;"); 99 html("&amp;");
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
110void html_attr(char *txt) 110void 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("&gt;"); 118 html("&gt;");
119 else if (c=='<') 119 else if (c=='<')
120 html("&lt;"); 120 html("&lt;");
121 else if (c=='\'') 121 else if (c=='\'')
122 html("&quote;"); 122 html("&#x27;");
123 else if (c=='"')
124 html("&quot;");
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
131void html_url_path(char *txt) 133void 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);
139 txt = t+1; 141 txt = t+1;
140 } 142 }
141 t++; 143 t++;
142 } 144 }
143 if (t!=txt) 145 if (t!=txt)
144 html(txt); 146 html(txt);
145} 147}
146 148
147void html_url_arg(char *txt) 149void html_url_arg(char *txt)
148{ 150{
149 char *t = txt; 151 char *t = txt;
150 while(t && *t){ 152 while(t && *t){
151 int c = *t; 153 int c = *t;
152 if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { 154 if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
153 write(htmlfd, txt, t - txt); 155 write(htmlfd, txt, t - txt);
154 write(htmlfd, fmt("%%%2x", c), 3); 156 write(htmlfd, fmt("%%%2x", c), 3);
155 txt = t+1; 157 txt = t+1;
156 } 158 }
157 t++; 159 t++;
158 } 160 }
159 if (t!=txt) 161 if (t!=txt)
160 html(txt); 162 html(txt);
161} 163}
162 164
163void html_hidden(char *name, char *value) 165void html_hidden(char *name, char *value)
164{ 166{
165 html("<input type='hidden' name='"); 167 html("<input type='hidden' name='");
166 html_attr(name); 168 html_attr(name);
167 html("' value='"); 169 html("' value='");
168 html_attr(value); 170 html_attr(value);
169 html("'/>"); 171 html("'/>");
170} 172}