Changeset 1075

Timestamp:

Jul 15, 2007, 8:22:00 PM (18 years ago)

Author:

bird

Message:

Workaround for readdir on smbfs drive. (FreeBSD)

File:

• trunk/src/kmk/dir.c (modified) (2 diffs)

trunk/src/kmk/dir.c

@@ -42 +42 @@
 # endif /* HAVE_VMSDIR_H */
 #endif
+/* bird: FreeBSD + smbfs -> readdir() + EBADF */
+#ifdef __FreeBSD__
+# include <sys/mount.h>
+#endif
+/* bird: end */
 
 /* In GNU systems, <dirent.h> defines this macro for us.  */
@@ -679 +684 @@
       if (d == 0)
         {
+/* bird: Workaround for smbfs mounts returning EBADF at the end of the search. 
+         To exactly determin the cause here, I should probably do some smbfs
+         tracing, but for now just ignoring the EBADF on seems to work. 
+         (The smb server is 64-bit vista, btw.) */
+#if defined (__FreeBSD__)
+          struct statfs stfs;
+          int saved_errno = errno;
+          errno = 0;
+          if (saved_errno == EBADF
+           && !fstatfs (dirfd (dir->dirstream), &stfs)
+           && !(stfs.f_flags & MNT_LOCAL)
+           && !strcmp(stfs.f_fstypename, "smbfs"))
+            {
+              /*fprintf (stderr, "EBADF on remote fs! dirfd=%d errno=%d\n", 
+                       dirfd (dir->dirstream), errno);*/
+              saved_errno = 0;
+            }
+          errno = saved_errno;
+#endif
+/* bird: end */
           if (errno)
             fatal (NILF, "INTERNAL: readdir(%p): %s (filename=%s)\n", dir, strerror (errno), filename);