projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make fflush after ungetc work on BSD platforms.
[gnulib.git]
/
lib
/
savewd.c
diff --git
a/lib/savewd.c
b/lib/savewd.c
index
c9af955
..
c4893ef
100644
(file)
--- a/
lib/savewd.c
+++ b/
lib/savewd.c
@@
-1,11
+1,11
@@
/* Save and restore the working directory, possibly using a child process.
/* Save and restore the working directory, possibly using a child process.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 2007
Free 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
@@
-13,8
+13,7
@@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
@@
-25,15
+24,19
@@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
+#include <signal.h>
#include <stdbool.h>
#include <stdbool.h>
+#include <stdlib.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
-#include "exit.h"
#include "dirname.h"
#include "fcntl-safer.h"
#include "dirname.h"
#include "fcntl-safer.h"
+#ifndef ESTALE
+# define ESTALE -1
+#endif
/* Save the working directory into *WD, if it hasn't been saved
already. Return true if a child has been forked to do the real
/* Save the working directory into *WD, if it hasn't been saved
already. Return true if a child has been forked to do the real
@@
-53,7
+56,7
@@
savewd_save (struct savewd *wd)
wd->val.fd = fd;
break;
}
wd->val.fd = fd;
break;
}
- if (errno != EACCES)
+ if (errno != EACCES
&& errno != ESTALE
)
{
wd->state = ERROR_STATE;
wd->val.errnum = errno;
{
wd->state = ERROR_STATE;
wd->val.errnum = errno;
@@
-102,7
+105,8
@@
savewd_chdir (struct savewd *wd, char const *dir, int options,
/* Open the directory if requested, or if avoiding a race condition
is requested and possible. */
/* Open the directory if requested, or if avoiding a race condition
is requested and possible. */
- if (open_result || (options & (O_NOFOLLOW ? SAVEWD_CHDIR_NOFOLLOW : 0)))
+ if (open_result
+ || (options & (HAVE_WORKING_O_NOFOLLOW ? SAVEWD_CHDIR_NOFOLLOW : 0)))
{
fd = open (dir,
(O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK
{
fd = open (dir,
(O_RDONLY | O_DIRECTORY | O_NOCTTY | O_NONBLOCK
@@
-201,13
+205,13
@@
savewd_restore (struct savewd *wd, int status)
_exit (status);
if (0 < child)
{
_exit (status);
if (0 < child)
{
- int status;
- while (waitpid (child, &status, 0) < 0)
+ int
child_
status;
+ while (waitpid (child, &
child_
status, 0) < 0)
assert (errno == EINTR);
wd->val.child = -1;
assert (errno == EINTR);
wd->val.child = -1;
- if (! WIFEXITED (status))
- raise (WTERMSIG (status));
- return WEXITSTATUS (status);
+ if (! WIFEXITED (
child_
status))
+ raise (WTERMSIG (
child_
status));
+ return WEXITSTATUS (
child_
status);
}
}
break;
}
}
break;