projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* stdlib-safer.h: New file from coreutils, required by
[gnulib.git]
/
lib
/
save-cwd.c
diff --git
a/lib/save-cwd.c
b/lib/save-cwd.c
index
4dcf0d5
..
f842cca
100644
(file)
--- a/
lib/save-cwd.c
+++ b/
lib/save-cwd.c
@@
-15,34
+15,24
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include
"config.h"
+#if
def
HAVE_CONFIG_H
+# include
<config.h>
#endif
#include "save-cwd.h"
#endif
#include "save-cwd.h"
+#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif
-
-#include <errno.h>
+#include <unistd.h>
#include "chdir-long.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
#include "xgetcwd.h"
/* On systems without the fchdir function (WOE), pretend that open
@@
-82,15
+72,11
@@
save_cwd (struct saved_cwd *cwd)
{
cwd->name = NULL;
{
cwd->name = NULL;
- cwd->desc =
fd_safer (open (".", O_RDONLY)
);
+ cwd->desc =
open (".", O_RDONLY
);
if (cwd->desc < 0)
{
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;
}
return 0;
}
return 0;