Mercurial > gftp.yaz
changeset 479:11ab311ccb67
2004-6-6 Brian Masney <masneyb@gftp.org>
* lib/protocols.c (parse_time) - if there is an error parsing the
time format, don't return a fatal error
| author | masneyb |
|---|---|
| date | Mon, 07 Jun 2004 01:21:13 +0000 |
| parents | 97fd5eb34be0 |
| children | 18c6d173f5f2 |
| files | ChangeLog lib/protocols.c |
| diffstat | 2 files changed, 12 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jun 06 15:12:35 2004 +0000 +++ b/ChangeLog Mon Jun 07 01:21:13 2004 +0000 @@ -1,4 +1,7 @@ 2004-6-6 Brian Masney <masneyb@gftp.org> + * lib/protocols.c (parse_time) - if there is an error parsing the + time format, don't return a fatal error + * acinclude.m4 configure.in - added AC_TYPE_INTPTR_T that will define intptr_t if it does not exist on the system @@ -2484,7 +2487,7 @@ * cvsclean - added this script - * *.[ch] - added $Id: ChangeLog,v 1.266 2004/06/06 15:12:35 masneyb Exp $ tags + * *.[ch] - added $Id: ChangeLog,v 1.267 2004/06/07 01:21:13 masneyb Exp $ tags * debian/* - updated files from Debian maintainer
--- a/lib/protocols.c Sun Jun 06 15:12:35 2004 +0000 +++ b/lib/protocols.c Mon Jun 07 01:21:13 2004 +0000 @@ -1305,8 +1305,7 @@ fle->size = gftp_parse_file_size (curpos) * 512; /* Is this correct? */ curpos = goto_next_token (curpos); - if ((fle->datetime = parse_time (curpos, &curpos)) == 0) - return (GFTP_EFATAL); + fle->datetime = parse_time (curpos, &curpos); curpos = goto_next_token (curpos); @@ -1349,9 +1348,11 @@ if (curpos == NULL) return (GFTP_EFATAL); - if ((fle->datetime = parse_time (curpos, &curpos)) == 0) + fle->datetime = parse_time (curpos, &curpos); + + curpos = goto_next_token (curpos); + if (curpos == NULL) return (GFTP_EFATAL); - curpos = goto_next_token (curpos); curpos = goto_next_token (curpos + 1); if (curpos == NULL) @@ -1538,8 +1539,7 @@ while (*startpos == ' ') startpos++; - if ((fle->datetime = parse_time (startpos, &startpos)) == 0) - return (GFTP_EFATAL); + fle->datetime = parse_time (startpos, &startpos); /* Skip the blanks till we get to the next entry */ startpos = goto_next_token (startpos); @@ -1569,8 +1569,7 @@ char *startpos; startpos = str; - if ((fle->datetime = parse_time (startpos, &startpos)) == 0) - return (GFTP_EFATAL); + fle->datetime = parse_time (startpos, &startpos); fle->user = g_strdup (_("unknown")); fle->group = g_strdup (_("unknown")); @@ -1612,8 +1611,7 @@ fle->size = gftp_parse_file_size (startpos); startpos = goto_next_token (startpos); - if ((fle->datetime = parse_time (startpos, &startpos)) == 0) - return (GFTP_EFATAL); + fle->datetime = parse_time (startpos, &startpos); startpos = goto_next_token (startpos); fle->file = g_strdup (startpos);