Remove closefrom as we don't suffer from fd starvation.

diff --git a/compat/closefrom.c b/compat/closefrom.c
deleted file mode 100644 (file)
index ab57c77..0000000
--- a/compat/closefrom.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2009 Roy Marples <roy@marples.name>
- * All rights reserved
-
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <unistd.h>
-
-#include "closefrom.h"
-
-int
-closefrom(int fd)
-{
-       long max;
-       int i, r;
-
-#ifdef _SC_OPEN_MAX
-       max = sysconf(_SC_OPEN_MAX);
-#else
-       max = getdtablesize();
-#endif
-       r = 0;
-       for (i = fd; i < max; i++) {
-               if (close(i) == -1)
-                       r = -1;
-       }
-       return r;
-}

diff --git a/compat/closefrom.h b/compat/closefrom.h
deleted file mode 100644 (file)
index ed21068..0000000
--- a/compat/closefrom.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * dhcpcd - DHCP client daemon
- * Copyright (c) 2006-2009 Roy Marples <roy@marples.name>
- * All rights reserved
-
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef CLOSEFROM_H
-#define CLOSEFROM_H
-int closefrom(int);
-#endif

diff --git a/configure b/configure
index 955b87b9ce05315b3c589a868b107de87414c00b..e6603ff4872c2fe35bf48a99a5a179ce07a8ffbe 100755 (executable)
--- a/configure
+++ b/configure
@@ -64,7 +64,6 @@ for x do
        --target) TARGET=$var;;
        --libdir) LIBDIR=$var;;
        --without-arc4random) ARC4RANDOM=no;;
-       --without-closefrom) CLOSEFROM=no;;
        --without-getline) GETLINE=no;;
        --without-strlcpy) STRLCPY=no;;
        --without-pidfile_lock) PIDFILE_LOCK=no;;
@@ -619,28 +618,6 @@ if [ "$ARC4RANDOM_UNIFORM" = no ]; then
        echo "#include          \"compat/arc4random_uniform.h\"" >>$CONFIG_H
 fi
 
-if [ -z "$CLOSEFROM" ]; then
-       printf "Testing for closefrom ... "
-       cat <<EOF >_closefrom.c
-#include <unistd.h>
-int main(void) {
-       closefrom(3);
-       return 0;
-}
-EOF
-       if $XCC _closefrom.c -o _closefrom 2>&3; then
-               CLOSEFROM=yes
-       else
-               CLOSEFROM=no
-       fi
-       echo "$CLOSEFROM"
-       rm -f _closefrom.c _closefrom
-fi
-if [ "$CLOSEFROM" = no ]; then
-       echo "COMPAT_SRCS+=     compat/closefrom.c" >>$CONFIG_MK
-       echo "#include          \"compat/closefrom.h\"" >>$CONFIG_H
-fi
-
 if [ -z "$GETLINE" ]; then
        printf "Testing for getline ... "
        cat <<EOF >_getline.c

diff --git a/dhcpcd.c b/dhcpcd.c
index ad4b1b5d78d76298b777d4693aa1d1f066f8f846..8e6b0367e053c1e75c901ff4bd6f2e7b162170cc 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1467,7 +1467,6 @@ main(int argc, char **argv)
        }
 
        memset(&ctx, 0, sizeof(ctx));
-       closefrom(3);
 
        ctx.log_fd = -1;
        logger_open(&ctx);