X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsave-cwd.c;h=cf43a355006b92c55e05dd40570e1d6b262990a2;hb=e25c6d9cca2c2e7d732c72e8c91daaf2fa1c68e1;hp=5ad790a4d3542a7deafd4f5b9ac6325769e2b1da;hpb=d1eb42bdbbaf00d38b2a479e9aa40207b79bd090;p=gnulib.git
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 5ad790a4d..cf43a3550 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,12 +1,12 @@
/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 Free Software
+ Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2010 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
@@ -14,32 +14,30 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include
#include "save-cwd.h"
+#include
+#include
#include
#include
#include
-#if HAVE_UNISTD_H
-# include
-#endif
-
-#include
-
-#include
-
#include "chdir-long.h"
-#include "unistd-safer.h"
+#include "unistd--.h"
#include "xgetcwd.h"
+#include "cloexec.h"
+
+#if GNULIB_FCNTL_SAFER
+# include "fcntl--.h"
+#else
+# define GNULIB_FCNTL_SAFER 0
+#endif
/* On systems without the fchdir function (WOE), pretend that open
always returns -1 so that save_cwd resorts to using xgetcwd.
@@ -78,17 +76,16 @@ save_cwd (struct saved_cwd *cwd)
{
cwd->name = NULL;
- cwd->desc = fd_safer (open (".", O_RDONLY));
+ cwd->desc = open (".", O_RDONLY);
+ if (!GNULIB_FCNTL_SAFER)
+ cwd->desc = fd_safer (cwd->desc);
if (cwd->desc < 0)
{
- cwd->desc = fd_safer (open (".", O_WRONLY));
- if (cwd->desc < 0)
- {
- cwd->name = xgetcwd ();
- return cwd->name ? 0 : -1;
- }
+ cwd->name = xgetcwd ();
+ return cwd->name ? 0 : -1;
}
+ set_cloexec_flag (cwd->desc, true);
return 0;
}
@@ -110,6 +107,5 @@ free_cwd (struct saved_cwd *cwd)
{
if (cwd->desc >= 0)
close (cwd->desc);
- if (cwd->name)
- free (cwd->name);
+ free (cwd->name);
}