[svn] Remove the "rbuf" buffering layer. Provide peeking primitives instead.

[wget] / src / ftp.h

diff --git a/src/ftp.h b/src/ftp.h
index 9e7db07d56dec4bda814ec35e335e571f162d7bc..aaaff474298c8e44e58d62195263eb33c908741c 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -15,13 +15,22 @@ 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.  */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables.  You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL".  If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do
+so, delete this exception statement from your version.  */
 
 #ifndef FTP_H
 #define FTP_H
 
-/* Need it for struct rbuf.  */
-#include "rbuf.h"
+#include "host.h"
 
 /* System types. */
 enum stype
@@ -30,22 +39,34 @@ enum stype
   ST_VMS,
   ST_WINNT,
   ST_MACOS,
+  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 *, unsigned char *));
-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 **));
-
-struct urlinfo;
+uerr_t ftp_response PARAMS ((int, char **));
+uerr_t ftp_login PARAMS ((int, const char *, const char *));
+uerr_t ftp_port PARAMS ((int, int *));
+uerr_t ftp_pasv PARAMS ((int, ip_address *, int *));
+#ifdef ENABLE_IPV6
+uerr_t ftp_lprt PARAMS ((int, int *));
+uerr_t ftp_lpsv PARAMS ((int, ip_address *, int *));
+uerr_t ftp_eprt PARAMS ((int, int *));
+uerr_t ftp_epsv PARAMS ((int, ip_address *, int *));
+#endif
+uerr_t ftp_type PARAMS ((int, int));
+uerr_t ftp_cwd PARAMS ((int, const char *));
+uerr_t ftp_retr PARAMS ((int, const char *));
+uerr_t ftp_rest PARAMS ((int, long));
+uerr_t ftp_list PARAMS ((int, const char *));
+uerr_t ftp_syst PARAMS ((int, enum stype *));
+uerr_t ftp_pwd PARAMS ((int, char **));
+uerr_t ftp_size PARAMS ((int, const char *, long int *));
+
+#ifdef USE_OPIE
+const char *skey_response PARAMS ((int, const char *, const char *));
+#endif
+
+struct url;
 
 /* File types.  */
 enum ftype
@@ -97,19 +118,12 @@ enum wget_ftp_fstatus
                                   correct.  */
 };
 
-typedef struct
-{
-  int st;                      /* connection status */
-  int cmd;                     /* command code */
-  struct rbuf rbuf;            /* control connection buffer */
-  long dltime;                 /* time of the download */
-  enum stype rs;               /* remote system reported by ftp server */ 
-  char *id;                    /* initial directory */
-} ccon;
-
-struct fileinfo *ftp_parse_ls PARAMS ((const char *, enum stype));
-uerr_t ftp_loop PARAMS ((struct urlinfo *, int *));
-
-uerr_t ftp_index (const char *, struct urlinfo *, struct fileinfo *);
+struct fileinfo *ftp_parse_ls PARAMS ((const char *, const enum stype));
+uerr_t ftp_loop PARAMS ((struct url *, int *, struct url *));
+
+uerr_t ftp_index PARAMS ((const char *, struct url *, struct fileinfo *));
+
+char ftp_process_type PARAMS ((const char *));
+
 
 #endif /* FTP_H */