From: Paul Eggert Date: Sun, 3 Jul 2005 07:14:05 +0000 (+0000) Subject: (fd_safer): Remove decl. X-Git-Tag: CPPI-1_12~393 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f21950385bab4eef15a0c548b880c999bf899166;p=thirdparty%2Fcoreutils.git (fd_safer): Remove decl. Include fcntl--.h rather than unistd-safer.h (fts_safe_changedir): Don't call fd_safer; no longer needed now that we include fcntl--.h. --- diff --git a/lib/fts.c b/lib/fts.c index d3bef85f38..80fd979bb1 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -152,10 +152,9 @@ static bool enter_dir (FTS *fts, FTSENT *ent) { return true; } static void leave_dir (FTS *fts, FTSENT *ent) {} static bool setup_dir (FTS *fts) { return true; } static void free_dir (FTS *fts) {} -static int fd_safer (int fd) { return fd; } #else +# include "fcntl--.h" # include "fts-cycle.c" -# include "unistd-safer.h" #endif #ifndef MAX @@ -1319,7 +1318,7 @@ fts_safe_changedir (FTS *sp, FTSENT *p, int fd, char const *dir) newfd = fd; if (ISSET(FTS_NOCHDIR)) return (0); - if (fd < 0 && (newfd = fd_safer (diropen (dir))) < 0) + if (fd < 0 && (newfd = diropen (dir)) < 0) return (-1); if (fstat(newfd, &sb)) { ret = -1;