From 6dfbe2fa1a1d6eb5de05c8f5516c891abe7bdb74 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Fri, 18 Sep 1998 00:30:28 +0000
Subject: include/includes.h: lib/system.c: Can't assume every system has a
 statvfs varient.               Return -1 for those that don't. smbd/reply.c:
 Fixed printf warning. Jeremy. (This used to be commit
 14c134e8316687aa5a4ee089c2acfa6428faceae)

---
 source3/include/includes.h | 7 ++++++-
 source3/lib/system.c       | 4 +++-
 source3/smbd/reply.c       | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'source3')

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 788e4485ab..69b629f07c 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -376,13 +376,18 @@
 
 /*
  * Type for statvfs structure.
+ * Unfortunately, due to the make proto structure
+ * we still need to define this as void * for platforms
+ * that don't have either statvfs or statvfs64. JRA.
  */
 
 #ifndef SMB_STRUCT_STATVFS
 #  if defined(STAT_STATVFS64)
 #    define SMB_STRUCT_STATVFS struct statvfs64
-#  else
+#  elif defined(STAT_STATVFS)
 #    define SMB_STRUCT_STATVFS struct statvfs
+#  else
+#    define SMB_STRUCT_STATVFS void *
 #  endif
 #endif
 
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 18e84d66f0..52be504c52 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -186,8 +186,10 @@ int sys_statvfs( const char *path, SMB_STRUCT_STATVFS *fsd)
 {
 #if defined(STAT_STATVFS64)
   return statvfs64(path, fsd);
-#else
+#elif defined(STAT_STATVFS)
   return statvfs(path, fsd);
+#else
+  return -1;
 #endif
 }
 
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 93beb12af3..c4aadb9dad 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -932,7 +932,7 @@ int reply_dskattr(connection_struct *conn, char *inbuf,char *outbuf, int dum_siz
   SSVAL(outbuf,smb_vwv2,512);
   SSVAL(outbuf,smb_vwv3,dfree);
 
-  DEBUG(3,("dskattr dfree=%d\n", dfree));
+  DEBUG(3,("dskattr dfree=%d\n", (unsigned int)dfree));
 
   return(outsize);
 }
-- 
cgit