[2464]

[Vladimir Serbinenko]

Revision: 2464
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2464
Author:   phcoder
Date:     2009-08-01 14:44:15 +0000 (Sat, 01 Aug 2009)
Log Message:
-----------


Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/hostfs.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-01 14:40:30 UTC (rev 2463)
+++ trunk/grub2/ChangeLog       2009-08-01 14:44:15 UTC (rev 2464)
@@ -1,3 +1,8 @@
+2009-07-23  Vladimir Serbinenko  <address@hidden>
+
+       * util/hostfs.c (grub_hostfs_dir): Don't use DT_DIR: It doesn't work
+       on XFS or ReiserFS.
+
 2009-08-01  Vladimir Serbinenko  <address@hidden>
 
        Support Apple partition map with sector size different from 512 bytes.

Modified: trunk/grub2/util/hostfs.c
===================================================================
--- trunk/grub2/util/hostfs.c   2009-08-01 14:40:30 UTC (rev 2463)
+++ trunk/grub2/util/hostfs.c   2009-08-01 14:44:15 UTC (rev 2464)
@@ -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 @@
     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 @@
       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);
 
     }