find_next: take leap year into account (e.g. when using dayofyear)

[user/henk/code/snooze.git] / snooze.c

diff --git a/snooze.c b/snooze.c
index ce6d93d4d0a368ae8448f0a2b41cf8ff56f0cab7..f37c42ac2a386453b9db812c59e97aa8d0dea0ed 100644 (file)
--- a/snooze.c
+++ b/snooze.c
@@ -1,16 +1,11 @@
 /*
  * snooze - run a command at a particular time
  *
- * To the extent possible under law,
- * Christian Neukirchen <chneukirchen@gmail.com>
+ * To the extent possible under law, Leah Neukirchen <leah@vuxu.org>
  * has waived all copyright and related or neighboring rights to this work.
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-/*
-##% gcc -Os -Wall -g -o $STEM $FILE -Wextra -Wwrite-strings
-*/
-
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -31,7 +26,7 @@ static long slack = 60;
 #define SLEEP_PHASE 300
 static int nflag, vflag;
 
-static int timewait = 1;
+static int timewait = -1;
 static int randdelay = 0;
 static char *timefile;
 
@@ -64,6 +59,34 @@ parse_int(char **s, size_t minn, size_t maxn)
        return n;
 }
 
+static long
+parse_dur(char *s)
+{
+       long n;
+       char *end;
+
+       errno = 0;
+       n = strtol(s, &end, 10);
+       if (errno) {
+               perror("strtol");
+               exit(1);
+       }
+       if (n < 0) {
+               fprintf(stderr, "negative duration\n");
+               exit(1);
+       }
+       switch (*end) {
+       case 'm': n *= 60; break;
+       case 'h': n *= 60*60; break;
+       case 'd': n *= 24*60*60; break;
+       case 0: break;
+       default:
+               fprintf(stderr, "junk after duration: %s\n", end);
+               exit(1);
+       }
+       return n;
+}
+
 static int
 parse(char *expr, char *buf, long bufsiz, int offset)
 {
@@ -119,7 +142,7 @@ char weekday[8] = {0};
 char dayofmonth[31] = {0};
 char month[12] = {0};
 char dayofyear[366] = {0};
-char weekofyear[53] = {0};
+char weekofyear[54] = {0};
 char hour[24] = {0};
 char minute[60] = {0};
 char second[61] = {0};
@@ -162,7 +185,7 @@ next_day:
                tm->tm_hour = 0;
 
                t = mktime(tm);
-               if (t > from+(365*24*60*60))  // no result within a year
+               if (t > from+(366*24*60*60))  // no result within a year
                        return -1;
        }
 
@@ -200,7 +223,9 @@ isotime(const struct tm *tm)
 int main(int argc, char *argv[])
 {
        int c;
+       time_t t;
        time_t now = time(0);
+       time_t last = 0;
 
        /* default: every day at 00:00:00 */
        memset(weekday, '*', sizeof weekday);
@@ -212,7 +237,7 @@ int main(int argc, char *argv[])
        minute[0] = '*';
        second[0] = '*';
 
-       while ((c = getopt(argc, argv, "D:W:H:M:S:T:R:d:m:ns:t:vw:")) != -1)
+       while ((c = getopt(argc, argv, "+D:W:H:M:S:T:R:d:m:ns:t:vw:")) != -1)
                 switch(c) {
                case 'D': parse(optarg, dayofyear, sizeof dayofyear, -1); break;
                case 'W': parse(optarg, weekofyear, sizeof weekofyear, -1); break;
@@ -228,10 +253,10 @@ int main(int argc, char *argv[])
                        break;
                case 'n': nflag++; break;
                case 'v': vflag++; break;
-               case 's': slack = atoi(optarg); break;
-               case 'T': timewait = atoi(optarg); break;
+               case 's': slack = parse_dur(optarg); break;
+               case 'T': timewait = parse_dur(optarg); break;
                case 't': timefile = optarg; break;
-               case 'R': randdelay = atoi(optarg); break;
+               case 'R': randdelay = parse_dur(optarg); break;
                default:
                         fprintf(stderr, "Usage: %s [-nv] [-t timefile] [-T timewait] [-R randdelay] [-s slack]\n"
                            "  [-d mday] [-m mon] [-w wday] [-D yday] [-W yweek] [-H hour] [-M min] [-S sec] COMMAND...\n"
@@ -248,8 +273,16 @@ int main(int argc, char *argv[])
                if (stat(timefile, &st) < 0) {
                        if (errno != ENOENT)
                                perror("stat");
+                       t = start - slack - 1 - timewait;
                } else {
-                       if (st.st_mtime + timewait > start)
+                       t = st.st_mtime + 1;
+               }
+               if (timewait == -1) {
+                       while (t < start - slack)
+                               t = find_next(t + 1);
+                       start = t;
+               } else {
+                       if (t + timewait > start)
                                start = st.st_mtime + timewait;
                }
        }
@@ -271,7 +304,7 @@ int main(int argc, char *argv[])
                start += delay;
        }
 
-       time_t t = find_next(start);
+       t = find_next(start);
        if (t < 0) {
                fprintf(stderr, "no satisfying date found within a year.\n");
                exit(2);
@@ -281,9 +314,22 @@ int main(int argc, char *argv[])
                /* dry-run, just output the next 5 dates. */
                int i;
                for (i = 0; i < 5; i++) {
-                       if (t > 0)
-                               printf("%s\n", isotime(localtime(&t)));
+                       char weekstr[4];
+                       struct tm *tm = localtime(&t);
+                       strftime(weekstr, sizeof weekstr, "%a", tm);
+                       printf("%s %s %2ldd%3ldh%3ldm%3lds\n",
+                           isotime(tm),
+                           weekstr,
+                           ((t - now) / (60*60*24)),
+                           ((t - now) / (60*60)) % 24,
+                           ((t - now) / 60) % 60,
+                           (t - now) % 60);
                        t = find_next(t + 1);
+                       if (t < 0) {
+                               fprintf(stderr,
+                                   "no satisfying date found within a year.\n");
+                               exit(2);
+                       }
                }
                exit(0);
        }
@@ -301,6 +347,11 @@ int main(int argc, char *argv[])
 
        while (!alarm_rang) {
                now = time(0);
+               if (now < last) {
+                       t = find_next(now);
+                       if (vflag)
+                               printf("Time moved backwards, rescheduled for %s\n", isotime(tm));
+               }
                t = mktime(tm);
                if (t <= now) {
                        if (now - t <= slack)  // still about time
@@ -318,6 +369,7 @@ int main(int argc, char *argv[])
                        struct timespec ts;
                        ts.tv_nsec = 0;
                        ts.tv_sec = t - now > SLEEP_PHASE ? SLEEP_PHASE : t - now;
+                       last = now;
                        nanosleep(&ts, 0);
                        // we just iterate again when this exits early
                }
@@ -327,6 +379,12 @@ int main(int argc, char *argv[])
        if (argc == optind)
                return 0;
 
+       if (vflag) {
+               now = time(0);
+               tm = localtime(&now);
+               printf("Starting execution at %s\n", isotime(tm));
+       }
+
        execvp(argv[optind], argv+optind);
        perror("execvp");
        return 255;