From 321f8dd75df79a714b17a0f2cd16644ccc4febf9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 10 Nov 2017 12:53:37 +0000
Subject:  More accurate exit code and clearer error messages for s6-svc and
 s6-svscanctl

---
 src/libs6/s6_svc_write.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/libs6/s6_svc_write.c')

diff --git a/src/libs6/s6_svc_write.c b/src/libs6/s6_svc_write.c
index 3ebf3b4..70c3964 100644
--- a/src/libs6/s6_svc_write.c
+++ b/src/libs6/s6_svc_write.c
@@ -8,9 +8,16 @@
 int s6_svc_write (char const *fifo, char const *data, size_t datalen)
 {
   int fd = open_write(fifo) ;
-  if (fd < 0) return (errno == ENXIO) ? 0 : -1 ;
-  else if (ndelay_off(fd) == -1) return -1 ;
-  else if (fd_write(fd, data, datalen) == -1)
+  if (fd < 0) switch (errno)
+  {
+    case ENXIO : return 0 ;
+    case ENOENT :
+    case ENOTDIR :
+    case EISDIR : return -2 ;
+    default : return -1 ;
+  }
+  if (ndelay_off(fd) == -1) return -1 ;
+  if (fd_write(fd, data, datalen) == -1)
   {
     fd_close(fd) ;
     return -1 ;
-- 
cgit v1.3.1