/* 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, 2011 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <unistd.h>
#include <errno.h>
#include <time.h>
#include "utils.h"
replaces all <TAB> character with <SPACE>. Returns the length of the
modified line. */
static int
-clean_line(char *line)
+clean_line (char *line, int len)
{
- int len = strlen (line);
- if (!len) return 0;
- if (line[len - 1] == '\n')
- line[--len] = '\0';
- if (!len) return 0;
- if (line[len - 1] == '\r')
+ if (len <= 0) return 0;
+
+ while (len > 0 && (line[len - 1] == '\n' || line[len - 1] == '\r'))
line[--len] = '\0';
- for ( ; *line ; line++ ) if (*line == '\t') *line = ' ';
+
+ if (!len) return 0;
+
+ 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;
+ size_t bufsize = 0;
- char *line, *tok, *ptok; /* tokenizer */
+ char *line = NULL, *tok, *ptok; /* tokenizer */
struct fileinfo *dir, *l, cur; /* list creation */
fp = fopen (file, "rb");
dir = l = NULL;
/* Line loop to end of file: */
- while ((line = read_whole_line (fp)) != NULL)
+ while ((len = getline (&line, &bufsize, fp)) > 0)
{
- len = clean_line (line);
+ len = clean_line (line, len);
/* Skip if total... */
if (!strncasecmp (line, "total", 5))
- {
- xfree (line);
- continue;
- }
+ continue;
/* Get the first token (permissions). */
tok = strtok (line, " ");
if (!tok)
- {
- xfree (line);
- continue;
- }
+ continue;
cur.name = NULL;
cur.linkto = NULL;
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.
if (next < 0) /* a month name was not encountered */
{
for (i = 0; i < 12; i++)
- if (!strcmp (tok, months[i]))
+ if (!strcasecmp (tok, months[i]))
break;
/* If we got a month, it means the token before it is the
size, and the filename is three tokens away. */
/* This means these were hours! */
hour = year;
year = 0;
+ ptype = TT_HOUR_MIN;
++tok;
/* Get the minutes... */
for (; c_isdigit (*tok); tok++)
DEBUGP (("Skipping.\n"));
xfree_null (cur.name);
xfree_null (cur.linkto);
- xfree (line);
continue;
}
timestruct.tm_yday = 0;
timestruct.tm_isdst = -1;
l->tstamp = mktime (×truct); /* store the time-stamp */
-
- xfree (line);
+ l->ptype = ptype;
}
+ xfree (line);
fclose (fp);
return dir;
}
int len;
int year, month, day; /* for time analysis */
int hour, min;
+ size_t bufsize = 0;
struct tm timestruct;
- char *line, *tok; /* tokenizer */
+ char *line = NULL, *tok; /* tokenizer */
+ char *filename;
struct fileinfo *dir, *l, cur; /* list creation */
fp = fopen (file, "rb");
dir = l = NULL;
/* Line loop to end of file: */
- while ((line = read_whole_line (fp)) != NULL)
+ while ((len = getline (&line, &bufsize, fp)) > 0)
{
- len = clean_line (line);
-
- /* Extracting name is a bit of black magic and we have to do it
- before `strtok' inserted extra \0 characters in the line
- string. For the moment let us just suppose that the name starts at
- column 39 of the listing. This way we could also recognize
- filenames that begin with a series of space characters (but who
- really wants to use such filenames anyway?). */
+ len = clean_line (line, len);
+
+ /* Name begins at 39 column of the listing if date presented in `mm-dd-yy'
+ format or at 41 column if date presented in `mm-dd-yyyy' format. Thus,
+ we cannot extract name before we parse date. Using this information we
+ also can recognize filenames that begin with a series of space
+ characters (but who really wants to use such filenames anyway?). */
if (len < 40) continue;
- tok = line + 39;
- cur.name = xstrdup(tok);
- DEBUGP(("Name: '%s'\n", cur.name));
+ filename = line + 39;
- /* First column: mm-dd-yy. Should atoi() on the month fail, january
- will be assumed. */
+ /* First column: mm-dd-yy or mm-dd-yyyy. Should atoi() on the month fail,
+ january will be assumed. */
tok = strtok(line, "-");
if (tok == NULL) continue;
month = atoi(tok) - 1;
if (tok == NULL) continue;
year = atoi(tok);
/* Assuming the epoch starting at 1.1.1970 */
- if (year <= 70) year += 100;
+ if (year <= 70)
+ {
+ year += 100;
+ }
+ else if (year >= 1900)
+ {
+ year -= 1900;
+ filename += 2;
+ }
+ /* Now it is possible to determine the position of the first symbol in
+ filename. */
+ cur.name = xstrdup(filename);
+ DEBUGP (("Name: '%s'\n", cur.name));
+
/* Second column: hh:mm[AP]M, listing does not contain value for
seconds */
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));
+ DEBUGP (("Timestamp: %ld\n", cur.tstamp));
/* Third column: Either file length, or <DIR>. We also set the
permissions (guessed as 0644 for plain files and 0755 for
cur.type = FT_DIRECTORY;
cur.size = 0;
cur.perms = 0755;
- DEBUGP(("Directory\n"));
+ DEBUGP (("Directory\n"));
}
else
{
else
cur.size = size;
cur.perms = 0644;
- DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size)));
+ DEBUGP (("File, size %s bytes\n", number_to_static_string (cur.size)));
}
cur.linkto = NULL;
memcpy (l, &cur, sizeof (cur));
l->next = NULL;
}
-
- xfree (line);
}
+ xfree (line);
fclose(fp);
return dir;
}
-/* Converts VMS symbolic permissions to number-style ones, e.g. string
- RWED,RWE,RE to 755. "D" (delete) is taken to be equal to "W"
- (write). Inspired by a patch of Stoyan Lekov <lekov@eda.bg>. */
-static int
-vmsperms (const char *s)
-{
- int perms = 0;
- do
+
+/* Convert the VMS-style directory listing stored in "file" to a
+ linked list of fileinfo (system-independent) entries. The contents
+ of FILE are considered to be produced by the standard VMS
+ "DIRECTORY [/SIZE [= ALL]] /DATE [/OWNER] [/PROTECTION]" command,
+ 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.
+ Define the logical name or environment variable
+ "WGET_TIMEZONE_DIFFERENTIAL" (seconds) to adjust the receiving local
+ times if different from the remote local times.
+
+ 2005-02-23 SMS.
+ Added code to eliminate "^" escape characters from ODS5 extended file
+ names. The TCPIP FTP server (V5.4) seems to prefer requests which do
+ not use the escaped names which it provides.
+*/
+
+#define VMS_DEFAULT_PROT_FILE 0644
+#define VMS_DEFAULT_PROT_DIR 0755
+
+/* 2005-02-23 SMS.
+ eat_carets().
+
+ Delete ODS5 extended file name escape characters ("^") in the
+ original buffer.
+ Note that the current scheme does not handle all EFN cases, but it
+ could be made more complicated.
+*/
+
+static void eat_carets( char *str)
+/* char *str; Source pointer. */
+{
+ char *strd; /* Destination pointer. */
+ char hdgt;
+ unsigned char uchr;
+ unsigned char prop;
+
+ /* Skip ahead to the first "^", if any. */
+ while ((*str != '\0') && (*str != '^'))
+ str++;
+
+ /* If no caret was found, quit early. */
+ if (*str != '\0')
+ {
+ /* Shift characters leftward as carets are found. */
+ strd = str;
+ while (*str != '\0')
{
- switch (*s) {
- case ',': perms <<= 3; break;
- case 'R': perms |= 4; break;
- case 'W': perms |= 2; break;
- case 'D': perms |= 2; break;
- case 'E': perms |= 1; break;
- default: DEBUGP(("wrong VMS permissons!\n"));
+ uchr = *str;
+ if (uchr == '^')
+ {
+ /* Found a caret. Skip it, and check the next character. */
+ uchr = *(++str);
+ prop = char_prop[ uchr];
+ if (prop& 64)
+ {
+ /* Hex digit. Get char code from this and next hex digit. */
+ if (uchr <= '9')
+ {
+ hdgt = uchr- '0'; /* '0' - '9' -> 0 - 9. */
+ }
+ else
+ {
+ hdgt = ((uchr- 'A')& 7)+ 10; /* [Aa] - [Ff] -> 10 - 15. */
+ }
+ hdgt <<= 4; /* X16. */
+ uchr = *(++str); /* Next char must be hex digit. */
+ if (uchr <= '9')
+ {
+ uchr = hdgt+ uchr- '0';
+ }
+ else
+ {
+ uchr = hdgt+ ((uchr- 'A')& 15)+ 10;
+ }
+ }
+ else if (uchr == '_')
+ {
+ /* Convert escaped "_" to " ". */
+ uchr = ' ';
+ }
+ else if (uchr == '/')
+ {
+ /* Convert escaped "/" (invalid Zip) to "?" (invalid VMS). */
+ /* Note that this is a left-over from Info-ZIP code, and is
+ probably of little value here, except perhaps to avoid
+ directory confusion which an unconverted slash might cause.
+ */
+ uchr = '?';
+ }
+ /* Else, not a hex digit. Must be a simple escaped character
+ (or Unicode, which is not yet handled here).
+ */
}
+ /* Else, not a caret. Use as-is. */
+ *strd = uchr;
+
+ /* Advance destination and source pointers. */
+ strd++;
+ str++;
}
- while (*++s);
- return perms;
+ /* Terminate the destination string. */
+ *strd = '\0';
+ }
}
ftp_parse_vms_ls (const char *file)
{
FILE *fp;
- /* #### A third copy of more-or-less the same array ? */
- static const char *months[] = {
- "JAN", "FEB", "MAR", "APR", "MAY", "JUN",
- "JUL", "AUG", "SEP", "OCT", "NOV", "DEC"
- };
- int i;
- int year, month, day; /* for time analysis */
- int hour, min, sec;
- struct tm timestruct;
+ int dt, i, j, len;
+ int perms;
+ size_t bufsize = 0;
+ time_t timenow;
+ struct tm *timestruct;
+ char date_str[ 32];
- char *line, *tok; /* tokenizer */
+ char *line = NULL, *tok; /* tokenizer */
struct fileinfo *dir, *l, cur; /* list creation */
- fp = fopen (file, "rb");
+ fp = fopen (file, "r");
if (!fp)
{
logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
}
dir = l = NULL;
- /* Skip empty line. */
- line = read_whole_line (fp);
- xfree_null (line);
-
- /* Skip "Directory PUB$DEVICE[PUB]" */
- line = read_whole_line (fp);
- xfree_null (line);
+ /* Skip blank lines, Directory heading, and more blank lines. */
- /* Skip empty line. */
- line = read_whole_line (fp);
- xfree_null (line);
-
- /* Line loop to end of file: */
- while ((line = read_whole_line (fp)) != NULL)
+ for (j = 0; (i = getline (&line, &bufsize, fp)) > 0; )
{
- char *p;
- i = clean_line (line);
- if (!i)
+ i = clean_line (line, i);
+ if (i <= 0)
+ continue; /* Ignore blank line. */
+
+ if ((j == 0) && (line[i - 1] == ']'))
{
- xfree (line);
+ /* Found Directory heading line. Next non-blank line
+ is significant. */
+ j = 1;
+ }
+ else if (!strncmp (line, "Total of ", 9))
+ {
+ /* Found "Total of ..." footing line. No valid data
+ will follow (empty directory). */
+ i = 0; /* Arrange for early exit. */
break;
}
+ else
+ {
+ break; /* Must be significant data. */
+ }
+ }
+
+ /* Read remainder of file until the next blank line or EOF. */
+
+ while (i > 0)
+ {
+ char *p;
- /* First column: Name. A bit of black magic again. The name my be
- either ABCD.EXT or ABCD.EXT;NUM and it might be on a separate
- line. Therefore we will first try to get the complete name
- until the first space character; if it fails, we assume that the name
- occupies the whole line. After that we search for the version
- separator ";", we remove it and check the extension of the file;
- extension .DIR denotes directory. */
+ /* The first token is the file name. After a long name, other
+ data may be on the following line. A valid directory name ends
+ in ".DIR;1" (any case), although some VMS FTP servers may omit
+ the version number (";1").
+ */
tok = strtok(line, " ");
if (tok == NULL) tok = line;
- DEBUGP(("file name: '%s'\n", tok));
- for (p = tok ; *p && *p != ';' ; p++)
- ;
- if (*p == ';') *p = '\0';
- p = tok + strlen(tok) - 4;
- if (!strcmp(p, ".DIR")) *p = '\0';
- cur.name = xstrdup(tok);
- DEBUGP(("Name: '%s'\n", cur.name));
-
- /* If the name ends on .DIR or .DIR;#, it's a directory. We also set
- the file size to zero as the listing does tell us only the size in
- filesystem blocks - for an integrity check (when mirroring, for
- example) we would need the size in bytes. */
-
- if (! *p)
+ DEBUGP (("file name: '%s'\n", tok));
+
+ /* Stripping the version number on a VMS system would be wrong.
+ It may be foolish on a non-VMS system, too, but that's someone
+ else's problem. (Define PRESERVE_VMS_VERSIONS for proper
+ operation on other operating systems.)
+
+ 2005-02-23 SMS.
+ ODS5 extended file names may contain escaped semi-colons, so
+ the version number is identified as right-side decimal digits
+ led by a non-escaped semi-colon. It may be absent.
+ */
+
+#if (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS))
+ for (p = tok + strlen (tok); (--p > tok) && c_isdigit( *p); );
+ if ((*p == ';') && (*(p- 1) != '^'))
{
+ *p = '\0';
+ }
+#endif /* (!defined( __VMS) && !defined( PRESERVE_VMS_VERSIONS)) */
+
+ /* 2005-02-23 SMS.
+ Eliminate "^" escape characters from ODS5 extended file name.
+ (A caret is invalid in an ODS2 name, so this is always safe.)
+ */
+ eat_carets (tok);
+ DEBUGP (("file name-^: '%s'\n", tok));
+
+ /* Differentiate between a directory and any other file. A VMS
+ listing may not include file protections (permissions). Set a
+ default permissions value (according to the file type), which
+ may be overwritten later. Store directory names without the
+ ".DIR;1" file type and version number, as the plain name is
+ what will work in a CWD command.
+ */
+ len = strlen (tok);
+ if (!strncasecmp((tok + (len - 4)), ".DIR", 4))
+ {
+ *(tok+ (len - 4)) = '\0'; /* Discard ".DIR". */
cur.type = FT_DIRECTORY;
- cur.size = 0;
- DEBUGP(("Directory\n"));
+ cur.perms = VMS_DEFAULT_PROT_DIR;
+ DEBUGP (("Directory (nv)\n"));
+ }
+ else if (!strncasecmp ((tok + (len - 6)), ".DIR;1", 6))
+ {
+ *(tok+ (len - 6)) = '\0'; /* Discard ".DIR;1". */
+ cur.type = FT_DIRECTORY;
+ cur.perms = VMS_DEFAULT_PROT_DIR;
+ DEBUGP (("Directory (v)\n"));
}
else
{
cur.type = FT_PLAINFILE;
- DEBUGP(("File\n"));
+ cur.perms = VMS_DEFAULT_PROT_FILE;
+ DEBUGP (("File\n"));
}
+ cur.name = xstrdup (tok);
+ DEBUGP (("Name: '%s'\n", cur.name));
- cur.size = 0;
+ /* Null the date and time string. */
+ *date_str = '\0';
- /* Second column, if exists, or the first column of the next line
- contain file size in blocks. We will skip it. */
+ /* VMS lacks symbolic links. */
+ cur.linkto = NULL;
- tok = strtok(NULL, " ");
- if (tok == NULL)
- {
- DEBUGP(("Getting additional line\n"));
- xfree (line);
- line = read_whole_line (fp);
- if (!line)
- {
- DEBUGP(("empty line read, leaving listing parser\n"));
- break;
- }
- i = clean_line (line);
- if (!i)
- {
- DEBUGP(("confusing VMS listing item, leaving listing parser\n"));
- xfree (line);
- break;
- }
- tok = strtok(line, " ");
- }
- DEBUGP(("second token: '%s'\n", tok));
+ /* VMS reports file sizes in (512-byte) disk blocks, not bytes,
+ hence useless for an integrity check based on byte-count.
+ Set size to unknown.
+ */
+ cur.size = 0;
- /* Third/Second column: Date DD-MMM-YYYY. */
+ /* Get token 2, if any. A long name may force all other data onto
+ a second line. If needed, read the second line.
+ */
- tok = strtok(NULL, "-");
- if (tok == NULL) continue;
- DEBUGP(("day: '%s'\n",tok));
- day = atoi(tok);
- tok = strtok(NULL, "-");
- if (!tok)
- {
- /* If the server produces garbage like
- 'EA95_0PS.GZ;1 No privilege for attempted operation'
- the first strtok(NULL, "-") will return everything until the end
- of the line and only the next strtok() call will return NULL. */
- DEBUGP(("nonsense in VMS listing, skipping this line\n"));
- xfree (line);
- break;
- }
- for (i=0; i<12; i++) if (!strcmp(tok,months[i])) break;
- /* Uknown months are mapped to January */
- month = i % 12 ;
tok = strtok (NULL, " ");
- if (tok == NULL) continue;
- year = atoi (tok) - 1900;
- DEBUGP(("date parsed\n"));
+ if (tok == NULL)
+ {
+ DEBUGP (("Getting additional line.\n"));
+ i = getline (&line, &bufsize, fp);
+ if (i <= 0)
+ {
+ DEBUGP (("EOF. Leaving listing parser.\n"));
+ break;
+ }
- /* Fourth/Third column: Time hh:mm[:ss] */
- tok = strtok (NULL, " ");
- if (tok == NULL) continue;
- min = sec = 0;
- p = tok;
- hour = atoi (p);
- for (; *p && *p != ':'; ++p)
- ;
- if (*p)
- min = atoi (++p);
- for (; *p && *p != ':'; ++p)
- ;
- if (*p)
- sec = atoi (++p);
-
- DEBUGP(("YYYY/MM/DD HH:MM:SS - %d/%02d/%02d %02d:%02d:%02d\n",
- year+1900, month, day, hour, min, sec));
-
- /* Build the time-stamp (copy & paste from above) */
- timestruct.tm_sec = sec;
- timestruct.tm_min = min;
- timestruct.tm_hour = hour;
- timestruct.tm_mday = day;
- timestruct.tm_mon = month;
- timestruct.tm_year = year;
- timestruct.tm_wday = 0;
- timestruct.tm_yday = 0;
- timestruct.tm_isdst = -1;
- cur.tstamp = mktime (×truct); /* store the time-stamp */
+ /* Second line must begin with " ". Otherwise, it's a first
+ line (and we may be confused).
+ */
+ i = clean_line (line, i);
+ if (i <= 0)
+ {
+ /* Blank line. End of significant file listing. */
+ DEBUGP (("Blank line. Leaving listing parser.\n"));
+ break;
+ }
+ else if (line[0] != ' ')
+ {
+ DEBUGP (("Non-blank in column 1. Must be a new file name?\n"));
+ continue;
+ }
+ else
+ {
+ tok = strtok (line, " ");
+ if (tok == NULL)
+ {
+ /* Unexpected non-empty but apparently blank line. */
+ DEBUGP (("Null token. Leaving listing parser.\n"));
+ break;
+ }
+ }
+ }
- DEBUGP(("Timestamp: %ld\n", cur.tstamp));
+ /* Analyze tokens. (Order is not significant, except date must
+ precede time.)
- /* Skip the fifth column */
+ Size: ddd or ddd/ddd (where "ddd" is a decimal number)
+ Date: DD-MMM-YYYY
+ Time: HH:MM or HH:MM:SS or HH:MM:SS.CC
+ Owner: [user] or [user,group]
+ Protection: (ppp,ppp,ppp,ppp) (where "ppp" is "RWED" or some
+ subset thereof, for System, Owner, Group, World.
- tok = strtok(NULL, " ");
- if (tok == NULL) continue;
+ If permission is lacking, info may be replaced by the string:
+ "No privilege for attempted operation".
+ */
+ while (tok != NULL)
+ {
+ DEBUGP (("Token: >%s<: ", tok));
+
+ if ((strlen (tok) < 12) && (strchr( tok, '-') != NULL))
+ {
+ /* Date. */
+ DEBUGP (("Date.\n"));
+ strcpy( date_str, tok);
+ strcat( date_str, " ");
+ }
+ else if ((strlen (tok) < 12) && (strchr( tok, ':') != NULL))
+ {
+ /* Time. */
+ DEBUGP (("Time. "));
+ strncat( date_str,
+ tok,
+ (sizeof( date_str)- strlen (date_str) - 1));
+ DEBUGP (("Date time: >%s<\n", date_str));
+ }
+ else if (strchr (tok, '[') != NULL)
+ {
+ /* Owner. (Ignore.) */
+ DEBUGP (("Owner.\n"));
+ }
+ else if (strchr (tok, '(') != NULL)
+ {
+ /* Protections (permissions). */
+ perms = 0;
+ j = 0;
+ /*FIXME: Should not be using the variable like this. */
+ for (i = 0; i < (int) strlen(tok); i++)
+ {
+ switch (tok[ i])
+ {
+ case '(':
+ break;
+ case ')':
+ break;
+ case ',':
+ if (j == 0)
+ {
+ perms = 0;
+ j = 1;
+ }
+ else
+ {
+ perms <<= 3;
+ }
+ break;
+ case 'R':
+ perms |= 4;
+ break;
+ case 'W':
+ perms |= 2;
+ break;
+ case 'E':
+ perms |= 1;
+ break;
+ case 'D':
+ perms |= 2;
+ break;
+ }
+ }
+ cur.perms = perms;
+ DEBUGP (("Prot. perms = %0o.\n", cur.perms));
+ }
+ else
+ {
+ /* Nondescript. Probably size(s), probably in blocks.
+ Could be "No privilege ..." message. (Ignore.)
+ */
+ DEBUGP (("Ignored (size?).\n"));
+ }
- /* Sixth column: Permissions */
+ tok = strtok (NULL, " ");
+ }
- tok = strtok(NULL, ","); /* Skip the VMS-specific SYSTEM permissons */
- if (tok == NULL) continue;
- tok = strtok(NULL, ")");
- if (tok == NULL)
+ /* Tokens exhausted. Interpret the data, and fill in the
+ structure.
+ */
+ /* Fill tm timestruct according to date-time string. Fractional
+ seconds are ignored. Default to current time, if conversion
+ fails.
+ */
+ timenow = time( NULL);
+ 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 (timestruct);
+ /* Offset local time according to environment variable (seconds). */
+ if ((tok = getenv ( "WGET_TIMEZONE_DIFFERENTIAL")) != NULL)
{
- DEBUGP(("confusing VMS permissions, skipping line\n"));
- xfree (line);
- continue;
+ dt = atoi (tok);
+ DEBUGP (("Time differential = %d.\n", dt));
}
- /* Permissons have the format "RWED,RWED,RE" */
- cur.perms = vmsperms(tok);
- DEBUGP(("permissions: %s -> 0%o\n", tok, cur.perms));
+ else
+ dt = 0;
- cur.linkto = NULL;
+ if (dt >= 0)
+ timenow += dt;
+ else
+ timenow -= (-dt);
- /* And put everything into the linked list */
+ 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)
{
- l = dir = xnew (struct fileinfo);
+ l = dir = (struct fileinfo *)xmalloc (sizeof (struct fileinfo));
memcpy (l, &cur, sizeof (cur));
l->prev = l->next = NULL;
}
else
{
cur.prev = l;
- l->next = xnew (struct fileinfo);
+ l->next = (struct fileinfo *)xmalloc (sizeof (struct fileinfo));
l = l->next;
memcpy (l, &cur, sizeof (cur));
l->next = NULL;
}
- xfree (line);
+ i = getline (&line, &bufsize, fp);
+ if (i > 0)
+ {
+ i = clean_line (line, i);
+ if (i <= 0)
+ {
+ /* Blank line. End of significant file listing. */
+ break;
+ }
+ }
}
+ xfree (line);
fclose (fp);
return 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, " ");
projects / wget / blobdiff