* ftp.c (ftp_pasv): ftp_command response

(readFTPDir): masked declaration of realpathname
From: Fumitoshi UKAI  <ukai@debian.or.jp>
This commit is contained in:
Fumitoshi UKAI
2003-01-11 16:00:55 +00:00
parent 567bdbc0cb
commit 24fbb90b3d
2 changed files with 9 additions and 4 deletions

View File

@@ -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> 2003-01-12 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 03633] Re: cleanup (don't close connection of news server) * [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 * release-0-2-1
* import w3m-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 $

6
ftp.c
View File

@@ -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 <stdio.h>
#include <pwd.h> #include <pwd.h>
#include <Str.h> #include <Str.h>
@@ -199,7 +199,7 @@ ftp_pasv(FTP ftp)
switch (family) { switch (family) {
#ifdef INET6 #ifdef INET6
case AF_INET6: case AF_INET6:
ftp_command(ftp, "EPSV", NULL, &status); tmp = ftp_command(ftp, "EPSV", NULL, &status);
if (status != 229) if (status != 229)
return -1; return -1;
for (p = tmp->ptr + 4; *p && *p != '('; p++) ; for (p = tmp->ptr + 4; *p && *p != '('; p++) ;
@@ -435,7 +435,7 @@ readFTPDir(ParsedURL *pu)
pu->file = "/"; pu->file = "/";
} }
else { else {
char *realpathname = file_unquote(pu->file); realpathname = file_unquote(pu->file);
if (sv_type == UNIXLIKE_SERVER) { if (sv_type == UNIXLIKE_SERVER) {
ftp_command(&current_ftp, "CWD", realpathname, &status); ftp_command(&current_ftp, "CWD", realpathname, &status);
if (status == 250) if (status == 250)