projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftruncate: Un-deprecate, concentrate on Win32 support.
[gnulib.git]
/
lib
/
openat-die.c
diff --git
a/lib/openat-die.c
b/lib/openat-die.c
index
7a28570
..
0d0643b
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
, 2006
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,38
+13,49
@@
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/>. */
#include <config.h>
#include <config.h>
+#include "openat.h"
+
#include <stdlib.h>
#include <stdlib.h>
-#include "error.h"
+#ifndef GNULIB_LIBPOSIX
+# include "error.h"
+#endif
+
#include "exitfail.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#include "exitfail.h"
#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, errno,
- _("unable to record current working directory"));
-
- /* The `noreturn' attribute cannot be applied to error, since it returns
+#ifndef GNULIB_LIBPOSIX
+ error (exit_failure, errnum,
+ _("unable to record current working directory"));
+#endif
+ /* _Noreturn cannot be applied to error, since it returns
when its first argument is 0. To help compilers understand that this
function does not return, call abort. Also, the abort is a
safety feature if exit_failure is 0 (which shouldn't happen). */
abort ();
}
when its first argument is 0. To help compilers understand that this
function does not return, call abort. Also, the abort is a
safety feature if exit_failure is 0 (which shouldn't happen). */
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, errno,
- _("failed to return to initial working directory"));
+#ifndef GNULIB_LIBPOSIX
+ error (exit_failure, errnum,
+ _("failed to return to initial working directory"));
+#endif
/* As above. */
abort ();
/* As above. */
abort ();