Prepare for 2.11.1.1; adapt to skalibs-2.12.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

6 files changed, 12 insertions, 6 deletions

diff --git a/src/conn-tools/s6-accessrules-cdb-from-fs.c b/src/conn-tools/s6-accessrules-cdb-from-fs.c
index a6587db..1b0b233 100644
--- a/src/conn-tools/s6-accessrules-cdb-from-fs.c
+++ b/src/conn-tools/s6-accessrules-cdb-from-fs.c
@@ -86,7 +86,7 @@ static void doit (cdbmaker *c, stralloc *sa, size_t start)
     sa->len = k+1 ;
     stralloc_catb(sa, "exec", 5) ;
     r = openreadnclose(sa->s, tmp.s + tmpbase + 5 + envlen, 4096) ;
-    if ((r < 0) && (errno != ENOENT))
+    if ((r == -1) && (errno != ENOENT))
     {
       cleanup() ;
       strerr_diefu2sys(111, "openreadnclose ", sa->s) ;
diff --git a/src/daemontools-extras/lolsyslog.c b/src/daemontools-extras/lolsyslog.c
index a397dae..e62bdef 100644
--- a/src/daemontools-extras/lolsyslog.c
+++ b/src/daemontools-extras/lolsyslog.c
@@ -82,8 +82,9 @@ size_t lolsyslog_string (char *out, char const *in)
   out = stpcpy(out, p->c_name ? p->c_name : "unknown") ;
   *out++ = '.' ;
 
+  p = prioritynames ;
   fp = LOG_PRI(fpr) ;
-  for (p = prioritynames ; p->c_name ; p++) if (p->c_val == fp) break ;
+  for (; p->c_name ; p++) if (p->c_val == fp) break ;
   out = stpcpy(out, p->c_name ? p->c_name : "unknown") ;
   *out++ = ':' ; *out++ = ' ' ; *out++ = 0 ;
   return i+2 ;
diff --git a/src/libs6/s6_accessrules_backend_fs.c b/src/libs6/s6_accessrules_backend_fs.c
index 1995757..12948f6 100644
--- a/src/libs6/s6_accessrules_backend_fs.c
+++ b/src/libs6/s6_accessrules_backend_fs.c
@@ -41,7 +41,7 @@ s6_accessrules_result_t s6_accessrules_backend_fs (char const *key, size_t keyle
     memcpy(tmp + dirlen + keylen + 2, "exec", 5) ;
     {
       ssize_t r = openreadnclose(tmp, params->exec.s + params->exec.len, 4096) ;
-      if ((r < 0) && (errno != EACCES) && (errno != ENOENT))
+      if ((r == -1) && (errno != EACCES) && (errno != ENOENT))
       {
         if (wasnull) stralloc_free(&params->env) ;
         else params->env.len = envbase ;
diff --git a/src/libs6/s6_svstatus_read.c b/src/libs6/s6_svstatus_read.c
index 376a0c7..9b21d44 100644
--- a/src/libs6/s6_svstatus_read.c
+++ b/src/libs6/s6_svstatus_read.c
@@ -1,17 +1,22 @@
 /* ISC license. */
 
+#include <errno.h>
 #include <string.h>
+
 #include <skalibs/djbunix.h>
 #include <s6/supervise.h>
 
 int s6_svstatus_read (char const *dir, s6_svstatus_t *status)
 {
+  ssize_t r ;
   size_t n = strlen(dir) ;
   char pack[S6_SVSTATUS_SIZE] ;
   char tmp[n + 1 + sizeof(S6_SVSTATUS_FILENAME)] ;
   memcpy(tmp, dir, n) ;
   memcpy(tmp + n, "/" S6_SVSTATUS_FILENAME, 1 + sizeof(S6_SVSTATUS_FILENAME)) ;
-  if (openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) < S6_SVSTATUS_SIZE) return 0 ;
+  r = openreadnclose(tmp, pack, S6_SVSTATUS_SIZE) ;
+  if (r == -1) return 0 ;
+  if (r < S6_SVSTATUS_SIZE) return (errno = EPIPE, 0) ;
   s6_svstatus_unpack(pack, status) ;
   return 1 ;
 }
diff --git a/src/supervision/s6-notifyoncheck.c b/src/supervision/s6-notifyoncheck.c
index a4d0ab1..1be61d2 100644
--- a/src/supervision/s6-notifyoncheck.c
+++ b/src/supervision/s6-notifyoncheck.c
@@ -36,7 +36,7 @@ static inline int read_uint (char const *file, unsigned int *fd)
 {
   char buf[UINT_FMT + 1] ;
   ssize_t r = openreadnclose_nb(file, buf, UINT_FMT) ;
-  if (r < 0) return -1 ;
+  if (r == -1) return -1 ;
   buf[byte_chr(buf, r, '\n')] = 0 ;
   return !!uint0_scan(buf, fd) ;
 }
diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c
index cc6779a..2060cac 100644
--- a/src/supervision/s6-supervise.c
+++ b/src/supervision/s6-supervise.c
@@ -82,7 +82,7 @@ static inline void announce (void)
 static int read_file (char const *file, char *buf, size_t n)
 {
   ssize_t r = openreadnclose_nb(file, buf, n) ;
-  if (r < 0)
+  if (r == -1)
   {
     if (errno != ENOENT) strerr_warnwu2sys("open ", file) ;
     return 0 ;