aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2002-03-08 16:58:12 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2002-03-08 16:58:12 +0000
commitc7c702fa470a16ed8c64668a52bf37689d026c24 (patch)
tree39c84884ab7465b2783c46a8fab16f612972a829
parent[w3m-dev 03092] Reload image (diff)
downloadw3m-c7c702fa470a16ed8c64668a52bf37689d026c24.tar.gz
w3m-c7c702fa470a16ed8c64668a52bf37689d026c24.zip
[w3m-dev 03095] Re: gopher broken
(Re: Bug#137287: w3m: segfault on gopher://xxxx.xxx URI) * file.c (loadGopherDir): html_quote(url_quote_conv()) From: Fumitoshi UKAI <ukai@debian.or.jp>
-rw-r--r--ChangeLog8
-rw-r--r--file.c9
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 720035b..20dbdff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-09 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * [w3m-dev 03095] Re: gopher broken
+ (Re: Bug#137287: w3m: segfault on gopher://xxxx.xxx URI)
+ * file.c (loadGopherDir): html_quote(url_quote_conv())
+
2002-03-09 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03092] Reload image
@@ -3095,4 +3101,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.339 2002/03/08 16:02:51 ukai Exp $
+$Id: ChangeLog,v 1.340 2002/03/08 16:58:12 ukai Exp $
diff --git a/file.c b/file.c
index a4e1376..b764851 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.78 2002/03/08 16:02:51 ukai Exp $ */
+/* $Id: file.c,v 1.79 2002/03/08 16:58:12 ukai Exp $ */
#include "fm.h"
#include <sys/types.h>
#include "myctype.h"
@@ -6204,7 +6204,7 @@ Buffer *
loadGopherDir(URLFile *uf, Buffer *volatile newBuf)
{
Str tmp, lbuf, name, file, host, port;
- char code;
+ char code = CODE_ASCII;
char *p, *q;
FILE *src;
URLFile f;
@@ -6280,8 +6280,9 @@ loadGopherDir(URLFile *uf, Buffer *volatile newBuf)
}
q = Strnew_m_charp("gopher://", host->ptr, ":", port->ptr,
"/", file->ptr, NULL)->ptr;
- Strcat_m_charp(tmp, "<a href=\"", url_quote(q), "\">", p,
- html_quote(name->ptr + 1), "</a>\n", NULL);
+ Strcat_m_charp(tmp, "<a href=\"",
+ html_quote(url_quote_conv(q, code)),
+ "\">", p, html_quote(name->ptr + 1), "</a>\n", NULL);
}
gopher_end: