mass change: update copyright years.

[wget] / src / ftp.h

diff --git a/src/ftp.h b/src/ftp.h
index 0d4aec52cbd8b94fbc60f0d453dcf4a1c17c79d6..be00d8806e2e7c551e3f24ea6b3e1107be1bde01 100644 (file)
--- a/src/ftp.h
+++ b/src/ftp.h
@@ -1,11 +1,13 @@
 /* Declarations for FTP support.
 /* Declarations for FTP support.

-   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008, 2009, 2010, 2011 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,18 +16,18 @@ 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.
-
-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.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */

 
 #ifndef FTP_H
 #define FTP_H
 
 #ifndef FTP_H
 #define FTP_H


@@ -59,7 +61,7 @@ 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_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_list (int, const char *, enum stype);

 uerr_t ftp_syst (int, enum stype *);
 uerr_t ftp_pwd (int, char **);
 uerr_t ftp_size (int, const char *, wgint *);
 uerr_t ftp_syst (int, enum stype *);
 uerr_t ftp_pwd (int, char **);
 uerr_t ftp_size (int, const char *, wgint *);


@@ -86,6 +88,13 @@ enum
   GLOB_GLOBALL, GLOB_GETALL, GLOB_GETONE
 };
 
   GLOB_GLOBALL, GLOB_GETALL, GLOB_GETONE
 };
 

+/* Used by to test if time parsed includes hours and minutes. */
+enum parsetype
+{
+  TT_HOUR_MIN, TT_DAY
+};
+
+

 /* Information about one filename in a linked list.  */
 struct fileinfo
 {
 /* Information about one filename in a linked list.  */
 struct fileinfo
 {


@@ -93,6 +102,7 @@ struct fileinfo
   char *name;                  /* file name */
   wgint size;                  /* file size */
   long tstamp;                 /* time-stamp */
   char *name;                  /* file name */
   wgint size;                  /* file size */
   long tstamp;                 /* time-stamp */

+  enum parsetype ptype; /* time parsing */

   int perms;                   /* file permissions */
   char *linkto;                        /* link to which file points */
   struct fileinfo *prev;       /* previous... */
   int perms;                   /* file permissions */
   char *linkto;                        /* link to which file points */
   struct fileinfo *prev;       /* previous... */


@@ -119,7 +129,7 @@ enum wget_ftp_fstatus
 };
 
 struct fileinfo *ftp_parse_ls (const char *, const enum stype);
 };
 
 struct fileinfo *ftp_parse_ls (const char *, const enum stype);

-uerr_t ftp_loop (struct url *, int *, struct url *);
+uerr_t ftp_loop (struct url *, char **, int *, struct url *, bool, bool);

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