From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 3 Jul 2005 07:15:39 +0000 (+0000)
Subject: Include fcntl--.h rather than fcntl.h.
X-Git-Tag: CPPI-1_12~390
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c34c16a060f8d2efb43eab5044b8decfbff0088;p=thirdparty%2Fcoreutils.git

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

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index aefdb6e7e4..1e988175b5 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -25,18 +25,14 @@
 
 #include "save-cwd.h"
 
+#include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-
 #include <unistd.h>
 
-#include <fcntl.h>
-
-#include <errno.h>
-
 #include "chdir-long.h"
-#include "unistd-safer.h"
+#include "fcntl--.h"
 #include "xgetcwd.h"
 
 /* On systems without the fchdir function (WOE), pretend that open
@@ -76,10 +72,10 @@ save_cwd (struct saved_cwd *cwd)
 {
   cwd->name = NULL;
 
-  cwd->desc = fd_safer (open (".", O_RDONLY));
+  cwd->desc = open (".", O_RDONLY);
   if (cwd->desc < 0)
     {
-      cwd->desc = fd_safer (open (".", O_WRONLY));
+      cwd->desc = open (".", O_WRONLY);
       if (cwd->desc < 0)
 	{
 	  cwd->name = xgetcwd ();