Bugfix: s6-log wasn't parsing regexps correctly (!)

 Thanks to Roy Lanek.
 version: 2.1.1.1

2 files changed, 2 insertions, 2 deletions

diff --git a/src/daemontools-extras/s6-log.c b/src/daemontools-extras/s6-log.c
index 8a5afc0..3e1d0ce 100644
--- a/src/daemontools-extras/s6-log.c
+++ b/src/daemontools-extras/s6-log.c
@@ -808,7 +808,7 @@ static inline void script_secondpass (char const *const *argv, scriptelem_t *scr
             errno = ENOMEM ;
             strerr_diefu1sys(111, "initialize script") ;
           }
-          if (!r) goto fail ;
+          if (r) goto fail ;
         }
         selections[sel++] = selitem ;
         if (flagacted)
diff --git a/src/fdholder/s6-fdholderd.c b/src/fdholder/s6-fdholderd.c
index b9091d2..b5e80ec 100644
--- a/src/fdholder/s6-fdholderd.c
+++ b/src/fdholder/s6-fdholderd.c
@@ -800,6 +800,6 @@ int main (int argc, char const *const *argv, char const *const *envp)
         else client_add(&i, fd, &rre, &wre, flags) ;
       }
     }
-    return (!!numfds | (!!numconn << 1)) ;
+    return ((!!numfds) | (!!numconn << 1)) ;
   }
 }