s6

commit 72d9f013c4a4d47273f78b40f080b49494bab78f
parent 2da4c96f308834570b2f62bbf3b9e0cfcffe58b8
Author: Laurent Bercot <ska-skaware@skarnet.org>
Date:   Sun, 11 Jan 2015 23:49:39 +0000

 Clean up static/shared libs initialization in configure and Makefile
 fd_close -> close in s6-notifywhenup

Diffstat:
M
Makefile
 | 
3
+++
M
configure
 | 
2
--
M
src/daemontools-extras/s6-notifywhenup.c
 | 
4
++--

3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
@@ -9,6 +9,9 @@ it: all
 
 CC = $(error Please use ./configure first)
 
+STATIC_LIBS :=
+SHARED_LIBS :=
+
 -include config.mak
 include package/targets.mak
 include package/deps.mak
diff --git a/configure b/configure
@@ -361,8 +361,6 @@ if $allstatic ; then
   vpathd=
 fi
   echo "vpath lib%.so$vpathd"
-echo "STATIC_LIBS :="
-echo "SHARED_LIBS :="
 if $static ; then
   echo "DO_STATIC := 1"
 else
diff --git a/src/daemontools-extras/s6-notifywhenup.c b/src/daemontools-extras/s6-notifywhenup.c
@@ -75,10 +75,10 @@ int main (int argc, char const *const *argv, char const *const *envp)
     else if (!pid)
     {
       PROG = "s6-notifywhenup (child)" ;
-      fd_close(p[1]) ;
+      close(p[1]) ;
       return run_child(p[0], fifodir, timeout) ;
     }
-    fd_close(p[0]) ;
+    close(p[0]) ;
     if (fd_move((int)fd, p[1]) < 0) strerr_diefu1sys(111, "fd_move") ;
   }
   pathexec_run(argv[0], argv, envp) ;