merge

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

diff --git a/sys/src/cmd/seconds.c b/sys/src/cmd/seconds.c
index 2c5fc333372216ae414ff49be211d8a0967915f3..c30330ede6da70867f5d0c953a3c9e10cace6f5d 100644 (file)
--- a/sys/src/cmd/seconds.c
+++ b/sys/src/cmd/seconds.c
@@ -1,49 +1,90 @@
 #include <u.h>
 #include <libc.h>
+#include <ctype.h>
 
-/*
- * seconds absolute_date ... - convert absolute_date to seconds since epoch
- */
-char *formats[] = {
+char *knownfmt[] = {
        /* asctime */
-       "W MMM DD hh:mm:ss ?Z YYYY",
+       "WW MMM DD hh:mm:ss ?Z YYYY",
+       /* RFC3339 */
+       "YYYY-MM-DD[T]hh:mm:ss[Z]?Z",
+       "YYYY-MM-DD[T]hh:mm:ss[Z]?Z",
+       "YYYY-MM-DD[T]hh:mm:ss ?Z",
+       "YYYY-MM-DD[T]hh:mm:ss?Z",
+       nil,
+};
+
+char *datefmt[] = {
        /* RFC5322 */
-       "?W ?DD ?MMM ?YYYY hh:mm:ss ?Z",
-       "?W, DD-?MM-YY hh:mm:ss ?Z",
-       /* RFC822/RFC8222 */
-       "DD MMM YY hh:mm ZZZ",
-       "DD MMM YY hh:mm Z",
+       "?W ?DD ?MMM ?YYYY",
+       "?W, DD-?MM-YY",
+       /* RFC822/RFC2822 */
+       "DD MMM YYYY",
+       "DD MMM YY",
        /* RFC850 */
-       "W, DD-MMM-YY hh:mm:ss MST",
+       "WW, DD-MMM-YY",
        /* RFC1123 */
-       "WW, DD MMM YYYY hh:mm:ss ZZZ",
-       /* RFC1123Z */
-       "WW, DD MMM YYYY hh:mm:ss ZZ",
-       /* RFC3339 */
-       "YYYY-MM-DD[T]hh:mm:ss[Z]ZZ",
-       "YYYY-MM-DD[T]hh:mm:ss[Z]Z",
-       "YYYY-MM-DD[T]hh:mm:ss ZZ",
-       "YYYY-MM-DD[T]hh:mm:ss Z",
+       "WWW, DD MMM YYYY",
        /* RFC 3339 and human-readable variants */
-       "YYYY-MM-DD hh:mm:ss",
-       "YYYY-MM-DD hh:mm:ss ?Z",
-       "YYYY-MM-DD [@] hh:mm:ss",
-       "YYYY-MM-DD [@] hh:mm:ss ?Z",
+       "YYYY-MM-DD",
+       "YYYY-MM-DD [@] ",
+       /* random formats */
+       "?W ?MMM ?DD ?YYYY",
+       "?MMM ?DD ?YYYY",
+       "?DD ?MM ?YYYY",
+       "MMM ?DD ?YYYY",
+       "YYYY ?MM ?DD",
+       "YYYY ?DD ?MM",
+       "YYYY/MM?/DD?",
+       "MMM YYYY ?DD",
+       "?DD YYYY MMM",
+       "MM/DD/YYYY",
        nil
 };
 
+char *timefmt[] = {
+       " hh:mm:ss",
+       " hh:mm",
+       " hh",
+       " hh:mm:ss ?A",
+       " hh:mm ?A",
+       " hh ?A",
+       "",
+       nil,
+};
+
+char *zonefmt[] = {
+       " ?Z",
+       "",
+       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 date-time ...\n", argv0);
+       fprint(2, "usage: %s [-f fmt] date-time...\n", argv0);
        exits("usage");
 }
 
+/*
+ * seconds absolute_date ... - convert absolute_date to seconds since epoch
+ */
 void
 main(int argc, char **argv)
 {
+       char **f, **df, **tf, **zf, *fmt, *ep, buf[256];
+       Tzone *tz;
        Tm tm;
-       char **f, *fmt;
        int i;
 
        fmt = nil;
@@ -55,18 +96,27 @@ main(int argc, char **argv)
                usage();
        }ARGEND;
 
+       if((tz = tzload("local")) == nil)
+               sysfatal("bad local time: %r");
        for(i = 0; i < argc; i++){
                if(fmt != nil){
-                       if(tmparse(&tm, fmt, argv[i], nil) != nil)
+                       if(tmparse(&tm, fmt, argv[i], tz, &ep) && nojunk(ep))
                                goto Found;
                }else{
-                       for(f = formats; *f != nil; f++)
-                               if(tmparse(&tm, *f, argv[i], nil) != nil)
+                       for(f = knownfmt; *f != nil; f++)
+                               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 && nojunk(ep))
                                        goto Found;
+                       }
                }
                sysfatal("tmparse: %r");
 Found:
-               print("%lld\n", tm.abs);
+               print("%lld\n", tmnorm(&tm));
        }
        exits(nil);
 }