X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fdup-safer.c;h=a6908511ac85f758625a336a5ef77f93fa70e506;hb=65d19cd356b6851de04af028fa1fd7c02357fa67;hp=e51a8d5f577447d4a81c4ec13ba0188df71e10b1;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git
diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index e51a8d5f5..a6908511a 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,10 +1,11 @@
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001, 2004, 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 2001, 2004, 2005, 2006 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 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
@@ -12,24 +13,17 @@
GNU General Public License for more details.
You should have received a copy of the GNU 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. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
#include "unistd-safer.h"
-#if HAVE_FCNTL_H
-# include
-#endif
+#include
-#if HAVE_UNISTD_H
-# include
-#endif
+#include
#ifndef STDERR_FILENO
# define STDERR_FILENO 2
#endif
@@ -40,7 +34,7 @@
int
dup_safer (int fd)
{
-#ifdef F_DUPFD
+#if defined F_DUPFD && !defined FCHDIR_REPLACEMENT
return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
#else
/* fd_safer calls us back, but eventually the recursion unwinds and