Merge pull request #779 from LLNL/fstat

define stat wrappers depending on whether symbol is found
LLNL · Jul 10, 2023 · 4f50687 · 4f50687
2 parents f95abed + f19fac5
commit 4f50687
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/client/src/unifyfs-stdio.c b/client/src/unifyfs-stdio.c
@@ -3043,9 +3043,10 @@ __svfscanf(unifyfs_stream_t* fp, const char* fmt0, va_list ap)
  * considered part of the scanset.
  */
 static const u_char*
-__sccl(tab, fmt)
-char* tab;
-const u_char* fmt;
+__sccl(char* tab, const u_char* fmt)
+//__sccl(tab, fmt)
+//char* tab;
+//const u_char* fmt;
 {
     int c, n, v;
 

diff --git a/client/src/unifyfs-sysio.c b/client/src/unifyfs-sysio.c
@@ -788,6 +788,11 @@ static int __stat(const char* path, struct stat* buf)
     return 0;
 }
 
+#if defined(HAVE_STAT64)     || \
+    defined(HAVE_FSTAT64)    || \
+    defined(HAVE___XSTAT64)  || \
+    defined(HAVE___LXSTAT64) || \
+    defined(HAVE___FXSTAT64)
 static int __stat64(const char* path, struct stat64* buf)
 {
     /* check that caller gave us a buffer to write to */
@@ -834,7 +839,7 @@ static int __stat64(const char* path, struct stat64* buf)
     errno = 0;
     return 0;
 }
-
+#endif
 
 int UNIFYFS_WRAP(stat)(const char* path, struct stat* buf)
 {
@@ -851,6 +856,7 @@ int UNIFYFS_WRAP(stat)(const char* path, struct stat* buf)
     }
 }
 
+#ifdef HAVE_STAT64
 int UNIFYFS_WRAP(stat64)(const char* path, struct stat64* buf)
 {
     LOGDBG("stat64 was called for %s", path);
@@ -864,21 +870,22 @@ int UNIFYFS_WRAP(stat64)(const char* path, struct stat64* buf)
         int ret = UNIFYFS_REAL(stat64)(path, buf);
         return ret;
     }
-    return 0;
 }
+#endif
 
 int UNIFYFS_WRAP(fstat)(int fd, struct stat* buf)
 {
     LOGDBG("fstat was called for fd: %d", fd);
 
     /* check whether we should intercept this file descriptor */
     if (unifyfs_intercept_fd(&fd)) {
-        int fid = unifyfs_get_fid_from_fd(fd);
         /* check if the file is still active (e.g., not closed) */
+        int fid = unifyfs_get_fid_from_fd(fd);
         if (fid == -1) {
             errno = EBADF;
             return -1;
         }
+
         const char* path = unifyfs_path_from_fid(posix_client, fid);
         int ret = __stat(path, buf);
         return ret;
@@ -889,13 +896,20 @@ int UNIFYFS_WRAP(fstat)(int fd, struct stat* buf)
     }
 }
 
+#ifdef HAVE_FSTAT64
 int UNIFYFS_WRAP(fstat64)(int fd, struct stat64* buf)
 {
     LOGDBG("fstat64 was called for fd: %d", fd);
 
     /* check whether we should intercept this file descriptor */
     if (unifyfs_intercept_fd(&fd)) {
+        /* check if the file is still active (e.g., not closed) */
         int fid = unifyfs_get_fid_from_fd(fd);
+        if (fid == -1) {
+            errno = EBADF;
+            return -1;
+        }
+
         const char* path = unifyfs_path_from_fid(posix_client, fid);
         int ret = __stat64(path, buf);
         return ret;
@@ -905,6 +919,7 @@ int UNIFYFS_WRAP(fstat64)(int fd, struct stat64* buf)
         return ret;
     }
 }
+#endif
 
 /*
  * NOTE on __xstat(2), __lxstat(2), and __fxstat(2)