From b8b67f4fab4a6fd686c5796c2701882197a7bd9d Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 17 Sep 1998 23:06:57 +0000
Subject: configure configure.in: Added checks for statvfs64. Last bit of 64
 bit widening (I hope :-). include/config.h.in: Added #undef STAT_STATVFS64.
 include/includes.h: Added SMB_STRUCT_STATVFS type, Changed SMB_BIG_INTEGER to
                     SMB_BIG_UINT and SMB_BIG_INT types. include/smb.h: Added
 flag defines from CIFS spec. lib/debug.c: Fixed one more mode_t issue.
 lib/system.c: Added sys_statvfs wrapper. lib/util.c: Changed trim_string to
 use size_t. param/loadparm.c: Moved "blocking locks" into locking section.
 Alphabetised                   locking options. Question - shuld we do this
 for all options ? passdb/ldap.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT.
 passdb/nispass.c: Changed SMB_BIG_INTEGER to SMB_BIG_UINT. passdb/smbpass.c:
 Changed SMB_BIG_INTEGER to SMB_BIG_UINT. smbd/dfree.c: Changed to use 64 bit
 types if available. Moved to use unsigned               types.
 smbd/dosmode.c: Fixed one more mode_t issue. smbd/negprot.c: Changed literals
 to be FLAG_ #defines. smbd/nttrans.c: Removed dead code. smbd/open.c: Changed
 disk_free call. smbd/process.c: Changed literals to be FLAG_ #defines.
 smbd/reply.c: Changed disk_free call. smbd/trans2.c: Fixed but in
 SMB_QUERY_FS_VOLUME_INFO call. Was using                UNICODE - should use
 ascii. tests/summary.c: Added STAT_STATVFS64 check. Jeremy. (This used to be
 commit c512b1b91fb7f2a7a93b9033a33e06d966daadb4)

---
 source3/lib/debug.c  |  4 ++--
 source3/lib/system.c | 13 +++++++++++++
 source3/lib/util.c   |  6 +++---
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'source3/lib')

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 5f6ad5273a..0418098fb2 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -204,7 +204,7 @@ void reopen_logs( void )
 
     if( !strcsequal( fname, debugf ) || !dbf || !file_exist( debugf, NULL ) )
       {
-      int oldumask = umask( 022 );
+      mode_t oldumask = umask( 022 );
 
       pstrcpy( debugf, fname );
       if( dbf )
@@ -314,7 +314,7 @@ va_dcl
     {
     if( !dbf )
       {
-      int oldumask = umask( 022 );
+      mode_t oldumask = umask( 022 );
 
       if( append_log )
         dbf = fopen( debugf, "a" );
diff --git a/source3/lib/system.c b/source3/lib/system.c
index c3d97e0350..18e84d66f0 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -178,6 +178,19 @@ int sys_lstat(char *fname,SMB_STRUCT_STAT *sbuf)
 #endif
 }
 
+/*******************************************************************
+ An statvfs() wrapper that will deal with 64 bit filesizes.
+********************************************************************/
+
+int sys_statvfs( const char *path, SMB_STRUCT_STATVFS *fsd)
+{
+#if defined(STAT_STATVFS64)
+  return statvfs64(path, fsd);
+#else
+  return statvfs(path, fsd);
+#endif
+}
+
 /*******************************************************************
  An ftruncate() wrapper that will deal with 64 bit filesizes.
 ********************************************************************/
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 002b31d027..886b6e4ac9 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1089,9 +1089,9 @@ trim the specified elements off the front and back of a string
 BOOL trim_string(char *s,char *front,char *back)
 {
   BOOL ret = False;
-  int front_len = (front && *front) ? strlen(front) : 0;
-  int back_len = (back && *back) ? strlen(back) : 0;
-  int s_len;
+  size_t front_len = (front && *front) ? strlen(front) : 0;
+  size_t back_len = (back && *back) ? strlen(back) : 0;
+  size_t s_len;
 
   while (front_len && strncmp(s, front, front_len) == 0)
   {
-- 
cgit