From: Mark Wooding <mdw@distorted.org.uk>
Date: Mon, 15 Aug 2011 12:44:42 +0000 (+0100)
Subject: Merge branch 'master' of /home/mdw/public-git/misc
X-Git-Tag: 1.2.6~10
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/misc/commitdiff_plain/4fce9ec34226d1fa28698ef9571e32bead55bd11?hp=3b56e117ebdc1535d1b144e34a28134303dfb0eb

Merge branch 'master' of /home/mdw/public-git/misc

* 'master' of /home/mdw/public-git/misc:
  timeout.c: Fix exit codes; useful message on exec failure.
---

diff --git a/timeout.c b/timeout.c
index 0493efa..dbdc83e 100644
--- a/timeout.c
+++ b/timeout.c
@@ -412,7 +412,7 @@ int main(int argc, char *const argv[])
   while (isspace((unsigned char)*p)) p++;
   t = strtod(argv[0], &p);
   while (isspace((unsigned char)*p)) p++;
-  if (*p) die(254, "bad time value `%s'", argv[0]);
+  if (*p) die(253, "bad time value `%s'", argv[0]);
 
   /* --- Get things set up --- */
 
@@ -439,7 +439,7 @@ int main(int argc, char *const argv[])
   if (!kid) {
     setpgid(0, 0);
     execvp(argv[1], argv + 1);
-    _exit(252);
+    die(252, "exec(%s) failed: %s", argv[1], strerror(errno));
   }
   sc.kid = kid;