merge

[plan9front.git] / sys / src / cmd / seconds.c

diff --git a/sys/src/cmd/seconds.c b/sys/src/cmd/seconds.c
index 440c145515ca4af1ff566ee48968874d2f316e81..c30330ede6da70867f5d0c953a3c9e10cace6f5d 100644 (file)
--- a/sys/src/cmd/seconds.c
+++ b/sys/src/cmd/seconds.c
@@ -1,5 +1,6 @@
 #include <u.h>
 #include <libc.h>
+#include <ctype.h>
 
 char *knownfmt[] = {
        /* asctime */
@@ -57,11 +58,21 @@ char *zonefmt[] = {
        nil,
 };
 
+static int
+nojunk(char *p)
+{
+       while(isspace(*p))
+               p++;
+       if(*p == '\0')
+               return 1;
+       werrstr("trailing junk");
+       return 0;
+}
 
 static void
 usage(void)
 {
-       fprint(2, "usage: %s [-f fmt] date-time/win m...\n", argv0);
+       fprint(2, "usage: %s [-f fmt] date-time...\n", argv0);
        exits("usage");
 }
 
@@ -89,24 +100,21 @@ main(int argc, char **argv)
                sysfatal("bad local time: %r");
        for(i = 0; i < argc; i++){
                if(fmt != nil){
-                       if(tmparse(&tm, fmt, argv[i], tz, &ep) != nil && *ep == 0)
+                       if(tmparse(&tm, fmt, argv[i], tz, &ep) && nojunk(ep))
                                goto Found;
                }else{
                        for(f = knownfmt; *f != nil; f++)
-                               if(tmparse(&tm, *f, argv[i], tz, &ep) != nil && *ep == 0)
+                               if(tmparse(&tm, *f, argv[i], tz, &ep) != nil && nojunk(ep))
                                        goto Found;
                        for(df = datefmt; *df; df++)
                        for(tf = timefmt; *tf; tf++)
                        for(zf = zonefmt; *zf; zf++){
                                snprint(buf, sizeof(buf), "%s%s%s", *df, *tf, *zf);
-                               if(tmparse(&tm, buf, argv[i], tz, &ep) != nil && *ep == 0)
+                               if(tmparse(&tm, buf, argv[i], tz, &ep) != nil && nojunk(ep))
                                        goto Found;
                        }
                }
-               if(*ep == 0)
-                       sysfatal("tmparse: %r");
-               else
-                       sysfatal("tmparse: trailing junk");
+               sysfatal("tmparse: %r");
 Found:
                print("%lld\n", tmnorm(&tm));
        }