--- sourceforge.net/trunk/rdesktop/disk.c 2004/01/21 21:51:59 572 +++ sourceforge.net/trunk/rdesktop/disk.c 2004/01/21 22:13:20 573 @@ -82,12 +82,21 @@ #include #include /* errno */ -#ifdef SOLARIS +#if defined(SOLARIS) #include /* solaris statvfs */ #define HAVE_STATVFS +#define F_NAMELEN(buf) ((buf).f_namemax) + +#elif defined(__OpenBSD__) +#include +#include +#define HAVE_STATFS +#define F_NAMELEN(buf) (NAME_MAX) + #else #include /* linux statfs */ #define HAVE_STATFS +#define F_NAMELEN(buf) ((buf).f_namelen) #endif #include "rdesktop.h" @@ -506,10 +515,8 @@ #if defined(HAVE_STATFS) ret = statfs(path, &statbuf); - buf->f_namelen = statbuf.f_namelen; #elif defined(HAVE_STATVFS) ret = statvfs(path, &statbuf); - buf->f_namelen = statbuf.f_namemax; #else ret=-1; #endif @@ -517,6 +524,7 @@ buf->f_blocks = statbuf.f_blocks; buf->f_bfree = statbuf.f_bfree; buf->f_bsize = statbuf.f_bsize; + buf->f_namelen = F_NAMELEN(statbuf); return ret; }