diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-10-28 06:09:04 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-10-28 06:27:53 +0100 |
| commit | d561b0b2fa2531b4cc3bc70a7d657c6485c9fd0b (patch) | |
| tree | dd65310dd68efa3a4f6e1ddf613caa60adee5ab6 | |
| parent | Define UINT32_MAX if needed. (diff) | |
| download | openssh-d561b0b2fa2531b4cc3bc70a7d657c6485c9fd0b.tar.xz openssh-d561b0b2fa2531b4cc3bc70a7d657c6485c9fd0b.zip | |
Make sure we have struct statfs before using.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | openbsd-compat/bsd-statvfs.c | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 268fe1a4b..ea99887fd 100644 --- a/configure.ac +++ b/configure.ac @@ -3751,7 +3751,7 @@ AC_CHECK_TYPES([fsblkcnt_t, fsfilcnt_t], , , [ #endif ]) -AC_CHECK_MEMBERS([struct statfs.f_flags], [], [], [[ +AC_CHECK_MEMBERS([struct statfs.f_files, struct statfs.f_flags], [], [], [[ #include <sys/types.h> #ifdef HAVE_SYS_BITYPES_H #include <sys/bitypes.h> diff --git a/openbsd-compat/bsd-statvfs.c b/openbsd-compat/bsd-statvfs.c index e3bd87d98..10d876439 100644 --- a/openbsd-compat/bsd-statvfs.c +++ b/openbsd-compat/bsd-statvfs.c @@ -29,6 +29,11 @@ # define MNAMELEN 32 #endif +#ifdef HAVE_STRUCT_STATFS_F_FILES +# define HAVE_STRUCT_STATFS +#endif + +#ifdef HAVE_STRUCT_STATFS static void copy_statfs_to_statvfs(struct statvfs *to, struct statfs *from) { @@ -48,11 +53,12 @@ copy_statfs_to_statvfs(struct statvfs *to, struct statfs *from) #endif to->f_namemax = MNAMELEN; } +#endif # ifndef HAVE_STATVFS int statvfs(const char *path, struct statvfs *buf) { -# ifdef HAVE_STATFS +# if defined(HAVE_STATFS) && defined(HAVE_STRUCT_STATFS) struct statfs fs; memset(&fs, 0, sizeof(fs)); @@ -70,7 +76,7 @@ int statvfs(const char *path, struct statvfs *buf) # ifndef HAVE_FSTATVFS int fstatvfs(int fd, struct statvfs *buf) { -# ifdef HAVE_FSTATFS +# if defined(HAVE_FSTATFS) && defined(HAVE_STRUCT_STATFS) struct statfs fs; memset(&fs, 0, sizeof(fs)); |