s6

commit 2051574efa08de08488810669b21d15f387aa3e8
parent 5b324f2d9eb699f15514f6020d0f7bfa522b29b3
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Mon, 25 Mar 2019 18:33:31 +0000

 Reestablish directory checking in s6-svc/s6-svscanctl without commands

Diffstat:
M
src/libs6/s6_svc_write.c
 | 
29
+++++++++++++----------------

1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/src/libs6/s6_svc_write.c b/src/libs6/s6_svc_write.c
@@ -7,24 +7,21 @@
 
 int s6_svc_write (char const *fifo, char const *data, size_t datalen)
 {
-  if (datalen)
+  int fd = open_write(fifo) ;
+  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 (datalen && fd_write(fd, data, datalen) == -1)
   {
-    int fd = open_write(fifo) ;
-    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 ;
-    }
     fd_close(fd) ;
+    return -1 ;
   }
+  fd_close(fd) ;
   return 1 ;
 }