>From 130271eff43baa4c701417fe3816244ebdb0e86a Mon Sep 17 00:00:00 2001
From: Bruno Haible
Date: Tue, 16 Oct 2018 21:27:45 +0200
Subject: [PATCH 13/13] mountlist: Remove support for Cray with UNICOS 9.
* m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define
MOUNTED_LISTMNTENT.
* lib/mountlist.c: Remove MOUNTED_LISTMNTENT case.
---
ChangeLog | 7 +++++++
lib/mountlist.c | 35 -----------------------------------
m4/ls-mntd-fs.m4 | 30 ------------------------------
3 files changed, 7 insertions(+), 65 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5c8babf..9843d56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2018-10-16 Bruno Haible
+ mountlist: Remove support for Cray with UNICOS 9.
+ * m4/ls-mntd-fs.m4 (gl_LIST_MOUNTED_FILE_SYSTEMS): Don't define
+ MOUNTED_LISTMNTENT.
+ * lib/mountlist.c: Remove MOUNTED_LISTMNTENT case.
+
+2018-10-16 Bruno Haible
+
fsusage, mountlist, getloadavg, getgroups: Remove support for Ultrix.
* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Don't define
STAT_STATFS2_FS_DATA.
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 9a94f42..bc86c18 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -95,10 +95,6 @@
# include
#endif
-#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */
-# include
-#endif
-
#ifdef MOUNTED_GETEXTMNTENT /* Solaris >= 8 */
# include
#endif
@@ -423,37 +419,6 @@ read_file_system_list (bool need_fs_type)
struct mount_entry **mtail = &mount_list;
(void) need_fs_type;
-#ifdef MOUNTED_LISTMNTENT /* (obsolete) Cray UNICOS 9 */
- {
- struct tabmntent *mntlist, *p;
- struct mntent *mnt;
-
- /* the third and fourth arguments could be used to filter mounts,
- but Crays doesn't seem to have any mounts that we want to
- remove. Specifically, automount create normal NFS mounts.
- */
-
- if (listmntent (&mntlist, KMTAB, NULL, NULL) < 0)
- return NULL;
- for (p = mntlist; p; p = p->next)
- {
- mnt = p->ment;
- me = xmalloc (sizeof *me);
- me->me_devname = xstrdup (mnt->mnt_fsname);
- me->me_mountdir = xstrdup (mnt->mnt_dir);
- me->me_mntroot = NULL;
- me->me_type = xstrdup (mnt->mnt_type);
- 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 = -1;
- *mtail = me;
- mtail = &me->me_next;
- }
- freemntlist (mntlist);
- }
-#endif
-
#ifdef MOUNTED_GETMNTENT1 /* glibc, HP-UX, IRIX, Cygwin, Android,
also (obsolete) 4.3BSD, SunOS */
{
diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4
index 7a4efcc..8ce748c 100644
--- a/m4/ls-mntd-fs.m4
+++ b/m4/ls-mntd-fs.m4
@@ -68,36 +68,6 @@ $ac_includes_default
# make sure LIBS contains the appropriate -l option.
AC_FUNC_GETMNTENT
- # This test must precede the ones for getmntent because Unicos-9 is
- # reported to have the getmntent function, but its support is incompatible
- # with other getmntent implementations.
-
- # NOTE: Normally, I wouldn't use a check for system type as I've done for
- # 'CRAY' below since that goes against the whole autoconf philosophy. But
- # I think there is too great a chance that some non-Cray system has a
- # function named listmntent to risk the false positive.
-
- if test -z "$ac_list_mounted_fs"; then
- # (obsolete) Cray UNICOS 9
- AC_CACHE_CHECK([for listmntent of Cray/Unicos-9],
- [fu_cv_sys_mounted_cray_listmntent],
- [fu_cv_sys_mounted_cray_listmntent=no
- AC_EGREP_CPP([yes],
- [#ifdef _CRAY
-yes
-#endif
- ], [test $ac_cv_func_listmntent = yes \
- && fu_cv_sys_mounted_cray_listmntent=yes]
- )
- ])
- if test $fu_cv_sys_mounted_cray_listmntent = yes; then
- ac_list_mounted_fs=found
- AC_DEFINE([MOUNTED_LISTMNTENT], [1],
- [Define if there is a function named listmntent that can be used to
- list all mounted file systems. (UNICOS)])
- fi
- fi
-
if test -z "$ac_list_mounted_fs"; then
# AIX.
AC_CACHE_CHECK([for mntctl function and struct vmount],
--
2.7.4