From: Bruno Haible <bruno@clisp.org>
Date: Wed, 10 Sep 2025 21:11:28 +0000 (+0200)
Subject: mountlist: Remove support for IRIX.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9b5e75e27b35f93a0dd973445768dc4e3aef26a;p=thirdparty%2Fgnulib.git

mountlist: Remove support for IRIX.

* m4/mountlist.m4 (gl_MOUNTLIST): Update description of
MOUNTED_GETMNTENT1.
* lib/mountlist.c (ME_DUMMY_0): Don't test for file system type
"ignore".
---

diff --git a/ChangeLog b/ChangeLog
index 2ce200fdfd..ceb5063026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2025-09-10  Bruno Haible  <bruno@clisp.org>
 
+	mountlist: Remove support for IRIX.
+	* m4/mountlist.m4 (gl_MOUNTLIST): Update description of
+	MOUNTED_GETMNTENT1.
+	* lib/mountlist.c (ME_DUMMY_0): Don't test for file system type
+	"ignore".
+
 	mktime: Remove support for IRIX.
 	* m4/mktime.m4 (gl_FUNC_MKTIME_WORKS): Remove irix_6_4_bug test.
 
diff --git a/lib/mountlist.c b/lib/mountlist.c
index 4730add37e..75e6c6590e 100644
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -60,7 +60,7 @@
 # endif
 #endif /* MOUNTED_GETFSSTAT */
 
-#ifdef MOUNTED_GETMNTENT1       /* glibc, HP-UX, IRIX, Cygwin, Android,
+#ifdef MOUNTED_GETMNTENT1       /* glibc, HP-UX, Cygwin, Android,
                                    also (obsolete) 4.3BSD, SunOS */
 # include <mntent.h>
 # include <sys/types.h>
@@ -185,9 +185,7 @@
    /* FreeBSD, Linux 2.4 */                     \
    || strcmp (Fs_type, "devfs") == 0            \
    /* for NetBSD 3.0 */                         \
-   || strcmp (Fs_type, "kernfs") == 0           \
-   /* for Irix 6.5 */                           \
-   || strcmp (Fs_type, "ignore") == 0)
+   || strcmp (Fs_type, "kernfs") == 0)
 
 /* Historically, we have marked as "dummy" any file system of type "none",
    but now that programs like du need to know about bind-mounted directories,
@@ -468,7 +466,7 @@ read_file_system_list (bool need_fs_type)
   struct mount_entry **mtail = &mount_list;
   (void) need_fs_type;
 
-#ifdef MOUNTED_GETMNTENT1       /* glibc, HP-UX, IRIX, Cygwin, Android,
+#ifdef MOUNTED_GETMNTENT1       /* glibc, HP-UX, Cygwin, Android,
                                    also (obsolete) 4.3BSD, SunOS */
   {
     FILE *fp;
diff --git a/m4/mountlist.m4 b/m4/mountlist.m4
index 0b9ff03e69..4df3e7a4c0 100644
--- a/m4/mountlist.m4
+++ b/m4/mountlist.m4
@@ -1,5 +1,5 @@
 # mountlist.m4
-# serial 19
+# serial 20
 dnl Copyright (C) 2002-2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -75,7 +75,7 @@ $ac_includes_default
     # Determine whether it's the one-argument variant or the two-argument one.
 
     if test -z "$ac_list_mounted_fs"; then
-      # glibc, HP-UX, IRIX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS.
+      # glibc, HP-UX, Cygwin, Android, also (obsolete) 4.3BSD, SunOS.
       AC_CACHE_CHECK([for one-argument getmntent function],
         [fu_cv_sys_mounted_getmntent1],
         [AC_COMPILE_IFELSE(
@@ -107,7 +107,7 @@ $ac_includes_default
         AC_DEFINE([MOUNTED_GETMNTENT1], [1],
           [Define if there is a function named getmntent for reading the list
            of mounted file systems, and that function takes a single argument.
-           (4.3BSD, SunOS, HP-UX, Irix)])
+           (4.3BSD, SunOS, HP-UX)])
         gl_CHECK_FUNCS_ANDROID([setmntent],
           [[#include <stdio.h>
             #include <mntent.h>