X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdup-safer.c;h=5441b960eb1200fdbc4cd8b3ec4350d20c8612c1;hb=1a6fbdd7d28dff1868c5eb0baf0029b27e42526a;hp=22b96babf56ade1135a054df473ca57619ad049b;hpb=dd66a62cc2d76ab463e1167824ea4ca5fd4ef2ae;p=gnulib.git

diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 22b96babf..5441b960e 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,7 +1,6 @@
 /* Invoke dup, but avoid some glitches.
 
-   Copyright (C) 2001, 2004, 2005, 2006, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 2001, 2004-2006, 2009-2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +22,6 @@
 #include "unistd-safer.h"
 
 #include <fcntl.h>
-
 #include <unistd.h>
 
 /* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
@@ -32,11 +30,5 @@
 int
 dup_safer (int fd)
 {
-#if defined F_DUPFD && !REPLACE_FCHDIR
   return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
-#else
-  /* fd_safer calls us back, but eventually the recursion unwinds and
-     does the right thing.  */
-  return fd_safer (dup (fd));
-#endif
 }