>From ade7835d185fd4e224dc51d9c0c6e3b1807287d6 Mon Sep 17 00:00:00 2001
From: Bruno Haible
Date: Tue, 16 Oct 2018 18:59:25 +0200
Subject: [PATCH 05/13] fsusage, mountlist: Remove support for DolphinOS (an
SVR3 variant).
* lib/fsusage.c: Remove DOLPHIN case.
* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments.
* lib/mountlist.c: Remove MOUNTED_GETMNTTBL case.
---
ChangeLog | 7 +++++++
lib/fsusage.c | 5 ++---
lib/mountlist.c | 31 +------------------------------
m4/fsusage.m4 | 4 ++--
4 files changed, 12 insertions(+), 35 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 65807d7..f89d9ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2018-10-16 Bruno Haible
+ fsusage, mountlist: Remove support for DolphinOS (an SVR3 variant).
+ * lib/fsusage.c: Remove DOLPHIN case.
+ * m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Update comments.
+ * lib/mountlist.c: Remove MOUNTED_GETMNTTBL case.
+
+2018-10-16 Bruno Haible
+
getloadavg: Remove support for Alliant FX/2800.
* lib/getloadavg.c: Remove alliant case.
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 6920f85..23cb12a 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -219,10 +219,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 !_AIX && !defined _SEQUENT_ && !defined DOLPHIN
+# if !_AIX && !defined _SEQUENT_
# define f_bavail f_bfree
# endif
diff --git a/lib/mountlist.c b/lib/mountlist.c
index cd39120..d655d95 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -125,12 +125,6 @@
# include
#endif
-#ifdef DOLPHIN
-/* So special that it's not worth putting this in autoconf. */
-# undef MOUNTED_FREAD_FSTYP
-# define MOUNTED_GETMNTTBL
-#endif
-
#if HAVE_SYS_MNTENT_H
/* This is to get MNTOPT_IGNORE on e.g. SVR4. */
# include
@@ -887,29 +881,6 @@ read_file_system_list (bool need_fs_type)
}
#endif /* MOUNTED_FREAD_FSTYP. */
-#ifdef MOUNTED_GETMNTTBL /* (obsolete) DolphinOS */
- {
- struct mntent **mnttbl = getmnttbl (), **ent;
- for (ent = mnttbl; *ent; ent++)
- {
- me = xmalloc (sizeof *me);
- me->me_devname = xstrdup ((*ent)->mt_resource);
- me->me_mountdir = xstrdup ((*ent)->mt_directory);
- me->me_mntroot = NULL;
- me->me_type = xstrdup ((*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. */
-
- /* Add to the linked list. */
- *mtail = me;
- mtail = &me->me_next;
- }
- endmnttbl ();
- }
-#endif /* MOUNTED_GETMNTTBL */
-
#ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */
{
struct extmnttab mnt;
@@ -953,7 +924,7 @@ read_file_system_list (bool need_fs_type)
goto free_then_fail;
}
}
-#endif /* MOUNTED_GETMNTTBL */
+#endif /* MOUNTED_GETEXTMNTENT */
#ifdef MOUNTED_GETMNTENT2 /* Solaris < 8, also (obsolete) SVR4 */
{
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index aab4024..f94f829 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,4 +1,4 @@
-# serial 33
+# serial 34
# Obtaining file system usage information.
# Copyright (C) 1997-1998, 2000-2001, 2003-2018 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
--
2.7.4