[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / ftp.h

diff --git a/src/ftp.h b/src/ftp.h
index 33c4c419210fb50d1bc2263f0725eb44adbd19db..3bdc4f7e361e54596456ca909cb383dd01427d19 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -1,11 +1,11 @@
 /* Declarations for FTP support.
 /* Declarations for FTP support.

-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996-2006 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License

-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -30,9 +29,6 @@ so, delete this exception statement from your version.  */
 #ifndef FTP_H
 #define FTP_H
 
 #ifndef FTP_H
 #define FTP_H
 

-/* Need it for struct rbuf.  */
-#include "rbuf.h"
-

 #include "host.h"
 
 /* System types. */
 #include "host.h"
 
 /* System types. */


@@ -45,25 +41,31 @@ enum stype
   ST_OS400,
   ST_OTHER
 };
   ST_OS400,
   ST_OTHER
 };

-  
-uerr_t ftp_response PARAMS ((struct rbuf *, char **));
-uerr_t ftp_login PARAMS ((struct rbuf *, const char *, const char *));
-uerr_t ftp_port PARAMS ((struct rbuf *));
-uerr_t ftp_pasv PARAMS ((struct rbuf *, ip_address *, unsigned short *));
+
+extern char ftp_last_respline[];
+
+uerr_t ftp_response (int, char **);
+uerr_t ftp_login (int, const char *, const char *);
+uerr_t ftp_port (int, int *);
+uerr_t ftp_pasv (int, ip_address *, int *);

 #ifdef ENABLE_IPV6
 #ifdef ENABLE_IPV6

-uerr_t ftp_lprt PARAMS ((struct rbuf *));
-uerr_t ftp_lpsv PARAMS ((struct rbuf *, ip_address *, unsigned short *));
-uerr_t ftp_eprt PARAMS ((struct rbuf *));
-uerr_t ftp_epsv PARAMS ((struct rbuf *, ip_address *, unsigned short *));
+uerr_t ftp_lprt (int, int *);
+uerr_t ftp_lpsv (int, ip_address *, int *);
+uerr_t ftp_eprt (int, int *);
+uerr_t ftp_epsv (int, ip_address *, int *);
+#endif
+uerr_t ftp_type (int, int);
+uerr_t ftp_cwd (int, const char *);
+uerr_t ftp_retr (int, const char *);
+uerr_t ftp_rest (int, wgint);
+uerr_t ftp_list (int, const char *);
+uerr_t ftp_syst (int, enum stype *);
+uerr_t ftp_pwd (int, char **);
+uerr_t ftp_size (int, const char *, wgint *);
+
+#ifdef ENABLE_OPIE
+const char *skey_response (int, const char *, const char *);

 #endif
 #endif

-uerr_t ftp_type PARAMS ((struct rbuf *, int));
-uerr_t ftp_cwd PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_retr PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_rest PARAMS ((struct rbuf *, long));
-uerr_t ftp_list PARAMS ((struct rbuf *, const char *));
-uerr_t ftp_syst PARAMS ((struct rbuf *, enum stype *));
-uerr_t ftp_pwd PARAMS ((struct rbuf *, char **));
-uerr_t ftp_size PARAMS ((struct rbuf *, const char *, long int *));

 
 struct url;
 
 
 struct url;
 


@@ -80,7 +82,7 @@ enum ftype
 /* Globbing (used by ftp_retrieve_glob).  */
 enum
 {
 /* Globbing (used by ftp_retrieve_glob).  */
 enum
 {

-  GLOBALL, GETALL, GETONE
+  GLOB_GLOBALL, GLOB_GETALL, GLOB_GETONE

 };
 
 /* Information about one filename in a linked list.  */
 };
 
 /* Information about one filename in a linked list.  */


@@ -88,7 +90,7 @@ struct fileinfo
 {
   enum ftype type;             /* file type */
   char *name;                  /* file name */
 {
   enum ftype type;             /* file type */
   char *name;                  /* file name */

-  long size;                   /* file size */
+  wgint size;                  /* file size */

   long tstamp;                 /* time-stamp */
   int perms;                   /* file permissions */
   char *linkto;                        /* link to which file points */
   long tstamp;                 /* time-stamp */
   int perms;                   /* file permissions */
   char *linkto;                        /* link to which file points */


@@ -103,9 +105,7 @@ enum wget_ftp_command
   DO_CWD        = 0x0002,      /* Change current directory.  */
   DO_RETR       = 0x0004,      /* Retrieve the file.  */
   DO_LIST       = 0x0008,      /* Retrieve the directory list.  */
   DO_CWD        = 0x0002,      /* Change current directory.  */
   DO_RETR       = 0x0004,      /* Retrieve the file.  */
   DO_LIST       = 0x0008,      /* Retrieve the directory list.  */

-  LEAVE_PENDING = 0x0010,      /* Do not close the socket.  */
-  NO_TRUNCATE  = 0x0020        /* Don't truncate the file if REST
-                                  malfunctions. */
+  LEAVE_PENDING = 0x0010       /* Do not close the socket.  */

 };
 
 enum wget_ftp_fstatus
 };
 
 enum wget_ftp_fstatus


@@ -117,12 +117,12 @@ enum wget_ftp_fstatus
                                   correct.  */
 };
 
                                   correct.  */
 };
 

-struct fileinfo *ftp_parse_ls PARAMS ((const char *, const enum stype));
-uerr_t ftp_loop PARAMS ((struct url *, int *, struct url *));
+struct fileinfo *ftp_parse_ls (const char *, const enum stype);
+uerr_t ftp_loop (struct url *, int *, struct url *, bool, bool);

 
 

-uerr_t ftp_index PARAMS ((const char *, struct url *, struct fileinfo *));
+uerr_t ftp_index (const char *, struct url *, struct fileinfo *);

 
 

-char ftp_process_type PARAMS ((const char *));
+char ftp_process_type (const char *);

 
 
 #endif /* FTP_H */
 
 
 #endif /* FTP_H */