system_cmds-735.20.1.tar.gz

[apple/system_cmds.git] / at.tproj / parsetime.c

diff --git a/at.tproj/parsetime.c b/at.tproj/parsetime.c
index d90a309930770824c444704eaf4a857b82d95656..3aeea6ce2dd5916449d330955d340d08baf8a708 100644 (file)
--- a/at.tproj/parsetime.c
+++ b/at.tproj/parsetime.c
@@ -1,4 +1,4 @@
-/* 
+/*

  *  parsetime.c - parse time for at(1)
  *  Copyright (C) 1993, 1994  Thomas Koenig
  *
  *  parsetime.c - parse time for at(1)
  *  Copyright (C) 1993, 1994  Thomas Koenig
  *


@@ -70,7 +70,7 @@ enum {        /* symbols */
     JAN, FEB, MAR, APR, MAY, JUN,
     JUL, AUG, SEP, OCT, NOV, DEC,
     SUN, MON, TUE, WED, THU, FRI, SAT,
     JAN, FEB, MAR, APR, MAY, JUN,
     JUL, AUG, SEP, OCT, NOV, DEC,
     SUN, MON, TUE, WED, THU, FRI, SAT,

-    UTC
+    UTC, NEXT

     };
 
 /* parse translation table - table driven parsers can be your FRIEND!
     };
 
 /* parse translation table - table driven parsers can be your FRIEND!


@@ -140,6 +140,7 @@ static const struct {
     { "saturday", SAT, 0 },
     { "sat", SAT, 0 },
     { "utc", UTC, 0 },
     { "saturday", SAT, 0 },
     { "sat", SAT, 0 },
     { "utc", UTC, 0 },

+    { "next", NEXT, 0 },

 } ;
 
 /* File scope variables */
 } ;
 
 /* File scope variables */


@@ -171,7 +172,7 @@ parse_token(char *arg)
        }
 
     /* not special - must be some random id */
        }
 
     /* not special - must be some random id */

-    return ID;
+    return sc_tokid = ID;

 } /* parse_token */
 
 
 } /* parse_token */
 
 


@@ -271,7 +272,7 @@ plonk(int tok)
 } /* plonk */
 
 
 } /* plonk */
 
 

-/* 
+/*

  * expect() gets a token and dies most horribly if it's not the token we want
  */
 static void
  * expect() gets a token and dies most horribly if it's not the token we want
  */
 static void


@@ -319,7 +320,7 @@ plus(struct tm *tm)
            tm->tm_min += delay;
            break;
     default:
            tm->tm_min += delay;
            break;
     default:

-           plonk(sc_tokid);
+           plonk(sc_tokid);

            break;
     }
 
            break;
     }
 


@@ -332,6 +333,50 @@ plus(struct tm *tm)
 
 } /* plus */
 
 
 } /* plus */
 

+/*
+ *  at [NOW] NEXT [MINUTES|HOURS|DAYS|WEEKS|MONTHS|YEARS]
+ */
+static void
+next(struct tm *tm)
+{
+    switch (token()) {
+        case YEARS:
+            tm->tm_year++;
+            break;
+
+        case MONTHS:
+            tm->tm_mon++;
+            break;
+
+        case WEEKS:
+            tm->tm_mday += 7;
+            break;
+
+        case DAYS:
+            tm->tm_mday++;
+            break;
+
+        case HOURS:
+            tm->tm_hour++;
+            break;
+
+        case MINUTES:
+            tm->tm_min++;
+            break;
+
+        default:
+           plonk(sc_tokid);
+            break;
+    }
+
+    if (sc_tokplur) {
+        warnx("pluralization is wrong");
+    }
+    tm->tm_isdst = -1;
+    if (mktime(tm) < 0) {
+        plonk(sc_tokid);
+    }
+} /* next */

 
 /*
  * tod() computes the time of day
 
 /*
  * tod() computes the time of day


@@ -350,51 +395,51 @@ tod(struct tm *tm)
      * a HHMM time, otherwise it's HH DOT MM time
      */
     if (token() == DOT) {
      * a HHMM time, otherwise it's HH DOT MM time
      */
     if (token() == DOT) {

-       expect(NUMBER);
-       minute = atoi(sc_token);
-       if (minute > 59)
-           panic("garbled time");
-       token();
+        expect(NUMBER);
+        minute = atoi(sc_token);
+        if (minute > 59)
+            panic("garbled time");
+        token();

     }
     else if (tlen == 4) {
     }
     else if (tlen == 4) {

-       minute = hour%100;
-       if (minute > 59)
-           panic("garbled time");
-       hour = hour/100;
+        minute = hour%100;
+        if (minute > 59)
+            panic("garbled time");
+        hour = hour/100;

     }
 
     /* check if an AM or PM specifier was given
      */
     switch (sc_tokid) {
     }
 
     /* check if an AM or PM specifier was given
      */
     switch (sc_tokid) {

-    case AM:
-    case PM:
-       if (hour > 12)
-           panic("garbled time");
-
-       if (sc_tokid == PM) {
-           if (hour != 12)     /* 12:xx PM is 12:xx, not 24:xx */
-               hour += 12;
-       } else {
-           if (hour == 12)     /* 12:xx AM is 00:xx, not 12:xx */
-               hour = 0;
-       }
-       if (UTC != token())
-            break;             /* else fallthrough */
-
-    case UTC:
-        hour += tm->tm_gmtoff/(60*60);
-         while (hour < 0)
-            hour += 24;
-        minute += (tm->tm_gmtoff/60);
-        while (minute < 0)
-            minute += 60;
-        tm->tm_gmtoff = 0;
-        token();
-        break;
-    default:
-       if (hour > 23)
-           panic("garbled time");
-       break;
+        case AM:
+        case PM:
+            if (hour > 12)
+                panic("garbled time");
+
+            if (sc_tokid == PM) {
+                if (hour != 12)        /* 12:xx PM is 12:xx, not 24:xx */
+                    hour += 12;
+            } else {
+                if (hour == 12)        /* 12:xx AM is 00:xx, not 12:xx */
+                    hour = 0;
+            }
+            if (UTC != token())
+                break;         /* else fallthrough */
+
+        case UTC:
+            hour += tm->tm_gmtoff/(60*60);
+            while (hour < 0)
+                hour += 24;
+            minute += (tm->tm_gmtoff/60);
+            while (minute < 0)
+                minute += 60;
+            tm->tm_gmtoff = 0;
+            token();
+            break;
+        default:
+            if (hour > 23)
+                panic("garbled time");
+            break;

     }
 
     /* if we specify an absolute time, we don't want to bump the day even
     }
 
     /* if we specify an absolute time, we don't want to bump the day even


@@ -402,17 +447,17 @@ tod(struct tm *tm)
      * a relative offset, it's okay to bump things
      * If minutes are the same assume tomorrow was meant
      */
      * a relative offset, it's okay to bump things
      * If minutes are the same assume tomorrow was meant
      */

-    if ((sc_tokid == EOF || sc_tokid == PLUS) && 
-       ((tm->tm_hour > hour) || ((tm->tm_hour == hour) && (tm->tm_min >= minute)))) {
-       tm->tm_mday++;
-       tm->tm_wday++;
+    if ((sc_tokid == EOF || sc_tokid == PLUS) &&
+        ((tm->tm_hour > hour) || ((tm->tm_hour == hour) && (tm->tm_min >= minute)))) {
+        tm->tm_mday++;
+        tm->tm_wday++;

     }
 
     tm->tm_hour = hour;
     tm->tm_min = minute;
     if (tm->tm_hour == 24) {
     }
 
     tm->tm_hour = hour;
     tm->tm_min = minute;
     if (tm->tm_hour == 24) {

-       tm->tm_hour = 0;
-       tm->tm_mday++;
+        tm->tm_hour = 0;
+        tm->tm_mday++;

     }
 } /* tod */
 
     }
 } /* tod */
 


@@ -421,7 +466,7 @@ tod(struct tm *tm)
  * assign_date() assigns a date, wrapping to next year if needed
  */
 static void
  * assign_date() assigns a date, wrapping to next year if needed
  */
 static void

-assign_date(struct tm *tm, long mday, long mon, long year)
+assign_date(struct tm *tm, int mday, int mon, int year)

 {
    /*
     * Convert year into tm_year format (year - 1900).
 {
    /*
     * Convert year into tm_year format (year - 1900).


@@ -459,20 +504,21 @@ assign_date(struct tm *tm, long mday, long mon, long year)
 } /* assign_date */
 
 
 } /* assign_date */
 
 

-/* 
+/*

  * month() picks apart a month specification
  *
  *  /[<month> NUMBER [NUMBER]]           \
  *  |[TOMORROW]                          |
  *  |[DAY OF WEEK]                       |
  *  |NUMBER [SLASH NUMBER [SLASH NUMBER]]|
  * month() picks apart a month specification
  *
  *  /[<month> NUMBER [NUMBER]]           \
  *  |[TOMORROW]                          |
  *  |[DAY OF WEEK]                       |
  *  |NUMBER [SLASH NUMBER [SLASH NUMBER]]|

+ *  |NEXT MINUTES|HOURS|DAYS|WEEKS|MONTHS|YEARS|

  *  \PLUS NUMBER MINUTES|HOURS|DAYS|WEEKS/
  */
 static void
 month(struct tm *tm)
 {
  *  \PLUS NUMBER MINUTES|HOURS|DAYS|WEEKS/
  */
 static void
 month(struct tm *tm)
 {

-    long year= (-1);
-    long mday = 0, wday, mon;
+    int year= (-1);
+    int mday = 0, wday, mon;

     int tlen;
 
     switch (sc_tokid) {
     int tlen;
 
     switch (sc_tokid) {


@@ -480,6 +526,10 @@ month(struct tm *tm)
            plus(tm);
            break;
 
            plus(tm);
            break;
 

+    case NEXT:
+           next(tm);
+           break;
+

     case TOMORROW:
            /* do something tomorrow */
            tm->tm_mday ++;
     case TOMORROW:
            /* do something tomorrow */
            tm->tm_mday ++;


@@ -494,10 +544,10 @@ month(struct tm *tm)
             */
            mon = (sc_tokid-JAN);
            expect(NUMBER);
             */
            mon = (sc_tokid-JAN);
            expect(NUMBER);

-           mday = atol(sc_token);
+           mday = atoi(sc_token);

            if (token() == COMMA) {
                if (token() == NUMBER) {
            if (token() == COMMA) {
                if (token() == NUMBER) {

-                   year = atol(sc_token);
+                   year = atoi(sc_token);

                    token();
                }
            }
                    token();
                }
            }


@@ -530,8 +580,8 @@ month(struct tm *tm)
     case NUMBER:
            /* get numeric MMDDYY, mm/dd/yy, or dd.mm.yy
             */
     case NUMBER:
            /* get numeric MMDDYY, mm/dd/yy, or dd.mm.yy
             */

-           tlen = strlen(sc_token);
-           mon = atol(sc_token);
+           tlen = (int)strlen(sc_token);
+           mon = atoi(sc_token);

            token();
 
            if (sc_tokid == SLASH || sc_tokid == DOT) {
            token();
 
            if (sc_tokid == SLASH || sc_tokid == DOT) {


@@ -539,10 +589,10 @@ month(struct tm *tm)
 
                sep = sc_tokid;
                expect(NUMBER);
 
                sep = sc_tokid;
                expect(NUMBER);

-               mday = atol(sc_token);
+               mday = atoi(sc_token);

                if (token() == sep) {
                    expect(NUMBER);
                if (token() == sep) {
                    expect(NUMBER);

-                   year = atol(sc_token);
+                   year = atoi(sc_token);

                    token();
                }
 
                    token();
                }
 


@@ -575,6 +625,13 @@ month(struct tm *tm)
 
            assign_date(tm, mday, mon, year);
            break;
 
            assign_date(tm, mday, mon, year);
            break;

+
+    case EOF:
+            break;
+
+    default:
+           plonk(sc_tokid);
+           break;

     } /* case */
 } /* month */
 
     } /* case */
 } /* month */
 


@@ -584,9 +641,9 @@ month(struct tm *tm)
 time_t
 parsetime(int argc, char **argv)
 {
 time_t
 parsetime(int argc, char **argv)
 {

-/* Do the argument parsing, die if necessary, and return the time the job
- * should be run.
- */
+    /* Do the argument parsing, die if necessary, and return the time the job
+     * should be run.
+     */

     time_t nowtimer, runtimer;
     struct tm nowtime, runtime;
     int hr = 0;
     time_t nowtimer, runtimer;
     struct tm nowtime, runtime;
     int hr = 0;


@@ -600,49 +657,67 @@ parsetime(int argc, char **argv)
     runtime.tm_isdst = 0;
 
     if (argc <= optind)
     runtime.tm_isdst = 0;
 
     if (argc <= optind)

-       usage();
+        usage();

 
     init_scanner(argc-optind, argv+optind);
 
     switch (token()) {
 
     init_scanner(argc-optind, argv+optind);
 
     switch (token()) {

-    case NOW:  
-           if (scc < 1) {
-               return nowtimer;
-           }
-           /* now is optional prefix for PLUS tree */
-           expect(PLUS);
-    case PLUS:
-           plus(&runtime);
-           break;
-
-    case NUMBER:
-           tod(&runtime);
-           month(&runtime);
-           break;
-
-           /* evil coding for TEATIME|NOON|MIDNIGHT - we've initialised
-            * hr to zero up above, then fall into this case in such a
-            * way so we add +12 +4 hours to it for teatime, +12 hours
-            * to it for noon, and nothing at all for midnight, then
-            * set our runtime to that hour before leaping into the
-            * month scanner
-            */
-    case TEATIME:
-           hr += 4;
-    case NOON:
-           hr += 12;
-    case MIDNIGHT:
-           if (runtime.tm_hour >= hr) {
-               runtime.tm_mday++;
-               runtime.tm_wday++;
-           }
-           runtime.tm_hour = hr;
-           runtime.tm_min = 0;
-           token();
-           /* FALLTHROUGH to month setting */
-    default:
-           month(&runtime);
-           break;
+        case NOW:
+            if (scc < 1) {
+                return nowtimer;
+            }
+            /* now is optional prefix for PLUS/NEXT tree */
+            switch (token()) {
+                case PLUS:
+                    plus(&runtime);
+                    break;
+
+                case NEXT:
+                    next(&runtime);
+                    break;
+
+                default:
+                    plonk(sc_token);
+                    break;
+            }
+            break;
+
+        case PLUS:
+            plus(&runtime);
+            break;
+
+        case NEXT:
+            next(&runtime);
+            break;
+
+        case NUMBER:
+            tod(&runtime);
+            month(&runtime);
+            break;
+
+            /* evil coding for TEATIME|NOON|MIDNIGHT - we've initialised
+             * hr to zero up above, then fall into this case in such a
+             * way so we add +12 +4 hours to it for teatime, +12 hours
+             * to it for noon, and nothing at all for midnight, then
+             * set our runtime to that hour before leaping into the
+             * month scanner
+             */
+        case TEATIME:
+            hr += 4;
+        case NOON:
+            hr += 12;
+        case MIDNIGHT:
+            if (runtime.tm_hour >= hr) {
+                runtime.tm_mday++;
+                runtime.tm_wday++;
+            }
+            runtime.tm_hour = hr;
+            runtime.tm_min = 0;
+            token();
+            /* FALLTHROUGH to month setting */
+        default:
+            month(&runtime);
+            break;

     } /* ugly case statement */
     expect(EOF);
 
     } /* ugly case statement */
     expect(EOF);
 


@@ -652,10 +727,10 @@ parsetime(int argc, char **argv)
     runtimer = mktime(&runtime);
 
     if (runtimer < 0)
     runtimer = mktime(&runtime);
 
     if (runtimer < 0)

-       panic("garbled time");
+        panic("garbled time");

 
     if (nowtimer > runtimer)
 
     if (nowtimer > runtimer)

-       panic("trying to travel back in time");
+        panic("trying to travel back in time");

 
     return runtimer;
 } /* parsetime */
 
     return runtimer;
 } /* parsetime */