X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fopenat-die.c;h=a8639e11dedd95b5cd281aa1016ac918adbd9c21;hb=bf776338948242ad73595b46d80b7b2930c816c3;hp=e274ff6e1b0e4c9935fc91aabe162e45dc4d6e78;hpb=9db27e416179e3b92ae18be230250d08ae6190f5;p=gnulib.git

diff --git a/lib/openat-die.c b/lib/openat-die.c
index e274ff6e1..a8639e11d 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-2010 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 <http://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
+
+#include "openat.h"
 
 #include <stdlib.h>
 
@@ -27,13 +26,12 @@
 
 #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,
-	 _("unable to record current working directory"));
+  error (exit_failure, errnum,
+         _("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
@@ -42,11 +40,16 @@ 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,
-	 _("failed to return to initial working directory"));
+  error (exit_failure, errnum,
+         _("failed to return to initial working directory"));
 
   /* As above.  */
   abort ();