X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fopenat-die.c;h=a8639e11dedd95b5cd281aa1016ac918adbd9c21;hb=2c35d5c11d2359c7ebb06a3388a544cbe2f9c7f5;hp=6bc533d07f78b1468eb2972c71678bc4b4e537b1;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git diff --git a/lib/openat-die.c b/lib/openat-die.c index 6bc533d07..a8639e11d 100644 --- 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 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 it under the terms of the GNU General Public License as published by @@ -17,6 +17,8 @@ #include +#include "openat.h" + #include #include "error.h" @@ -24,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 @@ -39,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 ();