Merge branch 'lh/escape-urls'

* lh/escape-urls:
  ui-shared.c: use html_url_arg()
  html.c: add html_url_arg

1 files changed, 16 insertions, 0 deletions

diff --git a/html.c b/html.c
index 36e9a2f..167127f 100644
--- a/html.c
+++ b/html.c
@@ -83,96 +83,112 @@ void html_txt(char *txt)
         if (t!=txt)
                 html(txt);
 }
 
 void html_ntxt(int len, char *txt)
 {
         char *t = txt;
         while(t && *t && len--){
                 int c = *t;
                 if (c=='<' || c=='>' || c=='&') {
                         write(htmlfd, txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (c=='<')
                                 html("&lt;");
                         else if (c=='&')
                                 html("&amp;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 write(htmlfd, txt, t - txt);
         if (len<0)
                 html("...");
 }
 
 void html_attr(char *txt)
 {
         char *t = txt;
         while(t && *t){
                 int c = *t;
                 if (c=='<' || c=='>' || c=='\'') {
                         write(htmlfd, txt, t - txt);
                         if (c=='>')
                                 html("&gt;");
                         else if (c=='<')
                                 html("&lt;");
                         else if (c=='\'')
                                 html("&quote;");
                         txt = t+1;
                 }
                 t++;
         }
         if (t!=txt)
                 html(txt);
 }
 
+void html_url_arg(char *txt)
+{
+        char *t = txt;
+        while(t && *t){
+                int c = *t;
+                if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+                        write(htmlfd, txt, t - txt);
+                        write(htmlfd, fmt("%%%2x", c), 3);
+                        txt = t+1;
+                }
+                t++;
+        }
+        if (t!=txt)
+                html(txt);
+}
+
 void html_hidden(char *name, char *value)
 {
         html("<input type='hidden' name='");
         html_attr(name);
         html("' value='");
         html_attr(value);
         html("'/>");
 }
 
 void html_option(char *value, char *text, char *selected_value)
 {
         html("<option value='");
         html_attr(value);
         html("'");
         if (selected_value && !strcmp(selected_value, value))
                 html(" selected='selected'");
         html(">");
         html_txt(text);
         html("</option>\n");
 }
 
 void html_link_open(char *url, char *title, char *class)
 {
         html("<a href='");
         html_attr(url);
         if (title) {
                 html("' title='");
                 html_attr(title);
         }
         if (class) {
                 html("' class='");
                 html_attr(class);
         }
         html("'>");
 }
 
 void html_link_close(void)
 {
         html("</a>");
 }
 
 void html_fileperm(unsigned short mode)
 {
         htmlf("%c%c%c", (mode & 4 ? 'r' : '-'),
               (mode & 2 ? 'w' : '-'), (mode & 1 ? 'x' : '-'));
 }
 
 int html_include(const char *filename)