From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 11 Apr 2005 20:03:04 +0000 (+0000)
Subject: Include unistd-safer.h.
X-Git-Tag: CPPI-1_12~1044
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=24560041a845f892b3c2f4526ffa42017b687cdd;p=thirdparty%2Fcoreutils.git

Include unistd-safer.h.
(save_cwd): Use fd_safer.
---

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index fe4bb970ce..4dcf0d5396 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -42,6 +42,7 @@
 #include <errno.h>
 
 #include "chdir-long.h"
+#include "unistd-safer.h"
 #include "xgetcwd.h"
 
 /* On systems without the fchdir function (WOE), pretend that open
@@ -49,7 +50,7 @@
    Since chdir_long requires fchdir, use chdir instead.  */
 #if !HAVE_FCHDIR
 # undef open
-# define open(File, Flags) -1
+# define open(File, Flags) (-1)
 # undef fchdir
 # define fchdir(Fd) (abort (), -1)
 # undef chdir_long
@@ -81,10 +82,10 @@ save_cwd (struct saved_cwd *cwd)
 {
   cwd->name = NULL;
 
-  cwd->desc = open (".", O_RDONLY);
+  cwd->desc = fd_safer (open (".", O_RDONLY));
   if (cwd->desc < 0)
     {
-      cwd->desc = open (".", O_WRONLY);
+      cwd->desc = fd_safer (open (".", O_WRONLY));
       if (cwd->desc < 0)
 	{
 	  cwd->name = xgetcwd ();