projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
trunc: Move AC_LIBOBJ invocations to module description.
[gnulib.git]
/
lib
/
at-func.c
diff --git
a/lib/at-func.c
b/lib/at-func.c
index
cc7bfc2
..
52868bc
100644
(file)
--- a/
lib/at-func.c
+++ b/
lib/at-func.c
@@
-1,5
+1,5
@@
/* Define an at-style functions like fstatat, unlinkat, fchownat, etc.
/* Define an at-style functions like fstatat, unlinkat, fchownat, etc.
- Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2009
-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
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
@@
-16,21
+16,21
@@
/* written by Jim Meyering */
/* written by Jim Meyering */
-#include "d
ir
name.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
+#include "d
os
name.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */
#include "openat.h"
#include "openat-priv.h"
#include "save-cwd.h"
#ifdef AT_FUNC_USE_F1_COND
#include "openat.h"
#include "openat-priv.h"
#include "save-cwd.h"
#ifdef AT_FUNC_USE_F1_COND
-# define CALL_FUNC(F) \
- (flag == AT_FUNC_USE_F1_COND \
- ? AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS) \
+# define CALL_FUNC(F)
\
+ (flag == AT_FUNC_USE_F1_COND
\
+ ? AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS)
\
: AT_FUNC_F2 (F AT_FUNC_POST_FILE_ARGS))
: AT_FUNC_F2 (F AT_FUNC_POST_FILE_ARGS))
-# define VALIDATE_FLAG(F) \
- if (flag & ~AT_FUNC_USE_F1_COND) \
- { \
- errno = EINVAL; \
- return FUNC_FAIL;
\
+# define VALIDATE_FLAG(F)
\
+ if (flag & ~AT_FUNC_USE_F1_COND)
\
+ {
\
+ errno = EINVAL;
\
+ return FUNC_FAIL; \
}
#else
# define CALL_FUNC(F) (AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS))
}
#else
# define CALL_FUNC(F) (AT_FUNC_F1 (F AT_FUNC_POST_FILE_ARGS))
@@
-115,7
+115,7
@@
AT_FUNC_NAME (int fd, char const *file AT_FUNC_POST_FILE_PARAM_DECLS)
}
err = CALL_FUNC (file);
}
err = CALL_FUNC (file);
- saved_errno = (err
< 0
? errno : 0);
+ saved_errno = (err
== FUNC_FAIL
? errno : 0);
if (restore_cwd (&saved_cwd) != 0)
openat_restore_fail (errno);
if (restore_cwd (&saved_cwd) != 0)
openat_restore_fail (errno);