mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sync with gnulib cbc85bb67fc628349e0351b835efc9e91cd0482f. 

fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant).

* m4.include/gnulib/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments.
* src/filemanager/mountlist.c: Remove MOUNTED_GETMNTTBL case.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2018-10-21 11:31:20 +03:00
parent 00d3b8a468
commit 610bf3a9d9
2 changed files with 4 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
m4.include/gnulib/fsusage.m4
View File

@ -1,4 +1,4 @@
# serial 33
# serial 34
# Obtaining file system usage information.
# Copyright (C) 1997-1998, 2000-2001, 2003-2017 Free Software Foundation, Inc.
@ -224,7 +224,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
if test $fu_cv_sys_stat_statfs4 = yes; then
ac_fsusage_space=yes
AC_DEFINE([STAT_STATFS4], [1],
[Define if statfs takes 4 args. (SVR3, Dynix, old Irix, old AIX, Dolphin)])
[Define if statfs takes 4 args. (SVR3, Dynix, old Irix, old AIX)])
fi
fi

33
src/filemanager/mountlist.c
View File

@ -145,12 +145,6 @@
#include <dirent.h>
#endif
#ifdef DOLPHIN
/* So special that it's not worth putting this in autoconf. */
#undef MOUNTED_FREAD_FSTYP
#define MOUNTED_GETMNTTBL
#endif
#ifdef HAVE_SYS_MNTENT_H
/* This is to get MNTOPT_IGNORE on e.g. SVR4. */
#include <sys/mntent.h>
@ -1073,28 +1067,6 @@ read_file_system_list (void)
}
#endif /* MOUNTED_FREAD_FSTYP */
#ifdef MOUNTED_GETMNTTBL /* (obsolete) DolphinOS */
{
struct mntent **mnttbl = getmnttbl (), **ent;
for (ent = mnttbl; *ent; ent++)
{
me = g_malloc (sizeof (*me));
me->me_devname = g_strdup ((*ent)->mt_resource);
me->me_mountdir = g_strdup ((*ent)->mt_directory);
me->me_mntroot = NULL;
me->me_type = g_strdup ((*ent)->mt_fstype);
me->me_type_malloced = 1;
me->me_dummy = ME_DUMMY (me->me_devname, me->me_type);
me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
me->me_dev = (dev_t) (-1); /* Magic; means not known yet. */
mount_list = g_slist_prepend (mount_list, me);
}
endmnttbl ();
}
#endif /* MOUNTED_GETMNTTBL */
#ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */
{
struct extmnttab mnt;
@ -1549,10 +1521,9 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix, old AIX, \
Dolphin */
#elif defined STAT_STATFS4 /* SVR3, Dynix, old Irix, old AIX */
#if !defined _AIX && !defined _SEQUENT_ && !defined DOLPHIN
#if !defined _AIX && !defined _SEQUENT_
#define f_bavail f_bfree
#endif