X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffd-safer.c;h=c1c600051227b95b8c33118fd0500978a31308bf;hb=1bce9152c7fa70ba4408e43c758900df25f9a775;hp=d2e1309c84b47a677d983f81641a2842fc58f1bf;hpb=14449a1dacca44c4f933d5fc207c7fa56e6c0fb7;p=gnulib.git

diff --git a/lib/fd-safer.c b/lib/fd-safer.c
index d2e1309c8..c1c600051 100644
--- a/lib/fd-safer.c
+++ b/lib/fd-safer.c
@@ -1,6 +1,6 @@
 /* Return a safer copy of a file descriptor.
 
-   Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2010 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
@@ -22,7 +22,6 @@
 #include "unistd-safer.h"
 
 #include <errno.h>
-
 #include <unistd.h>
 
 /* Return FD, unless FD would be a copy of standard input, output, or
@@ -48,32 +47,3 @@ fd_safer (int fd)
 
   return fd;
 }
-
-#if GNULIB_CLOEXEC
-
-/* Return FD, unless FD would be a copy of standard input, output, or
-   error; in that case, return a duplicate of FD, closing FD.  If FLAG
-   contains O_CLOEXEC, the returned FD will have close-on-exec
-   semantics.  On failure to duplicate, close FD, set errno, and
-   return -1.  Preserve errno if FD is negative, so that the caller
-   can always inspect errno when the returned value is negative.
-
-   This function is usefully wrapped around functions that return file
-   descriptors, e.g., fd_safer_flag (open ("file", O_RDONLY | flag), flag).  */
-
-int
-fd_safer_flag (int fd, int flag)
-{
-  if (STDIN_FILENO <= fd && fd <= STDERR_FILENO)
-    {
-      int f = dup_safer_flag (fd, flag);
-      int e = errno;
-      close (fd);
-      errno = e;
-      fd = f;
-    }
-
-  return fd;
-}
-
-#endif /* GNULIB_CLOEXEC */