* acinclude.m4 (AC_GET_FS_INFO): Revert a failed attempt to properly detect

getmntinfo() returning its result in struct statvfs.
* src/mountlist.c: Revert a failed attempt to properly detect and use
getmntinfo() returning its result in struct statvfs.

ChangeLog

@@ -1,3 +1,8 @@
+2006-09-07  Pavel Tsekov  <ptsekov@gmx.net>
+
+	* acinclude.m4 (AC_GET_FS_INFO): Revert a failed attempt to
+	properly detect getmntinfo() returning its result in struct statvfs.
+
 2006-06-30  Hampa Hug  <hampa@hampa.ch>
 
 	* acinclude.m4 (AC_GET_FS_INFO): Check the return value of

acinclude.m4

@@ -283,51 +283,6 @@ AC_DEFUN([AC_GET_FS_INFO], [
 	[AC_MSG_WARN([could not determine how to read list of mounted fs])])
 
     gl_FSUSAGE
-
-    if test $ac_cv_func_getmntinfo = yes; then
-	if test $ac_cv_header_sys_statvfs_h = yes; then
-	    AC_MSG_CHECKING([for getmntinfo taking struct statvfs as dnl
-first argument (NetBSD 3.0)])
-	    AC_CACHE_VAL(mc_cv_sys_mounted_getmntinfo_statvfs,
-		[AC_TRY_RUN([
-#if HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#if HAVE_SYS_UCRED_H
-#include <sys/ucred.h> /* needed by FreeBSD */
-#endif
-#if HAVE_SYS_MOUNT_H
-#include <sys/mount.h>
-#endif
-#include <sys/statvfs.h>
-main ()
-{
-struct statvfs *mntbufp;
-exit (getmntinfo (&mntbufp, MNT_NOWAIT) == 0);
-}],
-		    mc_cv_sys_mounted_getmntinfo_statvfs=yes,
-		    mc_cv_sys_mounted_getmntinfo_statvfs=no,
-		    mc_cv_sys_mounted_getmntinfo_statvfs=no)])
-	    AC_MSG_RESULT($mc_cv_sys_mounted_getmntinfo_statvfs)
-	    if test $mc_cv_sys_mounted_getmntinfo_statvfs = yes; then
-		AC_DEFINE(MOUNTED_GETMNTINFO_STATVFS, 1,
-		    [Define if there is a function named getmntinfo for 
-		    reading the list of mounted file systems.  (NetBSD 3.0)])
-	    fi
-	fi
-    fi
-
-    gl_FSTYPENAME
-
-    AC_CHECK_MEMBERS([struct statvfs.f_fstypename],,,[
-	AC_INCLUDES_DEFAULT()
-	#ifdef HAVE_SYS_STATVFS_H
-	#  include <sys/statvfs.h>
-	#endif])
-
 ])
 
 

src/ChangeLog

@@ -1,3 +1,8 @@
+2006-09-07  Pavel Tsekov  <ptsekov@gmx.net>
+
+	* mountlist.c: Revert a failed attempt to properly detect and use
+	getmntinfo() returning its result in struct statvfs.
+
 2006-08-12  Leonard den Ottolander  <leonard den ottolander nl>
 
 	* key.c (check_selects): Get rid of the now redundant else.

src/mountlist.c

@@ -119,16 +119,6 @@
 #    define HAVE_INFOMOUNT
 #endif
 
-#ifdef MOUNTED_GETMNTINFO_STATVFS
-#  if defined(HAVE_STRUCT_STATVFS_F_FSTYPENAME)
-#    define HAVE_F_FSTYPENAME
-#  endif
-#elif MOUNTED_GETMNTINFO
-#  if defined(HAVE_F_FSTYPENAME_IN_STATFS)
-#    define HAVE_F_FSTYPENAME
-#  endif
-#endif
-
 /* A mount table entry. */
 struct mount_entry
 {
@@ -352,11 +342,7 @@ read_filesystem_list (int need_fs_type, int all_fs)
 
 #ifdef MOUNTED_GETMNTINFO	/* 4.4BSD.  */
     {
-#ifdef MOUNTED_GETMNTINFO_STATVFS
-	struct statvfs *fsp;
-#else
 	struct statfs *fsp;
-#endif
 	int entries;
 
 	entries = getmntinfo (&fsp, MNT_NOWAIT);