X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=lib%2Fdup-safer.c;fp=lib%2Fdup-safer.c;h=22b96babf56ade1135a054df473ca57619ad049b;hb=c7e61475680fa226bd9b8bdd469cd66914e630f5;hp=7b12b615ca08ffabef1213bbe6769c0e4fdeea04;hpb=800deb09b422a73c1212233a93839a223ff59678;p=debian%2Fgzip
diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index 7b12b61..22b96ba 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,11 +1,12 @@
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2004, 2005, 2006, 2009 Free Software
+ Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
@@ -13,8 +14,7 @@
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. */
@@ -25,9 +25,6 @@
#include
#include
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
STDERR_FILENO. */
@@ -35,7 +32,7 @@
int
dup_safer (int fd)
{
-#if defined F_DUPFD && !defined FCHDIR_REPLACEMENT
+#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