static void flist_expand(struct file_list *flist)
{
if (flist->count >= flist->malloced) {
+ size_t new_bytes;
+ void *new_ptr;
+
if (flist->malloced < 1000)
flist->malloced += 1000;
else
flist->malloced *= 2;
- flist->files = (struct file_struct **)
- realloc(flist->files,
- sizeof(flist->files[0]) * flist->malloced);
+
+ new_bytes = sizeof(flist->files[0]) * flist->malloced;
+
+ new_ptr = realloc(flist->files, new_bytes);
+
+ if (verbose >= 2) {
+ rprintf(FINFO, RSYNC_NAME ": expand file_list to %.0f bytes, did%s move\n",
+ (double) new_bytes,
+ (new_ptr == flist->files) ? " not" : "");
+ }
+
+ flist->files = (struct file_struct **) new_ptr;
+
if (!flist->files)
out_of_memory("flist_expand");
}
unsigned char flags;
static time_t last_time;
static mode_t last_mode;
- static dev_t last_rdev;
+ static DEV64_T last_rdev;
static uid_t last_uid;
static gid_t last_gid;
static char lastname[MAXPATHLEN];
{
static time_t last_time;
static mode_t last_mode;
- static dev_t last_rdev;
+ static DEV64_T last_rdev;
static uid_t last_uid;
static gid_t last_gid;
static char lastname[MAXPATHLEN];
file->gid = st.st_gid;
file->dev = st.st_dev;
file->inode = st.st_ino;
-#ifdef HAVE_ST_RDEV
+#ifdef HAVE_STRUCT_STAT_ST_RDEV
file->rdev = st.st_rdev;
#endif
}
if (f != -1) {
- io_end_buffering(f);
+ io_end_buffering();
stats.flist_size = stats.total_written - start_write;
stats.num_files = flist->count;
if (write_batch) /* dw */
for (flags = read_byte(f); flags; flags = read_byte(f)) {
+ int i = flist->count;
+
flist_expand(flist);
receive_file_entry(&flist->files[i], flags, f);