opendir-safer.c: don't clobber errno; don't close negative FD

[pspp] / lib / openat-die.c

diff --git a/lib/openat-die.c b/lib/openat-die.c
index 81498ae2e3ec723a8955bf7559a4ffa5ec534cd5..ea36dda8918dc69523650d8b80d20273f93bc410 100644 (file)
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -1,6 +1,6 @@
 /* Report a save- or restore-cwd failure in our openat replacement and then exit.
 
-   Copyright (C) 2005, 2006, 2008 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
    it under the terms of the GNU General Public License as published by
@@ -21,19 +21,22 @@
 
 #include <stdlib.h>
 
-#include "error.h"
+#ifndef GNULIB_LIBPOSIX
+# include "error.h"
+#endif
+
 #include "exitfail.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
 
 void
 openat_save_fail (int errnum)
 {
+#ifndef GNULIB_LIBPOSIX
   error (exit_failure, errnum,
-        _("unable to record current working directory"));
-
+         _("unable to record current working directory"));
+#endif
   /* The `noreturn' attribute 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
@@ -41,11 +44,18 @@ openat_save_fail (int errnum)
   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 errnum)
 {
+#ifndef GNULIB_LIBPOSIX
   error (exit_failure, errnum,
-        _("failed to return to initial working directory"));
+         _("failed to return to initial working directory"));
+#endif
 
   /* As above.  */
   abort ();