X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdup-safer.c;h=5441b960eb1200fdbc4cd8b3ec4350d20c8612c1;hb=64ee293cdac319d0f38cd0d31e758a823b7163ad;hp=f72fd845f397a1a6e413db765e8b08972220772a;hpb=196a4d4693a1b50eb309df386dfb5a0f72169d88;p=gnulib.git
diff --git a/lib/dup-safer.c b/lib/dup-safer.c
index f72fd845f..5441b960e 100644
--- a/lib/dup-safer.c
+++ b/lib/dup-safer.c
@@ -1,10 +1,11 @@
/* Invoke dup, but avoid some glitches.
- Copyright (C) 2001 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
- 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,32 +13,16 @@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include
-#endif
-
-#include
-#ifndef errno
-extern int errno;
-#endif
-
-#if HAVE_FCNTL_H
-# include
-#endif
+#include
-#if HAVE_UNISTD_H
-# include
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
+#include "unistd-safer.h"
-#include
+#include
+#include
/* Like dup, but do not return STDIN_FILENO, STDOUT_FILENO, or
STDERR_FILENO. */
@@ -45,18 +30,5 @@ extern int errno;
int
dup_safer (int fd)
{
-#ifdef F_DUPFD
return fcntl (fd, F_DUPFD, STDERR_FILENO + 1);
-#else
- int f = dup (fd);
- if (0 <= f && f <= STDERR_FILENO)
- {
- int f1 = dup_safer (f);
- int e = errno;
- close (f);
- errno = e;
- f = f1;
- }
- return f;
-#endif
}