X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fopenat-die.c;h=a507eac10e26d026e733f7c1652bb4be25616073;hb=e29e19dce9e19be76fae92b0955d02c843333093;hp=f7cc15dbcdc6487bd2ad9e0de763e3ec0b9f1f6b;hpb=357e1c26576e584fbc24b72798d2f7cf70bd9867;p=gnulib.git
diff --git a/lib/openat-die.c b/lib/openat-die.c
index f7cc15dbc..a507eac10 100644
--- 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.
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006, 2008-2009 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
- 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
@@ -13,12 +13,11 @@
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 . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include "openat.h"
#include
@@ -27,12 +26,11 @@
#include "gettext.h"
#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
void
-openat_save_fail (int errno)
+openat_save_fail (int errnum)
{
- error (exit_failure, errno,
+ error (exit_failure, errnum,
_("unable to record current working directory"));
/* The `noreturn' attribute cannot be applied to error, since it returns
@@ -42,10 +40,15 @@ openat_save_fail (int errno)
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
-openat_restore_fail (int errno)
+openat_restore_fail (int errnum)
{
- error (exit_failure, errno,
+ error (exit_failure, errnum,
_("failed to return to initial working directory"));
/* As above. */