sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

got rid of SMB_STRUCT_STATVFS. I don't think we should be defining

Browse Source 
structures that only apply on some platforms.
(This used to be commit 926591067c)
This commit is contained in:
Andrew Tridgell 1998-09-18 03:53:14 +00:00
parent c7da9992cb
commit d1a82e643b
4 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source3/include/includes.h
View File

@ -384,23 +384,6 @@
# endif
#endif
/*
* 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
# elif defined(STAT_STATVFS)
# define SMB_STRUCT_STATVFS struct statvfs
# else
# define SMB_STRUCT_STATVFS void *
# endif
#endif
/*
* Defines for 64 bit fcntl locks.
*/

1
source3/include/proto.h
View File

@ -158,7 +158,6 @@ int sys_select(int maxfd, fd_set *fds,struct timeval *tval);
int sys_stat(char *fname,SMB_STRUCT_STAT *sbuf);
int sys_fstat(int fd,SMB_STRUCT_STAT *sbuf);
int sys_lstat(char *fname,SMB_STRUCT_STAT *sbuf);
int sys_statvfs( const char *path, SMB_STRUCT_STATVFS *fsd);
int sys_ftruncate(int fd, SMB_OFF_T offset);
SMB_OFF_T sys_lseek(int fd, SMB_OFF_T offset, int whence);
int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence);

15
source3/lib/system.c
View File

@ -178,21 +178,6 @@ 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);
#elif defined(STAT_STATVFS)
return statvfs(path, fsd);
#else
return -1;
#endif
}
/*******************************************************************
An ftruncate() wrapper that will deal with 64 bit filesizes.
********************************************************************/

10
source3/smbd/dfree.c
View File

@ -156,10 +156,14 @@ static int fsusage(const char *path, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
# define CONVERT_BLOCKS(B) \
adjust_blocks ((SMB_BIG_UINT)(B), fsd.f_frsize ? (SMB_BIG_UINT)fsd.f_frsize : (SMB_BIG_UINT)fsd.f_bsize, (SMB_BIG_UINT)512)
SMB_STRUCT_STATVFS fsd;
#ifdef STAT_STATVFS64
struct statvfs64 fsd;
if (statvfs64(path, &fsd) < 0) return -1;
#else
struct statvfs fsd;
if (statvfs(path, &fsd) < 0) return -1;
#endif
if (sys_statvfs (path, &fsd) < 0)
return -1;
/* f_frsize isn't guaranteed to be supported. */
#endif /* STAT_STATVFS */