projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Take into account the number of pushed-back bytes (ungetc).
[gnulib.git]
/
lib
/
save-cwd.c
diff --git
a/lib/save-cwd.c
b/lib/save-cwd.c
index
4dcf0d5
..
e158e8b
100644
(file)
--- a/
lib/save-cwd.c
+++ b/
lib/save-cwd.c
@@
-1,12
+1,12
@@
/* 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
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,35
+14,22
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* 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 "
unistd-safer
.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
@@
-82,15
+69,11
@@
save_cwd (struct saved_cwd *cwd)
{
cwd->name = NULL;
{
cwd->name = NULL;
- cwd->desc =
fd_safer (open (".", O_RDONLY)
);
+ cwd->desc =
open (".", O_RDONLY
);
if (cwd->desc < 0)
{
if (cwd->desc < 0)
{
- cwd->desc = fd_safer (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;
@@
-114,6
+97,5
@@
free_cwd (struct saved_cwd *cwd)
{
if (cwd->desc >= 0)
close (cwd->desc);
{
if (cwd->desc >= 0)
close (cwd->desc);
- if (cwd->name)
- free (cwd->name);
+ free (cwd->name);
}
}