diff --git a/src/utils_mount.c b/src/utils_mount.c
index 16156203c9b88f0e96213f3387b18240caf7f7f0..a02e5690d8a65a7dd4c71d44530a8766fdc43580 100644 (file)
--- a/src/utils_mount.c
+++ b/src/utils_mount.c
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
/* Get the number of mounted file systems */
if ((bufsize = CMD_STATFS (NULL, 0, FLAGS_STATFS)) < 1)
{
- DBG (CMD_STATFS" failed: %s", strerror (errno));
+ DBG ("getv?fsstat failed: %s", strerror (errno));
return (NULL);
}
return (NULL);
}
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
* manpage.. -octo */
if ((num = CMD_STATFS (buf, bufsize * sizeof (STRUCT_STATFS), FLAGS_STATFS)) < 1)
{
- DBG (CMD_STATFS" failed: %s", strerror (errno));
+ DBG ("getv?fsstat failed: %s", strerror (errno));
free (buf);
return (NULL);
}
free (buf);
return (NULL);
}
/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
/* #endif HAVE_GETVFSSTAT || HAVE_GETFSSTAT */
/* Solaris (SunOS 10): int getmntent(FILE *fp, struct mnttab *mp); */
-#elif HAVE_GEN_GETMNTENT
+#elif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
static cu_mount_t *cu_mount_gen_getmntent (void)
{
struct mnttab mt;
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
return (first);
} /* static cu_mount_t *cu_mount_gen_getmntent (void) */
-/* #endif HAVE_GEN_GETMNTENT */
+/* #endif HAVE_TWO_GETMNTENT || HAVE_GEN_GETMNTENT || HAVE_SUN_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
/* #endif HAVE_SEQ_GETMNTENT */
#elif HAVE_SEQ_GETMNTENT
#warn "This version of `getmntent' hat not yet been implemented!"
/* #endif HAVE_SEQ_GETMNTENT */
-#elif HAVE_SUN_GETMNTENT
-#warn "This version of `getmntent' hat not yet been implemented!"
-/* #endif HAVE_SUN_GETMNTENT */
-
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
static cu_mount_t *cu_mount_getmntent (void)
{
FILE *fp;
static cu_mount_t *cu_mount_getmntent (void)
{
FILE *fp;
return (first);
}
return (first);
}
-#endif /* HAVE_GETMNTENT */
+#endif /* HAVE_ONE_GETMNTENT */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
/* *** *** *** ******************************************** *** *** *** */
/* *** *** *** *** *** *** public functions *** *** *** *** *** *** */
new = cu_mount_getfsstat ();
#elif HAVE_GEN_GETMNTENT
new = cu_mount_gen_getmntent ();
new = cu_mount_getfsstat ();
#elif HAVE_GEN_GETMNTENT
new = cu_mount_gen_getmntent ();
-#elif HAVE_GETMNTENT
+#elif HAVE_ONE_GETMNTENT
new = cu_mount_getmntent ();
#else
new = NULL;
new = cu_mount_getmntent ();
#else
new = NULL;