projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[gnulib.git]
/
lib
/
save-cwd.c
diff --git
a/lib/save-cwd.c
b/lib/save-cwd.c
index
87a34e3
..
b77edb3
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.
/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995 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
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
@@
-17,7
+17,7
@@
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */
-#if
def
HAVE_CONFIG_H
+#if HAVE_CONFIG_H
# include "config.h"
#endif
# include "config.h"
#endif
@@
-27,25
+27,29
@@
# include <stdlib.h>
#endif
# include <stdlib.h>
#endif
-#if
def
HAVE_UNISTD_H
+#if HAVE_UNISTD_H
# include <unistd.h>
#endif
# include <unistd.h>
#endif
-#if
def
HAVE_FCNTL_H
+#if HAVE_FCNTL_H
# include <fcntl.h>
#else
# include <sys/file.h>
#endif
#include <errno.h>
# include <fcntl.h>
#else
# include <sys/file.h>
#endif
#include <errno.h>
-#
ifndef errno
+#ifndef errno
extern int errno;
#endif
extern int errno;
#endif
+#ifndef O_DIRECTORY
+# define O_DIRECTORY 0
+#endif
+
#include "save-cwd.h"
#include "error.h"
#include "save-cwd.h"
#include "error.h"
-char *xgetcwd
__P
((void));
+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
/* 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 __P((void));
called, but doing so is ok. Otherwise, return zero. */
int
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;
{
static int have_working_fchdir = 1;
@@
-67,8
+70,8
@@
save_cwd (cwd)
if (have_working_fchdir)
{
if (have_working_fchdir)
{
-#if
def
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");
if (cwd->desc < 0)
{
error (0, errno, "cannot open current directory");
@@
-96,7
+99,7
@@
save_cwd (cwd)
}
# endif /* __sun__ || sun */
#else
}
# endif /* __sun__ || sun */
#else
-#define fchdir(x) (abort (), 0)
+#
define fchdir(x) (abort (), 0)
have_working_fchdir = 0;
#endif
}
have_working_fchdir = 0;
#endif
}
@@
-118,10
+121,7
@@
save_cwd (cwd)
*/
int
*/
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)
{
int fail = 0;
if (cwd->desc >= 0)
@@
-144,12
+144,10
@@
restore_cwd (cwd, dest, from)
}
void
}
void
-free_cwd (cwd)
- struct saved_cwd *cwd;
+free_cwd (struct saved_cwd *cwd)
{
if (cwd->desc >= 0)
close (cwd->desc);
if (cwd->name)
free (cwd->name);
}
{
if (cwd->desc >= 0)
close (cwd->desc);
if (cwd->name)
free (cwd->name);
}
-