projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pwrite: Fix test whether it works and make it work on HP-UX 11.11.
[gnulib.git]
/
lib
/
openat-die.c
diff --git
a/lib/openat-die.c
b/lib/openat-die.c
index
e274ff6
..
0db20b9
100644
(file)
--- a/
lib/openat-die.c
+++ b/
lib/openat-die.c
@@
-1,11
+1,11
@@
/* Report a save- or restore-cwd failure in our openat replacement and then exit.
/* Report a save- or restore-cwd failure in our openat replacement and then exit.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005
-2006, 2008-2011
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,12
+13,11
@@
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/>. */
-#i
fdef HAVE_CONFIG_H
-# include <config.h>
-#
endif
+#i
nclude <config.h>
+
+#
include "openat.h"
#include <stdlib.h>
#include <stdlib.h>
@@
-27,13
+26,12
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
void
void
-openat_save_fail (int errn
o
)
+openat_save_fail (int errn
um
)
{
{
- error (exit_failure, errn
o
,
- _("unable to record current working directory"));
+ error (exit_failure, errn
um
,
+
_("unable to record current working directory"));
/* The `noreturn' attribute cannot be applied to error, since it returns
when its first argument is 0. To help compilers understand that this
/* The `noreturn' attribute cannot be applied to error, since it returns
when its first argument is 0. To help compilers understand that this
@@
-42,11
+40,16
@@
openat_save_fail (int errno)
abort ();
}
abort ();
}
+
+/* Exit with an error about failure to restore the working directory
+ during an openat emulation. The caller must ensure that fd 2 is
+ not a just-opened fd, even when openat_safer is not in use. */
+
void
void
-openat_restore_fail (int errn
o
)
+openat_restore_fail (int errn
um
)
{
{
- error (exit_failure, errn
o
,
- _("failed to return to initial working directory"));
+ error (exit_failure, errn
um
,
+
_("failed to return to initial working directory"));
/* As above. */
abort ();
/* As above. */
abort ();