From: Bruno Haible Date: Sat, 26 Jan 2019 21:49:57 +0000 (+0100) Subject: mountlist: Port better to Android. X-Git-Tag: v1.0~5119 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=248cb6a2499ffa5a9e652d05e61c4a959fbae605;p=gnulib.git mountlist: Port better to Android. * lib/mountlist.c (MOUNTED): Redefine on Android. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Redefine MOUNTED on Android. --- diff --git a/ChangeLog b/ChangeLog index 97834d681c..69b13b46db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2019-01-26 Bruno Haible + + mountlist: Port better to Android. + * lib/mountlist.c (MOUNTED): Redefine on Android. + * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Redefine MOUNTED on + Android. + 2019-01-26 Bruno Haible striconveh: Fix use of uninitialized iconv_t. diff --git a/lib/mountlist.c b/lib/mountlist.c index 0528d8a70f..937b3bb761 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -66,7 +66,12 @@ also (obsolete) 4.3BSD, SunOS */ # include # include -# if !defined MOUNTED +# if defined __ANDROID__ /* Android */ + /* Bionic versions from between 2014-01-09 and 2015-01-08 define MOUNTED to + an incorrect value; older Bionic versions don't define it at all. */ +# undef MOUNTED +# define MOUNTED "/proc/mounts" +# elif !defined MOUNTED # if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED # endif diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 2de7b71be6..ba38439271 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,4 +1,4 @@ -# serial 36 +# serial 37 # How to list mounted file systems. # Copyright (C) 1998-2004, 2006, 2009-2019 Free Software Foundation, Inc. @@ -99,11 +99,14 @@ $ac_includes_default #include #include -#if !defined MOUNTED -# if defined _PATH_MOUNTED /* GNU libc */ +#if defined __ANDROID__ /* Android */ +# undef MOUNTED +# define MOUNTED "/proc/mounts" +#elif !defined MOUNTED +# if defined _PATH_MOUNTED /* GNU libc */ # define MOUNTED _PATH_MOUNTED # endif -# if defined MNT_MNTTAB /* HP-UX. */ +# if defined MNT_MNTTAB /* HP-UX. */ # define MOUNTED MNT_MNTTAB # endif #endif