[vlc-commits] Replace fdopendir()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Sep  3 12:54:40 2011 +0300| [d8f977410aecaab94af8d4e8551737cdc6c5a546] | committer: Rémi Denis-Courmont

Replace fdopendir()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d8f977410aecaab94af8d4e8551737cdc6c5a546
---

 compat/fdopendir.c   |   80 ++++++++++++++++++++++++++++++++++++++++++++++++++
 configure.ac         |    4 +-
 include/vlc_fixups.h |    7 ++++-
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/compat/fdopendir.c b/compat/fdopendir.c
new file mode 100644
index 0000000..b67bdf1
--- /dev/null
+++ b/compat/fdopendir.c
@@ -0,0 +1,80 @@
+/*****************************************************************************
+ * fdopendir.c: POSIX fdopendir replacement
+ *****************************************************************************
+ * Copyright © 2011 Rémi Denis-Courmont
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <stdio.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <dirent.h>
+
+DIR *fdopendir (int fd)
+{
+#ifdef F_GETFL
+    /* Check read permission on file descriptor */
+    int mode = fcntl (fd, F_GETFL);
+    if (mode == -1 || (mode & O_ACCMODE) == O_WRONLY)
+    {
+        errno = EBADF;
+        return NULL;
+    }
+#endif
+    /* Check directory file type */
+    struct stat st;
+    if (fstat (fd, &st))
+        return NULL;
+
+    if (!S_ISDIR (st.st_mode))
+    {
+        errno = ENOTDIR;
+        return NULL;
+    }
+
+    /* Try to open the directory through /proc where available.
+     * Not all operating systems support this. Fix your libc! */
+    char path[sizeof ("/proc/self/fd/") + 3 * sizeof (int)];
+    sprintf (path, "/proc/self/fd/%u", fd);
+
+    DIR *dir = opendir (path);
+    if (dir != NULL)
+    {
+        close (fd);
+        return dir;
+    }
+
+    /* Hide impossible errors for fdopendir() */
+    switch (errno)
+    {
+        case EACCES:
+#ifdef ELOOP
+        case ELOOP:
+#endif
+        case ENAMETOOLONG:
+        case ENOENT:
+        case EMFILE:
+        case ENFILE:
+            errno = EIO;
+    }
+    return NULL;
+}
diff --git a/configure.ac b/configure.ac
index b4fd802..7ca6721 100644
--- a/configure.ac
+++ b/configure.ac
@@ -564,8 +564,8 @@ need_libc=false
 
 dnl Check for usual libc functions
 AC_CHECK_DECLS([nanosleep],,,[#include <time.h>])
-AC_CHECK_FUNCS([daemon fcntl fdopendir fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
-AC_REPLACE_FUNCS([asprintf atof atoll dirfd flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r if_nameindex if_nametoindex isatty lstat memalign mmap openat pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp uselocale])
+AC_REPLACE_FUNCS([asprintf atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 rewind setenv strcasecmp strcasestr strdup strlcpy strncasecmp strndup strnlen strsep strtof strtok_r strtoll swab tdestroy vasprintf])
 AC_CHECK_FUNCS(fdatasync,,
   [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
 ])
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 9ad95f5..dee3dbd 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -64,7 +64,8 @@ typedef struct
 # include <sys/types.h> /* ssize_t, pid_t */
 #endif
 
-#ifndef HAVE_DIRFD
+#if !defined (HAVE_DIRFD) || \
+    !defined (HAVE_FDOPENDIR)
 # include <dirent.h>
 #endif
 
@@ -188,6 +189,10 @@ int fsync (int fd);
 int dirfd (DIR *);
 #endif
 
+#ifndef HAVE_FDOPENDIR
+DIR *fdopendir (int);
+#endif
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif