diff options
author | Richard Maw <richard.maw@codethink.co.uk> | 2011-10-19 17:30:28 +0100 |
---|---|---|
committer | Richard Maw <richard.maw@codethink.co.uk> | 2011-10-19 17:30:28 +0100 |
commit | c4b2a882a539ef2b33a8d4efcff09d4aad48e196 (patch) | |
tree | 7a63543e7acc6f7b96086ec27d2007e4d74afdcd /libtbd_apply.c | |
parent | 72a80acf9dd2eb8992ae1e045bed4efdc234965e (diff) | |
download | tbdiff-c4b2a882a539ef2b33a8d4efcff09d4aad48e196.tar.gz |
mtime is now a time_t rather than a uint32_t
In future it should be standardised so that diffs can be made on a different
architecture to the one they are deployed on, but currently it doesn't
work on the same architecture if that architecture is 64-bit
Diffstat (limited to 'libtbd_apply.c')
-rw-r--r-- | libtbd_apply.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libtbd_apply.c b/libtbd_apply.c index 53ac06b..4bf13ca 100644 --- a/libtbd_apply.c +++ b/libtbd_apply.c @@ -117,8 +117,8 @@ tbd_apply_cmd_dir_create(FILE *stream) if(strchr(dname, '/') != NULL) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); - uint32_t mtime; - if(fread(&mtime, sizeof(uint32_t), 1, stream) != 1) + time_t mtime; + if(fread(&mtime, sizeof(mtime), 1, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); uint32_t uid; @@ -215,13 +215,13 @@ tbd_apply_cmd_file_create(FILE *stream) if((strchr(fname, '/') != NULL) || (strcmp(fname, "..") == 0)) return TBD_ERROR(TBD_ERROR_INVALID_PARAMETER); - uint32_t mtime; + time_t mtime; uint32_t mode; uint32_t uid; uint32_t gid; uint32_t fsize; - if(fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + if(fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&mode, sizeof(uint32_t), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1 || @@ -268,7 +268,7 @@ static int tbd_apply_cmd_file_delta(FILE *stream) { uint16_t mdata_mask; - uint32_t mtime; + time_t mtime; uint32_t uid; uint32_t gid; uint32_t mode; @@ -288,7 +288,7 @@ tbd_apply_cmd_file_delta(FILE *stream) /* Reading metadata */ if(fread(&mdata_mask, sizeof(uint16_t), 1, stream) != 1 || - fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1 || fread(&mode, sizeof(uint32_t), 1, stream) != 1) @@ -458,11 +458,11 @@ static int tbd_apply_cmd_symlink_create(FILE *stream) { uint16_t len; - uint32_t mtime; + time_t mtime; uint32_t uid; uint32_t gid; - if(fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + if(fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1) return TBD_ERROR(TBD_ERROR_UNABLE_TO_READ_STREAM); @@ -505,14 +505,14 @@ static int tbd_apply_cmd_special_create(FILE *stream) { char *name = tbd_apply_fread_string(stream); - uint32_t mtime; + time_t mtime; uint32_t mode; uint32_t uid; uint32_t gid; uint32_t dev; if(name == NULL || - fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&mode, sizeof(uint32_t), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1 || @@ -542,13 +542,13 @@ static int tbd_apply_cmd_dir_delta(FILE *stream) { uint16_t metadata_mask; - uint32_t mtime; + time_t mtime; uint32_t uid; uint32_t gid; uint32_t mode; if(fread(&metadata_mask, sizeof(uint16_t), 1, stream) != 1 || - fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1 || fread(&mode, sizeof(uint32_t), 1, stream) != 1) @@ -577,13 +577,13 @@ static int tbd_apply_cmd_file_mdata_update(FILE *stream) { uint16_t metadata_mask; - uint32_t mtime; + time_t mtime; uint32_t uid; uint32_t gid; uint32_t mode; if(fread(&metadata_mask, sizeof(uint16_t), 1, stream) != 1 || - fread(&mtime, sizeof(uint32_t), 1, stream) != 1 || + fread(&mtime, sizeof(mtime), 1, stream) != 1 || fread(&uid, sizeof(uint32_t), 1, stream) != 1 || fread(&gid, sizeof(uint32_t), 1, stream) != 1 || fread(&mode, sizeof(uint32_t), 1, stream) != 1) |