From 6df81d1188771f0e9c86c5cb6d7282650c1fc353 Mon Sep 17 00:00:00 2001 From: dwmalone Date: Thu, 21 Aug 2008 07:36:17 +0000 Subject: [PATCH] Lockf was exiting with status 1 if the command did not exit normally. This is easy to confuse with the actual exit status of the program. Instead exit with EX_SOFTWARE if the command doesn't exit normally. MFC after: 1 month --- usr.bin/lockf/lockf.1 | 5 +++++ usr.bin/lockf/lockf.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/usr.bin/lockf/lockf.1 b/usr.bin/lockf/lockf.1 index e8ce3ff02f59..6e2e06eae588 100644 --- a/usr.bin/lockf/lockf.1 +++ b/usr.bin/lockf/lockf.1 @@ -138,6 +138,11 @@ command line. A system call (e.g., .Xr fork 2 ) failed unexpectedly. +.It Dv EX_SOFTWARE +The +.Ar command +did not exit normally, +but may have been signaled or stopped. .El .Sh SEE ALSO .Xr flock 2 , diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 843f06115682..368eed0ee4cd 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -151,7 +151,7 @@ main(int argc, char **argv) signal(SIGTERM, killed); if (waitpid(child, &status, 0) == -1) err(EX_OSERR, "waitpid failed"); - return (WIFEXITED(status) ? WEXITSTATUS(status) : 1); + return (WIFEXITED(status) ? WEXITSTATUS(status) : EX_SOFTWARE); } /*