projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move to here from utf16-ucs4.h.
[gnulib.git]
/
lib
/
save-cwd.c
diff --git
a/lib/save-cwd.c
b/lib/save-cwd.c
index
fe4bb97
..
f07973a
100644
(file)
--- a/
lib/save-cwd.c
+++ b/
lib/save-cwd.c
@@
-1,7
+1,7
@@
/* save-cwd.c -- Save and restore current working directory.
/* save-cwd.c -- Save and restore current working directory.
- Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1995, 1997, 1998, 2003, 2004, 2005
, 2006 Fre
e
+
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
@@
-15,33
+15,22
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Jim Meyering. */
/* Written by Jim Meyering. */
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <config.h>
#include "save-cwd.h"
#include "save-cwd.h"
+#include <errno.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
-
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#if HAVE_FCNTL_H
-# include <fcntl.h>
-#else
-# include <sys/file.h>
-#endif
-
-#include <errno.h>
+#include <unistd.h>
#include "chdir-long.h"
#include "chdir-long.h"
+#include "fcntl--.h"
#include "xgetcwd.h"
/* On systems without the fchdir function (WOE), pretend that open
#include "xgetcwd.h"
/* On systems without the fchdir function (WOE), pretend that open
@@
-49,7
+38,7
@@
Since chdir_long requires fchdir, use chdir instead. */
#if !HAVE_FCHDIR
# undef open
Since chdir_long requires fchdir, use chdir instead. */
#if !HAVE_FCHDIR
# undef open
-# define open(File, Flags)
-1
+# define open(File, Flags)
(-1)
# undef fchdir
# define fchdir(Fd) (abort (), -1)
# undef chdir_long
# undef fchdir
# define fchdir(Fd) (abort (), -1)
# undef chdir_long
@@
-84,12
+73,8
@@
save_cwd (struct saved_cwd *cwd)
cwd->desc = open (".", O_RDONLY);
if (cwd->desc < 0)
{
cwd->desc = open (".", O_RDONLY);
if (cwd->desc < 0)
{
- cwd->desc = open (".", O_WRONLY);
- if (cwd->desc < 0)
- {
- cwd->name = xgetcwd ();
- return cwd->name ? 0 : -1;
- }
+ cwd->name = xgetcwd ();
+ return cwd->name ? 0 : -1;
}
return 0;
}
return 0;