generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-07-03 17:17:15 +02:00
Code Issues Projects Releases Wiki Activity

Update closefrom() function

Browse Source 
Import from sudo. Adapt the build system to detect the required features.
This commit is contained in:
Guillem Jover 2014-11-02 00:23:00 +01:00
parent 3a3d87d730
commit 3881c4fc68
2 changed files with 73 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -40,7 +40,7 @@ fi
# Checks for libraries. # Checks for libraries.
# Checks for header files. # Checks for header files.
AC_CHECK_HEADERS([sys/ndir.h sys/dir.h dir.h dirent.h]) AC_CHECK_HEADERS([sys/ndir.h sys/dir.h ndir.h dirent.h])
# Checks for typedefs, structures, and compiler characteristics. # Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_UID_T AC_TYPE_UID_T
@ -123,7 +123,8 @@ AC_LINK_IFELSE(
AC_MSG_RESULT([yes])], AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]) [AC_MSG_RESULT([no])])
AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge getexecname getline sysconf]) AC_CHECK_FUNCS([clearenv dirfd fopencookie __fpurge getexecname getline \
pstat_getproc sysconf])
AC_CONFIG_FILES([ AC_CONFIG_FILES([
Makefile Makefile

85
src/closefrom.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2004-2005, 2007, 2010 * Copyright (c) 2004-2005, 2007, 2010, 2012-2014
* Todd C. Miller <Todd.Miller@courtesan.com> * Todd C. Miller <Todd.Miller@courtesan.com>
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
@ -18,7 +18,6 @@
#include <config.h> #include <config.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/param.h>
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
@ -30,10 +29,15 @@
# endif # endif
#endif /* STDC_HEADERS */ #endif /* STDC_HEADERS */
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_DIRENT_H #include <limits.h>
#ifdef HAVE_PSTAT_GETPROC
# include <sys/param.h>
# include <sys/pstat.h>
#else
# ifdef HAVE_DIRENT_H
# include <dirent.h> # include <dirent.h>
# define NAMLEN(dirent) strlen((dirent)->d_name) # define NAMLEN(dirent) strlen((dirent)->d_name)
#else # else
# define dirent direct # define dirent direct
# define NAMLEN(dirent) (dirent)->d_namlen # define NAMLEN(dirent) (dirent)->d_namlen
# ifdef HAVE_SYS_NDIR_H # ifdef HAVE_SYS_NDIR_H
@ -45,21 +49,20 @@
# ifdef HAVE_NDIR_H # ifdef HAVE_NDIR_H
# include <ndir.h> # include <ndir.h>
# endif # endif
# endif
#endif #endif
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define OPEN_MAX 256 # define OPEN_MAX 256
#endif #endif
#ifndef HAVE_FCNTL_CLOSEM #if defined(HAVE_FCNTL_CLOSEM) && !defined(HAVE_DIRFD)
# ifndef HAVE_DIRFD # define closefrom closefrom_fallback
# define closefrom_fallback closefrom
# endif
#endif #endif
/* /*
* Close all file descriptors greater than or equal to lowfd. * Close all file descriptors greater than or equal to lowfd.
* This is the expensive (ballback) method. * This is the expensive (fallback) method.
*/ */
void void
closefrom_fallback(int lowfd) closefrom_fallback(int lowfd)
@ -79,44 +82,74 @@ closefrom_fallback(int lowfd)
if (maxfd < 0) if (maxfd < 0)
maxfd = OPEN_MAX; maxfd = OPEN_MAX;
for (fd = lowfd; fd < maxfd; fd++) for (fd = lowfd; fd < maxfd; fd++) {
#ifdef __APPLE__
/* Avoid potential libdispatch crash when we close its fds. */
(void)fcntl((int)fd, F_SETFD, FD_CLOEXEC);
#else
(void)close((int)fd); (void)close((int)fd);
#endif
}
} }
/* /*
* Close all file descriptors greater than or equal to lowfd. * Close all file descriptors greater than or equal to lowfd.
* We try the fast way first, falling back on the slow method. * We try the fast way first, falling back on the slow method.
*/ */
#ifdef HAVE_FCNTL_CLOSEM #if defined(HAVE_FCNTL_CLOSEM)
void void
closefrom(int lowfd) closefrom(int lowfd)
{ {
if (fcntl(lowfd, F_CLOSEM, 0) == -1) if (fcntl(lowfd, F_CLOSEM, 0) == -1)
closefrom_fallback(lowfd); closefrom_fallback(lowfd);
} }
#else #elif defined(HAVE_PSTAT_GETPROC)
# ifdef HAVE_DIRFD
void void
closefrom(int lowfd) closefrom(int lowfd)
{ {
struct dirent *dent; struct pst_status pstat;
DIR *dirp; int fd;
char *endp;
long fd; if (pstat_getproc(&pstat, sizeof(pstat), 0, getpid()) != -1) {
for (fd = lowfd; fd <= pstat.pst_highestfd; fd++)
(void)close(fd);
} else {
closefrom_fallback(lowfd);
}
}
#elif defined(HAVE_DIRFD)
void
closefrom(int lowfd)
{
const char *path;
DIR *dirp;
/* Use /proc/self/fd (or /dev/fd on FreeBSD) if it exists. */
# if defined(__FreeBSD__) || defined(__APPLE__)
path = "/dev/fd";
# else
path = "/proc/self/fd";
# endif
if ((dirp = opendir(path)) != NULL) {
struct dirent *dent;
/* Use /proc/self/fd directory if it exists. */
dirp = opendir("/proc/self/fd");
if (dirp != NULL) {
while ((dent = readdir(dirp)) != NULL) { while ((dent = readdir(dirp)) != NULL) {
fd = strtol(dent->d_name, &endp, 10); const char *errstr;
if (dent->d_name != endp && *endp == '\0' && int fd;
fd >= 0 && fd < INT_MAX && fd >= lowfd &&
fd != dirfd(dirp)) fd = strtonum(dent->d_name, lowfd, INT_MAX, &errstr);
(void)close((int)fd); if (errstr == NULL && fd != dirfd(dirp)) {
# ifdef __APPLE__
/* Avoid potential libdispatch crash when we
* close its fds. */
(void)fcntl(fd, F_SETFD, FD_CLOEXEC);
# else
(void)close(fd);
# endif
}
} }
(void)closedir(dirp); (void)closedir(dirp);
} else } else
closefrom_fallback(lowfd); closefrom_fallback(lowfd);
} }
#endif /* HAVE_DIRFD */
#endif /* HAVE_FCNTL_CLOSEM */ #endif /* HAVE_FCNTL_CLOSEM */