[svn] Make seconds optional in VMS time specification.

Published in <sxs8zl62u9p.fsf@florida.arsdigita.de>.
This commit is contained in:
hniksic 2001-04-12 05:22:50 -07:00
parent 7d7f01eaa9
commit a98337f827
2 changed files with 17 additions and 7 deletions

View File

@ -1,3 +1,8 @@
2001-04-12 Hrvoje Niksic <hniksic@arsdigita.com>
* ftp-ls.c (ftp_parse_vms_ls): Make seconds optional in time
specification.
2001-04-11 Hrvoje Niksic <hniksic@arsdigita.com> 2001-04-11 Hrvoje Niksic <hniksic@arsdigita.com>
* url.c (parseurl): Don't strip trailing slash when u->dir is "/" * url.c (parseurl): Don't strip trailing slash when u->dir is "/"

View File

@ -584,6 +584,7 @@ ftp_parse_vms_ls (const char *file)
/* Line loop to end of file: */ /* Line loop to end of file: */
while ((line = read_whole_line (fp))) while ((line = read_whole_line (fp)))
{ {
char *p;
i = clean_line (line); i = clean_line (line);
if (!i) break; if (!i) break;
@ -670,13 +671,17 @@ ftp_parse_vms_ls (const char *file)
year = atoi(tok)-1900; year = atoi(tok)-1900;
DEBUGP(("date parsed\n")); DEBUGP(("date parsed\n"));
/* Fourth/Third column: Time hh:mm:ss */ /* Fourth/Third column: Time hh:mm[:ss] */
tok = strtok(NULL, ":"); tok = strtok (NULL, " ");
hour = atoi(tok); hour = min = sec = 0;
tok = strtok(NULL, ":"); p = tok;
min = atoi(tok); hour = atoi (p);
tok = strtok(NULL, " "); for (; *p && *p != ':'; ++p);
sec = atoi(tok); 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", DEBUGP(("YYYY/MM/DD HH:MM:SS - %d/%02d/%02d %02d:%02d:%02d\n",
year+1900, month, day, hour, min, sec)); year+1900, month, day, hour, min, sec));