[src/trunk]: src/usr.bin/ftp roll back to using sscanf() instead of strptime(...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3cf239ce71ec
branches:  trunk
changeset: 481339:3cf239ce71ec
user:      lukem <lukem%NetBSD.org@localhost>
date:      Wed Jan 26 11:31:55 2000 +0000

description:
roll back to using sscanf() instead of strptime() to parse `yyyymmddhhmmss'
strings, since the latter technically can't parse dates without non
alphanumerics between the elements (even though netbsd's strptime() copes).

diffstat:

 usr.bin/ftp/util.c |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 7d284b946a60 -r 3cf239ce71ec usr.bin/ftp/util.c
--- a/usr.bin/ftp/util.c        Wed Jan 26 10:43:36 2000 +0000
+++ b/usr.bin/ftp/util.c        Wed Jan 26 11:31:55 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.89 2000/01/26 10:15:40 lukem Exp $  */
+/*     $NetBSD: util.c,v 1.90 2000/01/26 11:31:55 lukem Exp $  */
 
 /*-
  * Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: util.c,v 1.89 2000/01/26 10:15:40 lukem Exp $");
+__RCSID("$NetBSD: util.c,v 1.90 2000/01/26 11:31:55 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -646,6 +646,7 @@
        if (command("MDTM %s", file) == COMPLETE) {
                struct tm timebuf;
                char *timestr, *frac;
+               int yy, mo, day, hour, min, sec;
 
                /*
                 * time-val = 14DIGIT [ "." 1*DIGIT ]
@@ -678,11 +679,20 @@
                        fprintf(ttyout, "Converted to `%s'\n", timestr);
                }
                if (strlen(timestr) != 14 ||
-                   strptime(timestr, "%Y %m %d %H %M %S", &timebuf) == NULL) {
+                   sscanf(timestr, "%04d%02d%02d%02d%02d%02d",
+                       &yy, &mo, &day, &hour, &min, &sec) != 6) {
  bad_parse_time:
-                       fprintf(ttyout, "Can't parse time %s.\n", timestr);
+                       fprintf(ttyout, "Can't parse time `%s'.\n", timestr);
                        goto cleanup_parse_time;
                }
+               memset(&timebuf, 0, sizeof(timebuf));
+               timebuf.tm_sec = sec;
+               timebuf.tm_min = min;
+               timebuf.tm_hour = hour;
+               timebuf.tm_mday = day;
+               timebuf.tm_mon = mo - 1;
+               timebuf.tm_year = yy - TM_YEAR_BASE; 
+               timebuf.tm_isdst = -1;
                rtime = timegm(&timebuf);
                if (rtime == -1) {
                        if (noisy || debug != 0)