X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsave-cwd.c;h=f07973a3ab3fafe2df657c5c526c44922861a324;hb=96540edb37f9bcc02b5f35bd3dcda5aaac5dac2c;hp=40bd70b0d25a714eb9aea3db420470fcaebb347d;hpb=67f394c1d2be473276ccd5e071f986511a13e212;p=gnulib.git

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 40bd70b0d..f07973a3a 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,5 +1,7 @@
 /* save-cwd.c -- Save and restore current working directory.
-   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+
+   Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005, 2006 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
@@ -13,40 +15,36 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Written by Jim Meyering <meyering@na-net.ornl.gov>.  */
-
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#include <stdio.h>
-
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-#endif
+/* Written by Jim Meyering.  */
 
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
+#include <config.h>
 
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif
+#include "save-cwd.h"
 
 #include <errno.h>
-#ifndef errno
-extern int errno;
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "chdir-long.h"
+#include "fcntl--.h"
+#include "xgetcwd.h"
+
+/* On systems without the fchdir function (WOE), pretend that open
+   always returns -1 so that save_cwd resorts to using xgetcwd.
+   Since chdir_long requires fchdir, use chdir instead.  */
+#if !HAVE_FCHDIR
+# undef open
+# define open(File, Flags) (-1)
+# undef fchdir
+# define fchdir(Fd) (abort (), -1)
+# undef chdir_long
+# define chdir_long(Dir) chdir (Dir)
 #endif
 
-#include "save-cwd.h"
-#include "error.h"
-
-char *xgetcwd PARAMS ((void));
-
 /* Record the location of the current working directory in CWD so that
    the program may change to other directories and later use restore_cwd
    to return to the recorded location.  This function may allocate
@@ -54,98 +52,49 @@ char *xgetcwd PARAMS ((void));
    use free_cwd to perform the necessary free or close.  Upon failure,
    no memory is allocated, any locally opened file descriptors are
    closed;  return non-zero -- in that case, free_cwd need not be
-   called, but doing so is ok.  Otherwise, return zero.  */
+   called, but doing so is ok.  Otherwise, return zero.
+
+   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: 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 (cwd)
-     struct saved_cwd *cwd;
+save_cwd (struct saved_cwd *cwd)
 {
-  static int have_working_fchdir = 1;
-
-  cwd->desc = -1;
   cwd->name = NULL;
 
-  if (have_working_fchdir)
-    {
-#if HAVE_FCHDIR
-      cwd->desc = open (".", O_RDONLY);
-      if (cwd->desc < 0)
-	{
-	  error (0, errno, "cannot open current directory");
-	  return 1;
-	}
-
-# if __sun__ || sun
-      /* On SunOS 4, fchdir returns EINVAL if accounting 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
-	    {
-	      error (0, errno, "current directory");
-	      close (cwd->desc);
-	      cwd->desc = -1;
-	      return 1;
-	    }
-	}
-# endif /* __sun__ || sun */
-#else
-# define fchdir(x) (abort (), 0)
-      have_working_fchdir = 0;
-#endif
-    }
-
-  if (!have_working_fchdir)
+  cwd->desc = open (".", O_RDONLY);
+  if (cwd->desc < 0)
     {
       cwd->name = xgetcwd ();
-      if (cwd->name == NULL)
-	{
-	  error (0, errno, "cannot get current directory");
-	  return 1;
-	}
+      return cwd->name ? 0 : -1;
     }
+
   return 0;
 }
 
 /* Change to recorded location, CWD, in directory hierarchy.
-   If "saved working directory", NULL))
-   */
+   Upon failure, return -1 (errno is set by chdir or fchdir).
+   Upon success, return zero.  */
 
 int
-restore_cwd (cwd, dest, from)
-     const struct saved_cwd *cwd;
-     const char *dest;
-     const char *from;
+restore_cwd (const struct saved_cwd *cwd)
 {
-  int fail = 0;
-  if (cwd->desc >= 0)
-    {
-      if (fchdir (cwd->desc))
-	{
-	  error (0, errno, "cannot return to %s%s%s",
-		 (dest ? dest : "saved working directory"),
-		 (from ? " from " : ""),
-		 (from ? from : ""));
-	  fail = 1;
-	}
-    }
-  else if (chdir (cwd->name) < 0)
-    {
-      error (0, errno, "%s", cwd->name);
-      fail = 1;
-    }
-  return fail;
+  if (0 <= cwd->desc)
+    return fchdir (cwd->desc);
+  else
+    return chdir_long (cwd->name);
 }
 
 void
-free_cwd (cwd)
-     struct saved_cwd *cwd;
+free_cwd (struct saved_cwd *cwd)
 {
   if (cwd->desc >= 0)
     close (cwd->desc);