/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
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
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include "config.h"
#endif
# include <stdlib.h>
#endif
-#ifdef HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif
-#ifdef HAVE_FCNTL_H
+#if HAVE_FCNTL_H
# include <fcntl.h>
#else
# include <sys/file.h>
extern int errno;
#endif
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
#include "save-cwd.h"
#include "error.h"
called, but doing so is ok. Otherwise, return zero. */
int
-save_cwd (cwd)
- struct saved_cwd *cwd;
+save_cwd (struct saved_cwd *cwd)
{
static int have_working_fchdir = 1;
if (have_working_fchdir)
{
-#ifdef HAVE_FCHDIR
- cwd->desc = open (".", O_RDONLY);
+#if HAVE_FCHDIR
+ cwd->desc = open (".", O_RDONLY | O_DIRECTORY);
if (cwd->desc < 0)
{
error (0, errno, "cannot open current directory");
*/
int
-restore_cwd (cwd, dest, from)
- const struct saved_cwd *cwd;
- const char *dest;
- const char *from;
+restore_cwd (const struct saved_cwd *cwd, const char *dest, const char *from)
{
int fail = 0;
if (cwd->desc >= 0)
}
void
-free_cwd (cwd)
- struct saved_cwd *cwd;
+free_cwd (struct saved_cwd *cwd)
{
if (cwd->desc >= 0)
close (cwd->desc);