From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 16 Apr 2017 10:48:58 +0000 (+0200)
Subject: ipc: Improve error diagnostics for kill.
X-Git-Tag: v1.0.0~27
X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=commitdiff_plain;h=3910462d958e9d8163eafba74052fed01c88a5d3;ds=sidebyside

ipc: Improve error diagnostics for kill.

If dss is not running, the kill command prints "No such file or
directory" because the call to semget(2) fails with ENOENT. This
message is a bit misleading, so let's return -E_NOT_RUNNING in this
case instead.
---

diff --git a/ipc.c b/ipc.c
index 880ce17..0f295a9 100644
--- a/ipc.c
+++ b/ipc.c
@@ -120,7 +120,7 @@ int get_dss_pid(char *config_file, pid_t *pid)
 		*pid = 0;
 	ret = mutex_get(key, 0);
 	if (ret < 0)
-		return ret;
+		return ret == -ERRNO_TO_DSS_ERROR(ENOENT)? -E_NOT_RUNNING : ret;
 	semid = ret;
 	ret = semctl(semid, 1, GETPID);
 	if (ret < 0)