/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997, 1998, 2003, 2004 Free Software Foundation, Inc.
+
+ Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005 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
# include "config.h"
#endif
+#include "save-cwd.h"
+
+#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#endif
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
-#ifndef O_DIRECTORY
-# define O_DIRECTORY 0
-#endif
-
-#include "save-cwd.h"
+#include "chdir-long.h"
#include "xgetcwd.h"
/* Record the location of the current working directory in CWD so that
closed; return non-zero -- in that case, free_cwd need not be
called, but doing so is ok. Otherwise, return zero.
- The `raison d'etre' for this interface is that some systems lack
- support for fchdir, and getcwd is not robust or as efficient.
+ The `raison d'etre' for this interface is that the working directory
+ is sometimes inaccessible, and getcwd is not robust or as efficient.
So, we prefer to use the open/fchdir approach, but fall back on
- getcwd if necessary. Some systems lack fchdir altogether: OS/2,
- Cygwin (as of March 2003), SCO Xenix. At least SunOS 4 and Irix 5.3
- provide the function, yet it doesn't work for partitions on which
- auditing is enabled. */
+ getcwd if necessary.
+
+ Some systems lack fchdir altogether: e.g., OS/2, pre-2001 Cygwin,
+ SCO Xenix. Also, SunOS 4 and Irix 5.3 provide the function, yet it
+ doesn't work for partitions on which auditing is enabled. If
+ you're still using an obsolete system with these problems, please
+ send email to the maintainer of this code. */
int
save_cwd (struct saved_cwd *cwd)
{
- static int have_working_fchdir = 1;
-
- cwd->desc = -1;
cwd->name = NULL;
- if (have_working_fchdir)
+ cwd->desc = open (".", O_RDONLY);
+ if (cwd->desc < 0)
{
-#if HAVE_FCHDIR
- cwd->desc = open (".", O_RDONLY | O_DIRECTORY);
- if (cwd->desc < 0)
- cwd->desc = open (".", O_WRONLY | O_DIRECTORY);
+ cwd->desc = open (".", O_WRONLY);
if (cwd->desc < 0)
{
cwd->name = xgetcwd ();
- return cwd->name == NULL;
- }
-
-# if __sun__ || sun
- /* On SunOS 4 and IRIX 5.3, fchdir returns EINVAL when auditing
- is enabled, so we have to fall back to chdir. */
- if (fchdir (cwd->desc))
- {
- if (errno == EINVAL)
- {
- close (cwd->desc);
- cwd->desc = -1;
- have_working_fchdir = 0;
- }
- else
- {
- int saved_errno = errno;
- close (cwd->desc);
- cwd->desc = -1;
- errno = saved_errno;
- return 1;
- }
+ return cwd->name ? 0 : -1;
}
-# endif /* __sun__ || sun */
-#else
-# define fchdir(x) (abort (), 0)
- have_working_fchdir = 0;
-#endif
}
- if (!have_working_fchdir)
- {
- cwd->name = xgetcwd ();
- if (cwd->name == NULL)
- return 1;
- }
return 0;
}
/* Change to recorded location, CWD, in directory hierarchy.
- Upon failure, return nonzero (errno is set by chdir or fchdir).
+ Upon failure, return -1 (errno is set by chdir or fchdir).
Upon success, return zero. */
int
restore_cwd (const struct saved_cwd *cwd)
{
if (0 <= cwd->desc)
- return fchdir (cwd->desc) < 0;
+ return fchdir (cwd->desc);
else
- return chdir (cwd->name) < 0;
+ return chdir_long (cwd->name);
}
void