Huw Davies : ntdll: For Android look in /proc/ mounts for mounted file systems.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ac79e160e7a11ad6b822e4b3d1854138190de488
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ac79e160e7a11ad6b822e4b3d1...

Author: Huw Davies 
Date:   Mon Apr  7 13:22:11 2014 +0100

ntdll: For Android look in /proc/mounts for mounted file systems.

---

dlls/ntdll/directory.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 641f642..890fb71 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -685,6 +685,13 @@ static char *get_default_drive_device( const char *root )

RtlEnterCriticalSection( &dir_section );

+#ifdef __ANDROID__
+    if ((f = fopen( "/proc/mounts", "r" )))
+    {
+        device = parse_mount_entries( f, st.st_dev, st.st_ino );
+        fclose( f );
+    }
+#else
     if ((f = fopen( "/etc/mtab", "r" )))
     {
         device = parse_mount_entries( f, st.st_dev, st.st_ino );
@@ -696,6 +703,7 @@ static char *get_default_drive_device( const char *root )
         device = parse_mount_entries( f, st.st_dev, st.st_ino );
         fclose( f );
     }
+#endif
     if (device)
     {
         ret = RtlAllocateHeap( GetProcessHeap(), 0, strlen(device) + 1 );
@@ -827,7 +835,11 @@ static char *get_device_mount_point( dev_t dev )

RtlEnterCriticalSection( &dir_section );

+#ifdef __ANDROID__
+    if ((f = fopen( "/proc/mounts", "r" )))
+#else
     if ((f = fopen( "/etc/mtab", "r" )))
+#endif
     {
         struct mntent *entry;
         struct stat st;