From: Bruno Haible Date: Sat, 26 Jan 2019 23:21:17 +0000 (+0100) Subject: mountlist: Use Linux code on Android. X-Git-Tag: v1.0~5117 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=a3d1c7849936e481ae10dea5312a36a448a5d5bf;p=gnulib.git mountlist: Use Linux code on Android. * lib/mountlist.c (setmntent, endmntent): Define fallbacks. (unescape_tab, read_file_system_list): Enable Linux code on Android as well. * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Test for setmntent and endmntent. * modules/mountlist (Depends-on): Add 'getline'. --- diff --git a/ChangeLog b/ChangeLog index 6eddae295e..21fade7382 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-01-26 Bruno Haible + + mountlist: Use Linux code on Android. + * lib/mountlist.c (setmntent, endmntent): Define fallbacks. + (unescape_tab, read_file_system_list): Enable Linux code on Android + as well. + * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Test for setmntent + and endmntent. + * modules/mountlist (Depends-on): Add 'getline'. + 2019-01-26 Bruno Haible localename tests: Fix test failure on Android. diff --git a/lib/mountlist.c b/lib/mountlist.c index 937b3bb761..9b54a2cf70 100644 --- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -123,6 +123,15 @@ # include #endif +#ifdef MOUNTED_GETMNTENT1 +# if !HAVE_SETMNTENT /* Android <= 4.4 */ +# define setmntent(fp,mode) fopen (fp, mode) +# endif +# if !HAVE_ENDMNTENT /* Android <= 4.4 */ +# define endmntent(fp) fclose (fp) +# endif +#endif + #ifndef HAVE_HASMNTOPT # define hasmntopt(mnt, opt) ((char *) 0) #endif @@ -383,7 +392,7 @@ dev_from_mount_options (char const *mount_options) #endif -#if defined MOUNTED_GETMNTENT1 && defined __linux__ /* GNU/Linux, Android */ +#if defined MOUNTED_GETMNTENT1 && (defined __linux__ || defined __ANDROID__) /* GNU/Linux, Android */ /* Unescape the paths in mount tables. STR is updated in place. */ @@ -429,7 +438,7 @@ read_file_system_list (bool need_fs_type) { FILE *fp; -# ifdef __linux__ +# if defined __linux__ || defined __ANDROID__ /* Try parsing mountinfo first, as that make device IDs available. Note we could use libmount routines to simplify this parsing a little (and that code is in previous versions of this function), however @@ -522,7 +531,7 @@ read_file_system_list (bool need_fs_type) goto free_then_fail; } else /* fallback to /proc/self/mounts (/etc/mtab). */ -# endif /* __linux __ */ +# endif /* __linux __ || __ANDROID__ */ { struct mntent *mnt; char const *table = MOUNTED; diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index ba38439271..05474c2ddd 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,4 +1,4 @@ -# serial 37 +# serial 38 # How to list mounted file systems. # Copyright (C) 1998-2004, 2006, 2009-2019 Free Software Foundation, Inc. @@ -123,7 +123,7 @@ $ac_includes_default [Define if there is a function named getmntent for reading the list of mounted file systems, and that function takes a single argument. (4.3BSD, SunOS, HP-UX, Irix)]) - AC_CHECK_FUNCS([hasmntopt]) + AC_CHECK_FUNCS([setmntent endmntent hasmntopt]) fi fi diff --git a/modules/mountlist b/modules/mountlist index 1e7d22a5e0..81ab2bfe40 100644 --- a/modules/mountlist +++ b/modules/mountlist @@ -9,6 +9,7 @@ m4/fstypename.m4 m4/mountlist.m4 Depends-on: +getline stdbool stdint strstr-simple