projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
save-cwd.c
diff --git
a/lib/save-cwd.c
b/lib/save-cwd.c
index
40bd70b
..
b77edb3
100644
(file)
--- a/
lib/save-cwd.c
+++ b/
lib/save-cwd.c
@@
-42,6
+42,10
@@
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"
@@
-57,8
+61,7
@@
char *xgetcwd PARAMS ((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;
@@
-68,7
+71,7
@@
save_cwd (cwd)
if (have_working_fchdir)
{
#if HAVE_FCHDIR
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");
if (cwd->desc < 0)
{
error (0, errno, "cannot open current directory");
@@
-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,8
+144,7
@@
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->desc >= 0)
close (cwd->desc);