refactor all stat functions in terms of fstatat

equivalent logic for fstat+O_PATH fallback and direct use of
stat/lstat syscalls where appropriate is kept, now in the fstatat
function. this change both improves functionality (now, fstatat forms
equivalent to fstat/lstat/stat will work even on kernels too old to
have the at functions) and localizes direct interfacing with the
kernel stat structure to one file.

diff --git a/src/stat/fstat.c b/src/stat/fstat.c
index 4f13f4f0e39eacfb63010353810c5387bba817f6..d2a828f32c64bf4686e995672243f1c8ce77766d 100644 (file)
--- a/src/stat/fstat.c
+++ b/src/stat/fstat.c
@@ -1,3 +1,4 @@
+#define _BSD_SOURCE
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -5,17 +6,7 @@
 
 int fstat(int fd, struct stat *st)
 {
-       int ret = __syscall(SYS_fstat, fd, st);
-       if (ret != -EBADF || __syscall(SYS_fcntl, fd, F_GETFD) < 0)
-               return __syscall_ret(ret);
-
-       char buf[15+3*sizeof(int)];
-       __procfdname(buf, fd);
-#ifdef SYS_stat
-       return syscall(SYS_stat, buf, st);
-#else
-       return syscall(SYS_fstatat, AT_FDCWD, buf, st, 0);
-#endif
+       return fstatat(fd, "", st, AT_EMPTY_PATH);
 }
 
 weak_alias(fstat, fstat64);

diff --git a/src/stat/fstatat.c b/src/stat/fstatat.c
index 582db44292d9965b6a38532d02d739b4d86bc5bb..f5bc3685e77476b4d0fd69a1dfb726a00e6b6892 100644 (file)
--- a/src/stat/fstatat.c
+++ b/src/stat/fstatat.c
@@ -1,9 +1,40 @@
+#define _BSD_SOURCE
 #include <sys/stat.h>
+#include <string.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
 
-int fstatat(int fd, const char *restrict path, struct stat *restrict buf, int flag)
+int fstatat(int fd, const char *restrict path, struct stat *restrict st, int flag)
 {
-       return syscall(SYS_fstatat, fd, path, buf, flag);
+       int ret;
+
+       if (flag==AT_EMPTY_PATH && fd>=0 && !*path) {
+               ret = __syscall(SYS_fstat, fd, st);
+               if (ret==-EBADF && __syscall(SYS_fcntl, fd, F_GETFD)>=0) {
+                       ret = __syscall(SYS_fstatat, fd, path, st, flag);
+                       if (ret==-EINVAL) {
+                               char buf[15+3*sizeof(int)];
+                               __procfdname(buf, fd);
+#ifdef SYS_stat
+                               ret = __syscall(SYS_stat, buf, st);
+#else
+                               ret = __syscall(SYS_fstatat, AT_FDCWD, buf, st, 0);
+#endif
+                       }
+               }
+       }
+#ifdef SYS_lstat
+       else if ((fd == AT_FDCWD || *path=='/') && flag==AT_SYMLINK_NOFOLLOW)
+               ret = __syscall(SYS_lstat, path, st);
+#endif
+#ifdef SYS_stat
+       else if ((fd == AT_FDCWD || *path=='/') && !flag)
+               ret = __syscall(SYS_stat, path, st);
+#endif
+       else ret = __syscall(SYS_fstatat, fd, path, st, flag);
+
+       return __syscall_ret(ret);
 }
 
 weak_alias(fstatat, fstatat64);

diff --git a/src/stat/lstat.c b/src/stat/lstat.c
index 5b89f290dc1292c2c1e4abf0fc079f7e031c377e..8b365ba284fed848420c62cf9ab2c4e194273e02 100644 (file)
--- a/src/stat/lstat.c
+++ b/src/stat/lstat.c
@@ -4,11 +4,7 @@
 
 int lstat(const char *restrict path, struct stat *restrict buf)
 {
-#ifdef SYS_lstat
-       return syscall(SYS_lstat, path, buf);
-#else
-       return syscall(SYS_fstatat, AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW);
-#endif
+       return fstatat(AT_FDCWD, path, buf, AT_SYMLINK_NOFOLLOW);
 }
 
 weak_alias(lstat, lstat64);

diff --git a/src/stat/stat.c b/src/stat/stat.c
index 0bec9d6fa972e7dab9c1611a867214fa85f28917..b4e627957654316d5e42aa8172d824b5989a8c36 100644 (file)
--- a/src/stat/stat.c
+++ b/src/stat/stat.c
@@ -4,11 +4,7 @@
 
 int stat(const char *restrict path, struct stat *restrict buf)
 {
-#ifdef SYS_stat
-       return syscall(SYS_stat, path, buf);
-#else
-       return syscall(SYS_fstatat, AT_FDCWD, path, buf, 0);
-#endif
+       return fstatat(AT_FDCWD, path, buf, 0);
 }
 
 weak_alias(stat, stat64);