X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fftp-ls.c;h=409996c350d2ad2f9e25e030e03b16558b4b9be9;hb=123f5c39669abc055987d69a311785c861494c87;hp=97d725f635a9921dcfc9e6615595d97ef3318c0b;hpb=6633b74930870ffb148c46129c738af78082d934;p=wget
diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 97d725f6..409996c3 100644
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -1,6 +1,6 @@
/* Parsing FTP `ls' output.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+ 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Wget.
@@ -17,17 +17,18 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with Wget. If not, see .
-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. */
+Additional permission under GNU GPL version 3 section 7
-#include
+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. */
+
+#include "wget.h"
#include
#include
@@ -37,8 +38,6 @@ so, delete this exception statement from your version. */
#endif
#include
#include
-
-#include "wget.h"
#include "utils.h"
#include "ftp.h"
#include "url.h"
@@ -252,10 +251,10 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
year = 0;
min = hour = sec = 0;
/* We must deal with digits. */
- if (ISDIGIT (*tok))
+ if (c_isdigit (*tok))
{
/* Suppose it's year. */
- for (; ISDIGIT (*tok); tok++)
+ for (; c_isdigit (*tok); tok++)
year = (*tok - '0') + 10 * year;
if (*tok == ':')
{
@@ -264,13 +263,13 @@ ftp_parse_unix_ls (const char *file, int ignore_perms)
year = 0;
++tok;
/* Get the minutes... */
- for (; ISDIGIT (*tok); tok++)
+ for (; c_isdigit (*tok); tok++)
min = (*tok - '0') + 10 * min;
if (*tok == ':')
{
/* ...and the seconds. */
++tok;
- for (; ISDIGIT (*tok); tok++)
+ for (; c_isdigit (*tok); tok++)
sec = (*tok - '0') + 10 * sec;
}
}
@@ -895,7 +894,8 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f)
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
- struct tm *ptm = localtime ((time_t *)&f->tstamp);
+ time_t tstamp = f->tstamp;
+ struct tm *ptm = localtime (&tstamp);
fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
ptm->tm_mday);