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

Add st_birthtime and friends for accurate create times on systems that support it (*BSD and MacOSX).

Browse Source 
Should have done this ages ago, sorry.
Jeremy.
This commit is contained in:
Jeremy Allison 2008-08-27 15:06:14 -07:00
parent 3b5ad9190d
commit 4c3a955890
4 changed files with 124 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
source/configure.in
View File

@ -1354,6 +1354,96 @@ if test x"$samba_cv_stat_hires_notimespec" = x"yes" ; then
[whether struct stat has sub-second timestamps without struct timespec])
fi
AC_CACHE_CHECK([whether struct stat has st_birthtimespec], samba_cv_stat_st_birthtimespec,
[
AC_TRY_COMPILE(
[
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
],
[
struct timespec t;
struct stat s = {0};
t = s.st_birthtimespec;
],
samba_cv_stat_st_birthtimespec=yes, samba_cv_stat_birthtimespec=no)
])
if test x"$samba_cv_stat_st_birthtimespec" = x"yes" ; then
AC_DEFINE(HAVE_STAT_ST_BIRTHTIMESPEC, 1, [whether struct stat contains st_birthtimespec])
fi
AC_CACHE_CHECK([whether struct stat has st_birthtimensec], samba_cv_stat_st_birthtimensec,
[
AC_TRY_COMPILE(
[
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
],
[
struct timespec t;
struct stat s = {0};
t.tv_nsec = s.st_birthtimensec;
],
samba_cv_stat_st_birthtimensec=yes, samba_cv_stat_birthtimensec=no)
])
if test x"$samba_cv_stat_st_birthtimensec" = x"yes" ; then
AC_DEFINE(HAVE_STAT_ST_BIRTHTIMENSEC, 1, [whether struct stat contains st_birthtimensec])
fi
AC_CACHE_CHECK([whether struct stat has st_birthtime], samba_cv_stat_st_birthtime,
[
AC_TRY_COMPILE(
[
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
# endif
#endif
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
],
[
struct time_t t;
struct stat s = {0};
t = s.st_birthtime;
],
samba_cv_stat_st_birthtime=yes, samba_cv_stat_birthtime=no)
])
if test x"$samba_cv_stat_st_birthtime" = x"yes" ; then
AC_DEFINE(HAVE_STAT_ST_BIRTHTIME, 1, [whether struct stat contains st_birthtime])
fi
#####################################
# needed for SRV lookups
AC_CHECK_LIB(resolv, dn_expand)

1
source/include/proto.h
View File

@ -1185,7 +1185,6 @@ void srv_put_dos_date2(char *buf,int offset, time_t unixdate);
void srv_put_dos_date3(char *buf,int offset,time_t unixdate);
void put_long_date_timespec(char *p, struct timespec ts);
void put_long_date(char *p, time_t t);
time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs);
struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs);
struct timespec get_atimespec(const SMB_STRUCT_STAT *pst);
void set_atimespec(SMB_STRUCT_STAT *pst, struct timespec ts);

40
source/lib/time.c
View File

@ -826,14 +826,10 @@ void put_long_date(char *p, time_t t)
structure.
****************************************************************************/
time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
static time_t calc_create_time(const SMB_STRUCT_STAT *st)
{
time_t ret, ret1;
if(S_ISDIR(st->st_mode) && fake_dirs) {
return (time_t)315493200L; /* 1/1/1980 */
}
ret = MIN(st->st_ctime, st->st_mtime);
ret1 = MIN(ret, st->st_atime);
@ -848,12 +844,36 @@ time_t get_create_time(const SMB_STRUCT_STAT *st,bool fake_dirs)
return ret;
}
struct timespec get_create_timespec(const SMB_STRUCT_STAT *st,bool fake_dirs)
/****************************************************************************
Return the 'create time' from a stat struct if it exists (birthtime) or else
use the best approximation.
****************************************************************************/
struct timespec get_create_timespec(const SMB_STRUCT_STAT *pst,bool fake_dirs)
{
struct timespec ts;
ts.tv_sec = get_create_time(st, fake_dirs);
ts.tv_nsec = 0;
return ts;
struct timespec ret;
if(S_ISDIR(pst->st_mode) && fake_dirs) {
ret.tv_sec = 315493200L; /* 1/1/1980 */
ret.tv_nsec = 0;
return ret;
}
#if defined(HAVE_STAT_ST_BIRTHTIMESPEC)
return pst->st_birthtimespec;
#elif defined(HAVE_STAT_ST_BIRTHTIMENSEC)
ret.tv_sec = pst->st_birthtime;
ret.tv_nsec = pst->st_birthtimenspec;
return ret;
#elif defined(HAVE_STAT_ST_BIRTHTIME)
ret.tv_sec = pst->st_birthtime;
ret.tv_nsec = 0;
return ret;
#else
ret.tv_sec = calc_create_time(pst);
ret.tv_nsec = 0;
return ret;
#endif
}
/****************************************************************************

7
source/smbd/reply.c
View File

@ -7126,6 +7126,7 @@ void reply_getattrE(struct smb_request *req)
SMB_STRUCT_STAT sbuf;
int mode;
files_struct *fsp;
struct timespec create_ts;
START_PROFILE(SMBgetattrE);
@ -7160,9 +7161,9 @@ void reply_getattrE(struct smb_request *req)
reply_outbuf(req, 11, 0);
srv_put_dos_date2((char *)req->outbuf, smb_vwv0,
get_create_time(&sbuf,
lp_fake_dir_create_times(SNUM(conn))));
create_ts = get_create_timespec(&sbuf,
lp_fake_dir_create_times(SNUM(conn)));
srv_put_dos_date2((char *)req->outbuf, smb_vwv0, create_ts.tv_sec);
srv_put_dos_date2((char *)req->outbuf, smb_vwv2, sbuf.st_atime);
/* Should we check pending modtime here ? JRA */
srv_put_dos_date2((char *)req->outbuf, smb_vwv4, sbuf.st_mtime);