mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-01 13:45:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Sync with gnulib 248cb6a2499ffa5a9e652d05e61c4a959fbae605.

Browse Source 
src/filemanager/mountlist.c: port better to Android.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2019-01-27 10:02:23 +03:00
parent f21f27c5ae
commit 5505ed054d
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
m4.include/gnulib/ls-mntd-fs.m4
View File

@ -1,4 +1,4 @@
# serial 36
# serial 37
# How to list mounted file systems.
# Copyright (C) 1998-2004, 2006, 2009-2018 Free Software Foundation, Inc.
@ -99,11 +99,14 @@ $ac_includes_default
#include <stdio.h>
#include <mntent.h>
#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

7
src/filemanager/mountlist.c
View File

@ -83,7 +83,12 @@
also (obsolete) 4.3BSD, SunOS */
#include <mntent.h>
#include <sys/types.h>
#ifndef 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
#ifdef _PATH_MOUNTED /* GNU libc */
#define MOUNTED _PATH_MOUNTED
#endif