Switch from LGPL to GPL.

[gnulib.git] / lib / save-cwd.c

diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 40bd70b..c18d088 100644 (file)
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -1,5 +1,5 @@
 /* save-cwd.c -- Save and restore current working directory.
-   Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1997, 1998, 2003 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
@@ -42,10 +42,14 @@
 extern int errno;
 #endif
 
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
 #include "save-cwd.h"
 #include "error.h"
 
-char *xgetcwd PARAMS ((void));
+char *xgetcwd (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
@@ -57,8 +61,7 @@ char *xgetcwd PARAMS ((void));
    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;
 
@@ -68,7 +71,7 @@ save_cwd (cwd)
   if (have_working_fchdir)
     {
 #if HAVE_FCHDIR
-      cwd->desc = open (".", O_RDONLY);
+      cwd->desc = open (".", O_RDONLY | O_DIRECTORY);
       if (cwd->desc < 0)
        {
          error (0, errno, "cannot open current directory");
@@ -118,10 +121,7 @@ save_cwd (cwd)
    */
 
 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)
@@ -144,8 +144,7 @@ restore_cwd (cwd, dest, from)
 }
 
 void
-free_cwd (cwd)
-     struct saved_cwd *cwd;
+free_cwd (struct saved_cwd *cwd)
 {
   if (cwd->desc >= 0)
     close (cwd->desc);