/* Parsing FTP `ls' output.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Wget.
clean_line(char *line)
{
int len = strlen (line);
- if (!len) return 0;
+ if (!len) return 0;
if (line[len - 1] == '\n')
line[--len] = '\0';
- if (!len) return 0;
+ if (!len) return 0;
if (line[len - 1] == '\r')
line[--len] = '\0';
- for ( ; *line ; line++ ) if (*line == '\t') *line = ' ';
+ for ( ; *line ; line++ ) if (*line == '\t') *line = ' ';
return len;
}
};
int next, len, i, error, ignore;
int year, month, day; /* for time analysis */
- int hour, min, sec;
+ int hour, min, sec, ptype;
struct tm timestruct, *tnow;
time_t timenow;
treated equally for now. */
year = hour = min = sec = 0; /* Silence the compiler. */
month = day = 0;
+ ptype = TT_DAY;
next = -1;
/* While there are tokens on the line, parse them. Next is the
number of tokens left until the filename.
/* This means these were hours! */
hour = year;
year = 0;
+ ptype = TT_HOUR_MIN;
++tok;
/* Get the minutes... */
for (; c_isdigit (*tok); tok++)
timestruct.tm_yday = 0;
timestruct.tm_isdst = -1;
l->tstamp = mktime (×truct); /* store the time-stamp */
+ l->ptype = ptype;
xfree (line);
}
if (hour == 12) hour = 0;
if (*tok == 'P') hour += 12;
- DEBUGP(("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",
+ DEBUGP(("YYYY/MM/DD HH:MM - %d/%02d/%02d %02d:%02d\n",
year+1900, month, day, hour, min));
-
+
/* Build the time-stamp (copy & paste from above) */
timestruct.tm_sec = 0;
timestruct.tm_min = min;
timestruct.tm_yday = 0;
timestruct.tm_isdst = -1;
cur.tstamp = mktime (×truct); /* store the time-stamp */
+ cur.ptype = TT_HOUR_MIN;
DEBUGP(("Timestamp: %ld\n", cur.tstamp));
more or less. (Different VMS FTP servers may have different headers,
and may not supply the same data, but all should be subsets of this.)
- VMS normally provides local (server) time and date information.
+ VMS normally provides local (server) time and date information.
Define the logical name or environment variable
"WGET_TIMEZONE_DIFFERENTIAL" (seconds) to adjust the receiving local
times if different from the remote local times.
int dt, i, j, len;
int perms;
time_t timenow;
- struct tm timestruct;
+ struct tm *timestruct;
char date_str[ 32];
char *line, *tok; /* tokenizer */
#endif /* (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS)) */
/* 2005-02-23 SMS.
- Eliminate "^" escape characters from ODS5 extended file name.
+ Eliminate "^" escape characters from ODS5 extended file name.
(A caret is invalid in an ODS2 name, so this is always safe.)
*/
eat_carets( tok);
*/
tok = strtok(NULL, " ");
- if (tok == NULL)
+ if (tok == NULL)
{
DEBUGP(("Getting additional line.\n"));
xfree (line);
}
else
{
- /* Nondescript. Probably size(s), probably in blocks.
+ /* Nondescript. Probably size(s), probably in blocks.
Could be "No privilege ..." message. (Ignore.)
*/
DEBUGP (("Ignored (size?).\n"));
fails.
*/
timenow = time( NULL);
- localtime_r( &timenow, ×truct);
- strptime( date_str, "%d-%b-%Y %H:%M:%S", ×truct);
+ timestruct = localtime( &timenow );
+ strptime( date_str, "%d-%b-%Y %H:%M:%S", timestruct);
/* Convert struct tm local time to time_t local time. */
- timenow = mktime (×truct);
+ timenow = mktime (timestruct);
/* Offset local time according to environment variable (seconds). */
if ((tok = getenv( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)
{
}
cur.tstamp = timenow; /* Store the time-stamp. */
DEBUGP(("Timestamp: %ld\n", cur.tstamp));
+ cur.ptype = TT_HOUR_MIN;
/* Add the data for this item to the linked list, */
if (!dir)
fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
ptm->tm_mday);
- if (ptm->tm_hour)
+ if (f->ptype == TT_HOUR_MIN)
fprintf (fp, "%02d:%02d ", ptm->tm_hour, ptm->tm_min);
else
fprintf (fp, " ");