changeset 39927:355c5b4c3f91

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.
author Bruno Haible <bruno@clisp.org>
date Tue, 16 Oct 2018 18:59:25 +0200
parents 7e14107f14ce
children 47c45030cec7
files ChangeLog lib/fsusage.c lib/mountlist.c m4/fsusage.m4
diffstat 4 files changed, 12 insertions(+), 35 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Oct 16 18:53:05 2018 +0200
+++ b/ChangeLog	Tue Oct 16 18:59:25 2018 +0200
@@ -1,3 +1,10 @@
+2018-10-16  Bruno Haible  <bruno@clisp.org>
+
+	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  <bruno@clisp.org>
 
 	getloadavg: Remove support for Alliant FX/2800.
--- a/lib/fsusage.c	Tue Oct 16 18:53:05 2018 +0200
+++ b/lib/fsusage.c	Tue Oct 16 18:59:25 2018 +0200
@@ -219,10 +219,9 @@
 
   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
 
--- a/lib/mountlist.c	Tue Oct 16 18:53:05 2018 +0200
+++ b/lib/mountlist.c	Tue Oct 16 18:59:25 2018 +0200
@@ -125,12 +125,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
-
 #if HAVE_SYS_MNTENT_H
 /* This is to get MNTOPT_IGNORE on e.g. SVR4.  */
 # include <sys/mntent.h>
@@ -887,29 +881,6 @@
   }
 #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 @@
         goto free_then_fail;
       }
   }
-#endif /* MOUNTED_GETMNTTBL */
+#endif /* MOUNTED_GETEXTMNTENT */
 
 #ifdef MOUNTED_GETMNTENT2       /* Solaris < 8, also (obsolete) SVR4 */
   {
--- a/m4/fsusage.m4	Tue Oct 16 18:53:05 2018 +0200
+++ b/m4/fsusage.m4	Tue Oct 16 18:59:25 2018 +0200
@@ -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 @@
     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