projects
/
debian
/
gzip
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zgrep man page updated in new upstream release
[debian/gzip]
/
lib
/
openat.h
diff --git
a/lib/openat.h
b/lib/openat.h
index 11a0314d2426d820ae0c39bfe9e58e8f7eeb6b7d..edee6c56554546c1079fd4cb11aa55af76a4f298 100644
(file)
--- a/
lib/openat.h
+++ b/
lib/openat.h
@@
-1,5
+1,5
@@
/* provide a replacement openat function
/* provide a replacement openat function
- Copyright (C) 2004-2006, 2008-201
0
Free Software Foundation, Inc.
+ Copyright (C) 2004-2006, 2008-201
6
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
@@
-23,19
+23,13
@@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <dirent.h>
#include <unistd.h>
#include <stdbool.h>
#include <unistd.h>
#include <stdbool.h>
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-# define __attribute__(x) /* empty */
-# endif
-#endif
-
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#ifndef _GL_INLINE_HEADER_BEGIN
+ #error "Please include config.h first."
#endif
#endif
+_GL_INLINE_HEADER_BEGIN
#if !HAVE_OPENAT
#if !HAVE_OPENAT
@@
-51,64
+45,79
@@
bool openat_needs_fchdir (void);
#endif
#endif
-
void openat_restore_fail (int) ATTRIBUTE_NORETURN
;
-
void openat_save_fail (int) ATTRIBUTE_NORETURN
;
+
_Noreturn void openat_restore_fail (int)
;
+
_Noreturn void openat_save_fail (int)
;
/* Using these function names makes application code
slightly more readable than it would be with
fchownat (..., 0) or fchownat (..., AT_SYMLINK_NOFOLLOW). */
/* Using these function names makes application code
slightly more readable than it would be with
fchownat (..., 0) or fchownat (..., AT_SYMLINK_NOFOLLOW). */
-static inline int
+
+#if GNULIB_FCHOWNAT
+
+# ifndef FCHOWNAT_INLINE
+# define FCHOWNAT_INLINE _GL_INLINE
+# endif
+
+FCHOWNAT_INLINE int
chownat (int fd, char const *file, uid_t owner, gid_t group)
{
return fchownat (fd, file, owner, group, 0);
}
chownat (int fd, char const *file, uid_t owner, gid_t group)
{
return fchownat (fd, file, owner, group, 0);
}
-
static inline
int
+
FCHOWNAT_INLINE
int
lchownat (int fd, char const *file, uid_t owner, gid_t group)
{
return fchownat (fd, file, owner, group, AT_SYMLINK_NOFOLLOW);
}
lchownat (int fd, char const *file, uid_t owner, gid_t group)
{
return fchownat (fd, file, owner, group, AT_SYMLINK_NOFOLLOW);
}
-static inline int
+#endif
+
+#if GNULIB_FCHMODAT
+
+# ifndef FCHMODAT_INLINE
+# define FCHMODAT_INLINE _GL_INLINE
+# endif
+
+FCHMODAT_INLINE int
chmodat (int fd, char const *file, mode_t mode)
{
return fchmodat (fd, file, mode, 0);
}
chmodat (int fd, char const *file, mode_t mode)
{
return fchmodat (fd, file, mode, 0);
}
-
static inline
int
+
FCHMODAT_INLINE
int
lchmodat (int fd, char const *file, mode_t mode)
{
return fchmodat (fd, file, mode, AT_SYMLINK_NOFOLLOW);
}
lchmodat (int fd, char const *file, mode_t mode)
{
return fchmodat (fd, file, mode, AT_SYMLINK_NOFOLLOW);
}
-static inline int
+#endif
+
+#if GNULIB_STATAT
+
+# ifndef STATAT_INLINE
+# define STATAT_INLINE _GL_INLINE
+# endif
+
+STATAT_INLINE int
statat (int fd, char const *name, struct stat *st)
{
return fstatat (fd, name, st, 0);
}
statat (int fd, char const *name, struct stat *st)
{
return fstatat (fd, name, st, 0);
}
-
static inline
int
+
STATAT_INLINE
int
lstatat (int fd, char const *name, struct stat *st)
{
return fstatat (fd, name, st, AT_SYMLINK_NOFOLLOW);
}
lstatat (int fd, char const *name, struct stat *st)
{
return fstatat (fd, name, st, AT_SYMLINK_NOFOLLOW);
}
-#if GNULIB_FACCESSAT
+#endif
+
/* For now, there are no wrappers named laccessat or leuidaccessat,
since gnulib doesn't support faccessat(,AT_SYMLINK_NOFOLLOW) and
/* For now, there are no wrappers named laccessat or leuidaccessat,
since gnulib doesn't support faccessat(,AT_SYMLINK_NOFOLLOW) and
- since access rights on symlinks are of limited utility. */
+ since access rights on symlinks are of limited utility. Likewise,
+ wrappers are not provided for accessat or euidaccessat, so as to
+ avoid dragging in -lgen on some platforms. */
-static inline int
-accessat (int fd, char const *file, int mode)
-{
- return faccessat (fd, file, mode, 0);
-}
-
-static inline int
-euidaccessat (int fd, char const *file, int mode)
-{
- return faccessat (fd, file, mode, AT_EACCESS);
-}
-#endif
+_GL_INLINE_HEADER_END
#endif /* _GL_HEADER_OPENAT */
#endif /* _GL_HEADER_OPENAT */