diff options
Diffstat (limited to '')
| -rw-r--r-- | anchor.c | 16 | ||||
| -rw-r--r-- | indep.c | 30 | ||||
| -rw-r--r-- | main.c | 6 | ||||
| -rw-r--r-- | map.c | 15 |
4 files changed, 33 insertions, 34 deletions
@@ -1,4 +1,4 @@ -/* $Id: anchor.c,v 1.23 2003/02/05 16:43:56 ukai Exp $ */ +/* $Id: anchor.c,v 1.24 2003/02/05 16:45:07 ukai Exp $ */ #include "fm.h" #include "myctype.h" #include "regex.h" @@ -734,9 +734,9 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, buf->document_code)); + p = html_quote(url_unquote_conv(p, buf->document_code)); else - p = u; + p = u; t = getAnchorText(buf, al, a); t = t ? html_quote(t) : ""; Strcat_m_charp(tmp, "<li><a href=\"", u, "\">", t, "</a><br>", p, @@ -756,9 +756,9 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, buf->document_code)); + p = html_quote(url_unquote_conv(p, buf->document_code)); else - p = u; + p = u; if (a->title && *a->title) t = html_quote(a->title); else if (DecodeURL) @@ -788,10 +788,10 @@ link_list_panel(Buffer *buf) p = parsedURL2Str(&pu)->ptr; u = html_quote(p); if (DecodeURL) - p = html_quote(url_unquote_conv(p, - buf->document_code)); + p = html_quote(url_unquote_conv(p, + buf->document_code)); else - p = u; + p = u; if (m->alt && *m->alt) t = html_quote(m->alt); else if (DecodeURL) @@ -1,4 +1,4 @@ -/* $Id: indep.c,v 1.31 2003/02/05 16:43:57 ukai Exp $ */ +/* $Id: indep.c,v 1.32 2003/02/05 16:45:08 ukai Exp $ */ #include "fm.h" #include <stdio.h> #include <pwd.h> @@ -12,22 +12,22 @@ #include "entity.h" unsigned char QUOTE_MAP[0x100] = { -/* NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI */ + /* NUL SOH STX ETX EOT ENQ ACK BEL BS HT LF VT FF CR SO SI */ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -/* DLE DC1 DC2 DC3 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US */ + /* DLE DC1 DC2 DC3 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US */ 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -/* SPC ! " # $ % & ' ( ) * + , - . / */ - 24, 72, 76, 40, 8, 40, 41, 72, 72, 72, 72, 40, 72, 8, 0, 64, -/* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 72, 74, 72, 75, 40, -/* @ A B C D E F G H I J K L M N O */ - 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* P Q R S T U V W X Y Z [ \ ] ^ _ */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 72, 72, 72, 0, -/* ` a b c d e f g h i j k l m n o */ - 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -/* p q r s t u v w x y z { | } ~ DEL */ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 72, 72, 72, 24, + /* SPC ! " # $ % & ' ( ) * + , - . / */ + 24, 72, 76, 40, 8, 40, 41, 72, 72, 72, 72, 40, 72, 8, 0, 64, + /* 0 1 2 3 4 5 6 7 8 9 : ; < = > ? */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32, 72, 74, 72, 75, 40, + /* @ A B C D E F G H I J K L M N O */ + 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + /* P Q R S T U V W X Y Z [ \ ] ^ _ */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 72, 72, 72, 0, + /* ` a b c d e f g h i j k l m n o */ + 72, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + /* p q r s t u v w x y z { | } ~ DEL */ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 72, 72, 72, 24, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.209 2003/02/05 16:43:58 ukai Exp $ */ +/* $Id: main.c,v 1.210 2003/02/05 16:45:08 ukai Exp $ */ #define MAINPROGRAM #include "fm.h" #include <signal.h> @@ -3880,7 +3880,7 @@ goURL0(char *prompt, int relative) char *c_url = parsedURL2Str(current)->ptr; if (DefaultURLString == DEFAULT_URL_CURRENT) { url = c_url; - if (DecodeURL) + if (DecodeURL) url = url_unquote_conv(url, 0); } else @@ -3893,7 +3893,7 @@ goURL0(char *prompt, int relative) a_url = parsedURL2Str(&p_url)->ptr; if (DefaultURLString == DEFAULT_URL_LINK) { url = a_url; - if (DecodeURL) + if (DecodeURL) url = url_unquote_conv(url, Currentbuf->document_code); } else @@ -1,4 +1,4 @@ -/* $Id: map.c,v 1.27 2003/02/05 16:43:59 ukai Exp $ */ +/* $Id: map.c,v 1.28 2003/02/05 16:45:08 ukai Exp $ */ /* * client-side image maps */ @@ -277,9 +277,9 @@ follow_map_panel(Buffer *buf, char *name) parseURL2(a->url, &pu, baseURL(buf)); p = parsedURL2Str(&pu)->ptr; q = html_quote(p); - if (DecodeURL) + if (DecodeURL) p = html_quote(url_unquote_conv(p, buf->document_code)); - else + else p = q; Strcat_m_charp(mappage, "<tr valign=top><td><a href=\"", q, "\">", html_quote(*a->alt ? a->alt : mybasename(a->url)), @@ -411,9 +411,9 @@ append_map_info(Buffer *buf, Str tmp, FormItemList *fi) continue; parseURL2(a->url, &pu, baseURL(buf)); q = html_quote(parsedURL2Str(&pu)->ptr); - if (DecodeURL) + if (DecodeURL) p = html_quote(url_unquote_conv(a->url, buf->document_code)); - else + else p = html_quote(a->url); Strcat_m_charp(tmp, "<tr valign=top><td> <td><a href=\"", q, "\">", @@ -451,7 +451,7 @@ append_link_info(Buffer *buf, Str html, LinkList * link) Strcat_charp(html, "[Rev]"); if (!l->url) url = "(empty)"; - else if (DecodeURL) + else if (DecodeURL) url = html_quote(url_unquote_conv(l->url, buf->document_code)); else url = html_quote(l->url); @@ -581,8 +581,7 @@ page_info_panel(Buffer *buf) p = q; Strcat_m_charp(tmp, "<tr valign=top><td nowrap>URL of current image<td><a href=\"", - q, "\">", p, "</a>", - NULL); + q, "\">", p, "</a>", NULL); } a = retrieveCurrentForm(buf); if (a != NULL) { |