aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-01-11 16:00:55 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-01-11 16:00:55 +0000
commit24fbb90b3d553cd1eb2122c9def3991b94588c79 (patch)
tree4699b18bbb513d5eb970f9bc53549ffc76247ee1
parentfix indent (diff)
downloadw3m-24fbb90b3d553cd1eb2122c9def3991b94588c79.tar.gz
w3m-24fbb90b3d553cd1eb2122c9def3991b94588c79.zip
* ftp.c (ftp_pasv): ftp_command response
(readFTPDir): masked declaration of realpathname From: Fumitoshi UKAI <ukai@debian.or.jp>
Diffstat (limited to '')
-rw-r--r--ChangeLog7
-rw-r--r--ftp.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aa95fe6..61075c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-12 Fumitoshi UKAI <ukai@debian.or.jp>
+
+ * ftp.c (ftp_pasv): ftp_command response
+ (readFTPDir): masked declaration of realpathname
+
2003-01-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03633] Re: cleanup (don't close connection of news server)
@@ -6373,4 +6378,4 @@ a * [w3m-dev 03276] compile error on EWS4800
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.673 2003/01/11 15:54:08 ukai Exp $
+$Id: ChangeLog,v 1.674 2003/01/11 16:00:55 ukai Exp $
diff --git a/ftp.c b/ftp.c
index 6ed3fc6..7db34a0 100644
--- a/ftp.c
+++ b/ftp.c
@@ -1,4 +1,4 @@
-/* $Id: ftp.c,v 1.22 2003/01/11 15:55:10 ukai Exp $ */
+/* $Id: ftp.c,v 1.23 2003/01/11 16:00:56 ukai Exp $ */
#include <stdio.h>
#include <pwd.h>
#include <Str.h>
@@ -199,7 +199,7 @@ ftp_pasv(FTP ftp)
switch (family) {
#ifdef INET6
case AF_INET6:
- ftp_command(ftp, "EPSV", NULL, &status);
+ tmp = ftp_command(ftp, "EPSV", NULL, &status);
if (status != 229)
return -1;
for (p = tmp->ptr + 4; *p && *p != '('; p++) ;
@@ -435,7 +435,7 @@ readFTPDir(ParsedURL *pu)
pu->file = "/";
}
else {
- char *realpathname = file_unquote(pu->file);
+ realpathname = file_unquote(pu->file);
if (sv_type == UNIXLIKE_SERVER) {
ftp_command(&current_ftp, "CWD", realpathname, &status);
if (status == 250)