(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 76e8c680cfd6050099e3e44f059b4e25cb2ee934..f104a7c4910ccbedcf631afe93bb0403071e18f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/hostfs.c (grub_hostfs_dir): Don't use DT_DIR: It doesn't work
+       on XFS or ReiserFS.
+
 2009-08-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Support Apple partition map with sector size different from 512 bytes.

diff --git a/util/hostfs.c b/util/hostfs.c
index 1b963bb67e4dce19b8f23b44f3a1c57e806ca98c..83db2f1a9c12a3fa4b75279727a0045ffdcb9952 100644 (file)
--- a/util/hostfs.c
+++ b/util/hostfs.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 
 
-#ifndef DT_DIR
 /* dirent.d_type is a BSD extension, not part of POSIX */
 #include <sys/stat.h>
 #include <string.h>
@@ -53,7 +52,6 @@ is_dir (const char *path, const char *name)
     return 0;
   return S_ISDIR (st.st_mode);
 }
-#endif
 
 static grub_err_t
 grub_hostfs_dir (grub_device_t device, const char *path,
@@ -81,11 +79,7 @@ grub_hostfs_dir (grub_device_t device, const char *path,
       if (! de)
        break;
 
-#ifdef DT_DIR
-      info.dir = (de->d_type == DT_DIR);
-#else
       info.dir = !! is_dir (path, de->d_name);
-#endif
       hook (de->d_name, &info);
 
     }