From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Jul 2005 07:16:43 +0000 (+0000)
Subject: Include fcntl--.h, not unistd-safer.h.
X-Git-Tag: CPPI-1_12~387
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43ab391610c2db8bfbf972a11eb9f874ccc71864;p=thirdparty%2Fcoreutils.git

Include fcntl--.h, not unistd-safer.h.
(copy_reg): Don't call fd_safer; no longer needed
now that we include fcntl--.h.
---

diff --git a/src/copy.c b/src/copy.c
index 6a0ec7520f..7f8f108039 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -36,6 +36,7 @@
 #include "dirname.h"
 #include "euidaccess.h"
 #include "error.h"
+#include "fcntl--.h"
 #include "filenamecat.h"
 #include "full-write.h"
 #include "getpagesize.h"
@@ -44,7 +45,6 @@
 #include "quote.h"
 #include "same.h"
 #include "savedir.h"
-#include "unistd-safer.h"
 #include "utimecmp.h"
 #include "utimens.h"
 #include "xreadlink.h"
@@ -213,7 +213,6 @@ copy_reg (char const *src_name, char const *dst_name,
   bool make_holes = false;
 
   source_desc = open (src_name, O_RDONLY);
-  source_desc = fd_safer (source_desc);
   if (source_desc < 0)
     {
       error (0, errno, _("cannot open %s for reading"), quote (src_name));
@@ -265,7 +264,6 @@ copy_reg (char const *src_name, char const *dst_name,
 	}
     }
 
-  dest_desc = fd_safer (dest_desc);
   if (dest_desc < 0)
     {
       error (0, errno, _("cannot create regular file %s"), quote (dst_name));