Attachment #513396 for bug #643530

Lines 25-30 Link Here

(-)/tmp/openssh-7.6p1/openbsd-compat/bsd-statvfs.c (+3 lines)
25		25
26	#include <errno.h>	26	#include <errno.h>
27		27
		28	#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) \|\| \
		29	(!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
28	static void	30	static void
29	copy_statfs_to_statvfs(struct statvfs to, struct statfs from)	31	copy_statfs_to_statvfs(struct statvfs to, struct statfs from)
30	{	32	{
Lines 40-45 Link Here
40	to->f_flag = from->f_flags;	42	to->f_flag = from->f_flags;
41	to->f_namemax = MNAMELEN;	43	to->f_namemax = MNAMELEN;
42	}	44	}
		45	#endif
43		46
44	# ifndef HAVE_STATVFS	47	# ifndef HAVE_STATVFS
45	int statvfs(const char path, struct statvfs buf)	48	int statvfs(const char path, struct statvfs buf)

Lines 42-47 Link Here

(-)/tmp/openssh-7.6p1/openbsd-compat/bsd-statvfs.h (+3 lines)
42	#endif	42	#endif
43		43
44	/* as defined in IEEE Std 1003.1, 2004 Edition */	44	/* as defined in IEEE Std 1003.1, 2004 Edition */
		45	#if ((!defined(HAVE_STATVFS) && defined(HAVE_STATFS)) \|\| \
		46	(!defined(HAVE_FSTATVFS) && defined(HAVE_FSTATFS)))
45	struct statvfs {	47	struct statvfs {
46	unsigned long f_bsize; /* File system block size. */	48	unsigned long f_bsize; /* File system block size. */
47	unsigned long f_frsize; /* Fundamental file system block size. */	49	unsigned long f_frsize; /* Fundamental file system block size. */
Lines 59-64 Link Here
59	unsigned long f_namemax;/* Maximum filename length. */	61	unsigned long f_namemax;/* Maximum filename length. */
60	};	62	};
61	#endif	63	#endif
		64	#endif
62		65
63	#ifndef HAVE_STATVFS	66	#ifndef HAVE_STATVFS
64	int statvfs(const char , struct statvfs );	67	int statvfs(const char , struct statvfs );

Return to bug 643530