Got removable media mount detection working on Android.

Bionic has an amusing stub for `getmntent` that prints out
"FIX ME! implement getmntent()"

But, `/proc/mounts` is there, so I just parse it.
This commit is contained in:
Joey Hess 2013-05-04 16:04:17 -04:00
parent 41e6c1de9a
commit d35132810a
5 changed files with 37 additions and 9 deletions

View file

@ -3,7 +3,7 @@
- Derived from hsshellscript, originally written by
- Volker Wysk <hsss@volker-wysk.de>
-
- Modified to support BSD and Mac OS X by
- Modified to support BSD, Mac OS X, and Android by
- Joey Hess <joey@kitenet.net>
-
- Licensed under the GNU LGPL version 2.1 or higher.
@ -16,13 +16,18 @@ module Utility.Mounts (
getMounts
) where
#ifndef __ANDROID__
import Control.Monad
import Foreign
import Foreign.C
import GHC.IO hiding (finally, bracket)
import Prelude hiding (catch)
#include "libmounts.h"
#else
import Utility.Exception
import Data.Maybe
import Control.Applicative
#endif
{- This is a stripped down mntent, containing only
- fields available everywhere. -}
@ -32,6 +37,8 @@ data Mntent = Mntent
, mnt_type :: String
} deriving (Read, Show, Eq, Ord)
#ifndef __ANDROID__
getMounts :: IO [Mntent]
getMounts = do
h <- c_mounts_start
@ -67,3 +74,22 @@ foreign import ccall unsafe "libmounts.h mounts_next" c_mounts_next
:: Ptr () -> IO (Ptr ())
foreign import ccall unsafe "libmounts.h mounts_end" c_mounts_end
:: Ptr () -> IO CInt
#else
{- Android does not support getmntent (well, it's a no-op stub in Bionic).
-
- But, the linux kernel's /proc/mounts is available to be parsed.
-}
getMounts :: IO [Mntent]
getMounts = catchDefaultIO [] $
mapMaybe (parse . words) . lines <$> readFile "/proc/mounts"
where
parse (device:mountpoint:fstype:_rest) = Just $ Mntent
{ mnt_fsname = device
, mnt_dir = mountpoint
, mnt_type = fstype
}
parse _ = Nothing
#endif

View file

@ -6,7 +6,7 @@
# define GETMNTINFO
#else
#if defined __ANDROID__
# warning mounts listing code not available for Android
/* Android is handled by the Haskell code, not here. */
# define UNKNOWN
#else
#if defined (__linux__) || defined (__FreeBSD_kernel__)