From 1fe585c5df62342b92ed041565a131f71df7ba06 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 18 Mar 2003 17:48:02 +0000 Subject: [PATCH] . --- aclocal.m4 | 36 ++++++++++++++++++------------------ lib/ChangeLog | 7 +++++++ 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 4246db4..0f56ab2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -4824,7 +4824,7 @@ AC_DEFUN([jm_FUNC_UNLINK_BUSY_TEXT], fi ]) -#serial 11 +#serial 12 dnl From Jim Meyering. dnl @@ -4893,6 +4893,23 @@ yes fi fi +if test -z "$ac_list_mounted_fs"; then + # AIX. + AC_MSG_CHECKING([for mntctl function and struct vmount]) + AC_CACHE_VAL(fu_cv_sys_mounted_vmount, + [AC_TRY_CPP([#include ], + fu_cv_sys_mounted_vmount=yes, + fu_cv_sys_mounted_vmount=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_vmount) + if test $fu_cv_sys_mounted_vmount = yes; then + ac_list_mounted_fs=found + AC_DEFINE(MOUNTED_VMOUNT, 1, + [Define if there is a function named mntctl that can be used to read + the list of mounted filesystems, and there is a system header file + that declares `struct vmount.' (AIX)]) + fi +fi + if test $ac_cv_func_getmntent = yes; then # This system has the getmntent function. @@ -4980,23 +4997,6 @@ if test -z "$ac_list_mounted_fs"; then fi if test -z "$ac_list_mounted_fs"; then - # AIX. - AC_MSG_CHECKING([for mntctl function and struct vmount]) - AC_CACHE_VAL(fu_cv_sys_mounted_vmount, - [AC_TRY_CPP([#include ], - fu_cv_sys_mounted_vmount=yes, - fu_cv_sys_mounted_vmount=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_vmount) - if test $fu_cv_sys_mounted_vmount = yes; then - ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_VMOUNT, 1, - [Define if there is a function named mntctl that can be used to read - the list of mounted filesystems, and there is a system header file - that declares `struct vmount.' (AIX)]) - fi -fi - -if test -z "$ac_list_mounted_fs"; then # SVR3 AC_MSG_CHECKING([for FIXME existence of three headers]) AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, diff --git a/lib/ChangeLog b/lib/ChangeLog index e30f862..0f15247 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,12 @@ 2003-03-18 Jim Meyering + * mountlist.c (read_filesystem_list) [MOUNTED_VMOUNT]: Detect any + error from mntctl. + Use mntctl's return value to drive the entry-processing loop, since + we can't rely on the value of the vmt_length member in the last + entry. On some systems doing so could result in an infinite loop. + Based in part on a patch from Mike Jetzer. + * exclude.c (excluded_filename): Define and use typedef to avoid type mismatch in conditional expression. -- 2.7.4