upas/fs: remove imap lastread debounding

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

diff --git a/sys/src/cmd/alarm.c b/sys/src/cmd/alarm.c
index 4ce5f0623bce4b99368d370251fd32a21582fda1..1a8cbb2ddf4a7550e1aa0beba78b6540c7fc8663 100644 (file)
--- a/sys/src/cmd/alarm.c
+++ b/sys/src/cmd/alarm.c
@@ -24,36 +24,31 @@
 #include <u.h>
 #include <libc.h>
 
-int cpid;
-
 void
 usage(void)
 {
-       fprint(2,"usage: alarm time path arg ...\n");
+       fprint(2,"usage: %s time command [ arg ... ]\n", argv0);
        exits("usage");
 }
 
-static int
-notefun(void *, char *msg)
+static void
+catch(void *, char *msg)
 {
-       postnote(PNGROUP, cpid, msg);
-       return 1;
+       postnote(PNGROUP, getpid(), msg);
+       noted(NDFLT);
 }
 
 void
 main(int argc, char *argv[])
 {
-       char *path, *p, *q;
+       char buf[1024], *p, *q;
        Waitmsg *w;
        long n, t;
 
-       ARGBEGIN{
-       default: usage();
-       }ARGEND
-
-       if(argc < 2)
+       argv0 = argv[0];
+       if(argc < 3)
                usage();
-       n = strtol(*argv++, &p, 10);
+       n = strtol(argv[1], &p, 10);
        if(n < 0)
                usage();
        t = n * 1000;
@@ -74,18 +69,20 @@ main(int argc, char *argv[])
                }
                t += n;
        }
-       path = *argv;
-       if(p = strrchr(path, '/'))
-               if(p[1])
-                       *argv = p+1;
-       atnotify(notefun,1);
-       switch((cpid = rfork(RFFDG|RFREND|RFPROC|RFMEM|RFNOTEG))){
+       rfork(RFNOTEG);
+       switch(rfork(RFFDG|RFREND|RFPROC|RFMEM)){
        case -1:
                sysfatal("%r");
        case 0: /* child */
-               exec(path, argv);
-               sysfatal("%s: %r", *argv);
+               exec(argv[2], &argv[2]);
+               if(argv[2][0] != '/' && strncmp(argv[2], "./", 2) &&
+                  strncmp(argv[2], "../", 3)){
+                       snprint(buf, sizeof(buf), "/bin/%s", argv[2]);
+                       exec(argv[2] = buf, &argv[2]);
+               }
+               sysfatal("%s: %r", argv[2]);
        }
+       notify(catch);
        alarm(t);
        if(w = wait())
                exits(w->msg);