X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=snooze.c;h=d7dd67e0ccd221c1788b80cded3a4a70a7beeff0;hb=9034895827a878c756c58da7136251e3a8668c94;hp=b88db77e1c3547aaad191bfcf9b1854c8aeb7f9e;hpb=8c8217eebd8bc6f196b493dba4d815b1873478f0;p=user%2Fhenk%2Fcode%2Fsnooze.git

diff --git a/snooze.c b/snooze.c
index b88db77..d7dd67e 100644
--- a/snooze.c
+++ b/snooze.c
@@ -31,7 +31,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 +64,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)
 {
@@ -200,6 +228,7 @@ isotime(const struct tm *tm)
 int main(int argc, char *argv[])
 {
 	int c;
+	time_t t;
 	time_t now = time(0);
 
 	/* default: every day at 00:00:00 */
@@ -228,10 +257,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 +277,16 @@ int main(int argc, char *argv[])
 		if (stat(timefile, &st) < 0) {
 			if (errno != ENOENT)
 				perror("stat");
+			t = start - slack - 1 - timewait;
+		} else {
+			t = st.st_mtime;
+		}
+		if (timewait == -1) {
+			while (t < start - slack)
+				t = find_next(t + 1);
+			start = t;
 		} else {
-			if (st.st_mtime + timewait > start)
+			if (t + timewait > start)
 				start = st.st_mtime + timewait;
 		}
 	}
@@ -271,7 +308,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);