Mercurial > hg > octave-lojdl > gnulib-hg
changeset 259:e7459e7e9a29
GNU file utilities
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sat, 08 Oct 1994 16:45:32 +0000 |
| parents | 2d3eeca18f5d |
| children | 75dc3184a4ff |
| files | lib/Makefile.in lib/fsusage.c lib/mountlist.c |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -29,6 +29,7 @@ exec_prefix = @exec_prefix@ libdir = $(exec_prefix)/lib + SOURCES = getdate.y posixtm.y \ argmatch.c backupfile.c basename.c dirname.c eaccess.c \ error.c filemode.c fsusage.c full-write.c getopt.c getopt1.c \
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -170,7 +170,7 @@ #endif #endif -#ifdef HAVE_SYS_STATVFS_H /* SVR4. */ +#ifdef STAT_STATVFS /* SVR4. */ struct statvfs fsd; if (statvfs (path, &fsd) < 0)
--- a/lib/mountlist.c +++ b/lib/mountlist.c @@ -40,6 +40,10 @@ char *xstrdup (); void error (); +#ifdef HAVE_SYS_PARAM_H +#include <sys/param.h> +#endif + #if defined (MOUNTED_GETFSSTAT) /* __alpha running OSF_1 */ # include <sys/mount.h> # include <sys/fs_types.h> @@ -62,7 +66,6 @@ #endif #ifdef MOUNTED_GETMNT /* Ultrix. */ -#include <sys/param.h> #include <sys/mount.h> #include <sys/fs_types.h> #endif @@ -120,7 +123,7 @@ } #endif /* MOUNTED_GETMNTENT1. */ -#ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */ +#if defined (MOUNTED_GETMNTINFO) && !defined (__NetBSD__) static char * fstype_to_string (t) short t; @@ -248,7 +251,11 @@ me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me->me_devname = xstrdup (fsp->f_mntfromname); me->me_mountdir = xstrdup (fsp->f_mntonname); +#ifdef __NetBSD__ + me->me_type = fsp->f_fstypename; +#else me->me_type = fstype_to_string (fsp->f_type); +#endif me->me_dev = -1; /* Magic; means not known yet. */ me->me_next = NULL;