projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant AC_SUBST invocation.
[gnulib.git]
/
lib
/
openat-die.c
diff --git
a/lib/openat-die.c
b/lib/openat-die.c
index
6bc533d
..
a8639e1
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.
/* 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
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 <config.h>
#include <config.h>
+#include "openat.h"
+
#include <stdlib.h>
#include "error.h"
#include <stdlib.h>
#include "error.h"
@@
-24,13
+26,12
@@
#include "gettext.h"
#define _(msgid) gettext (msgid)
#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, errn
o
,
- _("unable to record current working directory"));
+ error (exit_failure, errn
um
,
+
_("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
/* 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 ();
}
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, errn
o
,
- _("failed to return to initial working directory"));
+ error (exit_failure, errn
um
,
+
_("failed to return to initial working directory"));
/* As above. */
abort ();
/* As above. */
abort ();