Mercurial > gnulib
changeset 40146:62fbdb07f551
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'.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 27 Jan 2019 00:21:17 +0100 |
| parents | 5b5be594d7f9 |
| children | 69f945816225 |
| files | ChangeLog lib/mountlist.c m4/ls-mntd-fs.m4 modules/mountlist |
| diffstat | 4 files changed, 25 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 26 23:40:44 2019 +0100 +++ b/ChangeLog Sun Jan 27 00:21:17 2019 +0100 @@ -1,3 +1,13 @@ +2019-01-26 Bruno Haible <bruno@clisp.org> + + 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 <bruno@clisp.org> localename tests: Fix test failure on Android.
--- a/lib/mountlist.c Sat Jan 26 23:40:44 2019 +0100 +++ b/lib/mountlist.c Sun Jan 27 00:21:17 2019 +0100 @@ -123,6 +123,15 @@ # include <sys/mntent.h> #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 @@ #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 @@ { 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 @@ goto free_then_fail; } else /* fallback to /proc/self/mounts (/etc/mtab). */ -# endif /* __linux __ */ +# endif /* __linux __ || __ANDROID__ */ { struct mntent *mnt; char const *table = MOUNTED;
--- a/m4/ls-mntd-fs.m4 Sat Jan 26 23:40:44 2019 +0100 +++ b/m4/ls-mntd-fs.m4 Sun Jan 27 00:21:17 2019 +0100 @@ -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 @@ [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