From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 22 May 2005 17:29:46 +0000 (+0000)
Subject: (fd_safer) [_LGPL_PACKAGE]: New static function,
X-Git-Tag: CPPI-1_12~737
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7102ac4302f20a80e431ccb8f9c88ad05b268ff;p=thirdparty%2Fcoreutils.git

(fd_safer) [_LGPL_PACKAGE]: New static function,
so that unistd-safer.h (GPL'ed code) need not be included.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 16bacaa1da..3c8ab513d0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* fts.c (fd_safer) [_LGPL_PACKAGE]: New static function,
+	so that unistd-safer.h (GPL'ed code) need not be included.
+
 2005-05-20  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Split the fts code into GPL'ed and LGPL'ed parts, and fix some
diff --git a/lib/fts.c b/lib/fts.c
index b2bec1992f..418e75b278 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -66,7 +66,6 @@ static char sccsid[] = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
 #include <fcntl.h>
 #include <errno.h>
 #include "dirfd.h"
-#include "unistd-safer.h"
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
@@ -170,8 +169,10 @@ 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 "fts-cycle.c"
+# include "unistd-safer.h"
 #endif
 
 #ifndef MAX