X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffd-safer.c;h=910fa4cb2057a37a7f1abb4c7ce7a80e3c51573c;hb=5e117d03ff9c6ca545f1e8be91c92cfcca605e37;hp=02caaa9408bde45ae861f46194ca948870aff6bf;hpb=8b03458ebe93a6e1c86c3a468aa3f2eee01e3c4c;p=gnulib.git
diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index 02caaa940..910fa4cb2 100644
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -1,11 +1,11 @@
/* Return a safer copy of a file descriptor.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005-2006, 2009-2011 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,28 +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
#include "unistd-safer.h"
#include
-
-#if HAVE_UNISTD_H
-# include
-#endif
-#ifndef STDIN_FILENO
-# define STDIN_FILENO 0
-#endif
-#ifndef STDERR_FILENO
-# define STDERR_FILENO 2
-#endif
+#include
/* Return FD, unless FD would be a copy of standard input, output, or
error; in that case, return a duplicate of FD, closing FD. On