From: Bruno Haible <bruno@clisp.org>
Date: Tue, 9 Sep 2025 10:42:04 +0000 (+0200)
Subject: fsusage: Remove support for OSF/1.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c95ea817e58acda56d8379f6944799270e294a;p=thirdparty%2Fgnulib.git

fsusage: Remove support for OSF/1.

* lib/fsusage.c (get_fs_usage): Remove code for STAT_STATFS3_OSF1.
* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove test for for 3-argument
statfs function.
---

diff --git a/ChangeLog b/ChangeLog
index f365e0b502..3cb7900398 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2025-09-09  Bruno Haible  <bruno@clisp.org>
 
+	fsusage: Remove support for OSF/1.
+	* lib/fsusage.c (get_fs_usage): Remove code for STAT_STATFS3_OSF1.
+	* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Remove test for for 3-argument
+	statfs function.
+
 	fmodl-ieee: Remove support for OSF/1.
 	* m4/fmodl.m4 (gl_FUNC_FMODL): Don't test against OSF/1 bug.
 
diff --git a/lib/fsusage.c b/lib/fsusage.c
index e26bda88aa..eab25b03ce 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -148,15 +148,6 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp)
                         ? PROPAGATE_ALL_ONES (fsd.f_frsize)
                         : PROPAGATE_ALL_ONES (fsd.f_bsize));
 
-#elif defined STAT_STATFS3_OSF1         /* OSF/1 */
-
-  struct statfs fsd;
-
-  if (statfs (file, &fsd, sizeof (struct statfs)) != 0)
-    return -1;
-
-  fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_fsize);
-
 #elif defined STAT_STATFS2_FRSIZE        /* 2.6 < glibc/Linux < 2.6.36 */
 
   struct statfs fsd;
diff --git a/m4/fsusage.m4 b/m4/fsusage.m4
index bb7b6e4303..cf802f44ae 100644
--- a/m4/fsusage.m4
+++ b/m4/fsusage.m4
@@ -1,5 +1,5 @@
 # fsusage.m4
-# serial 35
+# serial 36
 dnl Copyright (C) 1997-1998, 2000-2001, 2003-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -54,10 +54,6 @@ AC_DEFUN([gl_FILE_SYSTEM_USAGE],
       [AC_LINK_IFELSE(
          [AC_LANG_PROGRAM([[
 #include <sys/types.h>
-#ifdef __osf__
-"Do not use Tru64's statvfs implementation"
-#endif
-
 #include <sys/statvfs.h>
 
 struct statvfs fsd;
@@ -140,36 +136,10 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
        (glibc/Linux > 2.6)])
   fi
 
-  if test $ac_fsusage_space = no; then
-    # DEC Alpha running OSF/1
-    AC_CACHE_CHECK([for 3-argument statfs function (DEC OSF/1)],
-      [fu_cv_sys_stat_statfs3_osf1],
-      [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/mount.h>
-  int
-  main ()
-  {
-    struct statfs fsd;
-    fsd.f_fsize = 0;
-    return statfs (".", &fsd, sizeof (struct statfs)) != 0;
-  }]])],
-         [fu_cv_sys_stat_statfs3_osf1=yes],
-         [fu_cv_sys_stat_statfs3_osf1=no],
-         [fu_cv_sys_stat_statfs3_osf1=no])
-      ])
-    if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-      ac_fsusage_space=yes
-      AC_DEFINE([STAT_STATFS3_OSF1], [1],
-        [Define if statfs takes 3 args.  (DEC Alpha running OSF/1)])
-    fi
-  fi
-
   if test $ac_fsusage_space = no; then
     # glibc/Linux, Mac OS X, FreeBSD < 5.0, NetBSD < 3.0, OpenBSD < 4.4.
     # (glibc/{Hurd,kFreeBSD}, FreeBSD >= 5.0, NetBSD >= 3.0,
-    # OpenBSD >= 4.4, AIX, HP-UX, OSF/1, Cygwin already handled above.)
+    # OpenBSD >= 4.4, AIX, HP-UX, Cygwin already handled above.)
     # (On IRIX you need to include <sys/statfs.h>, not only <sys/mount.h> and
     # <sys/vfs.h>.)
     # (On Solaris, statfs has 4 arguments.)
@@ -231,7 +201,6 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
 
   if test $ac_fsusage_space = no; then
     # 4.4BSD and older NetBSD
-    # (OSF/1 already handled above.)
     # (On AIX, you need to include <sys/statfs.h>, not only <sys/mount.h>.)
     # (On Solaris, statfs has 4 arguments and 'struct statfs' is not declared in
     # <sys/mount.h>.)