Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Limit the block-size that the user can specify.
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
f69fa1d
..
ac8f26b
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-55,9
+55,8
@@
static void delete_one(char *fn, int is_dir)
if (robust_unlink(fn) != 0) {
rsyserr(FERROR, errno, "delete_one: unlink %s failed",
full_fname(fn));
if (robust_unlink(fn) != 0) {
rsyserr(FERROR, errno, "delete_one: unlink %s failed",
full_fname(fn));
- } else if (verbose)
{
+ } else if (verbose)
rprintf(FINFO, "deleting %s\n", fn);
rprintf(FINFO, "deleting %s\n", fn);
- }
} else {
if (do_rmdir(fn) != 0) {
if (errno == ENOTDIR && keep_dirlinks) {
} else {
if (do_rmdir(fn) != 0) {
if (errno == ENOTDIR && keep_dirlinks) {
@@
-69,9
+68,8
@@
static void delete_one(char *fn, int is_dir)
"delete_one: rmdir %s failed",
full_fname(fn));
}
"delete_one: rmdir %s failed",
full_fname(fn));
}
- } else if (verbose)
{
+ } else if (verbose)
rprintf(FINFO, "deleting directory %s\n", fn);
rprintf(FINFO, "deleting directory %s\n", fn);
- }
}
}
}
}
@@
-121,7
+119,7
@@
void delete_files(struct file_list *flist)
if (flist_find(flist,local_file_list->files[i]) < 0) {
char *f = f_name(local_file_list->files[i]);
if (make_backups && (backup_dir || !is_backup_file(f))) {
if (flist_find(flist,local_file_list->files[i]) < 0) {
char *f = f_name(local_file_list->files[i]);
if (make_backups && (backup_dir || !is_backup_file(f))) {
-
(void)
make_backup(f);
+ make_backup(f);
if (verbose)
rprintf(FINFO, "deleting %s\n", f);
} else {
if (verbose)
rprintf(FINFO, "deleting %s\n", f);
} else {
@@
-208,7
+206,7
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
char *data;
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
char *data;
static char file_sum1[MD4_SUM_LENGTH];
static char file_sum2[MD4_SUM_LENGTH];
- char *map
=
NULL;
+ char *map
=
NULL;
read_sum_head(f_in, &sum);
read_sum_head(f_in, &sum);
@@
-241,7
+239,7
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
i = -(i+1);
offset2 = i*(OFF_T)sum.blength;
len = sum.blength;
i = -(i+1);
offset2 = i*(OFF_T)sum.blength;
len = sum.blength;
- if (i == (int)
sum.count-1 && sum.remainder != 0)
+ if (i == (int)sum.count-1 && sum.remainder != 0)
len = sum.remainder;
stats.matched_data += len;
len = sum.remainder;
stats.matched_data += len;
@@
-257,7
+255,7
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
sum_update(map,len);
}
sum_update(map,len);
}
- if (fd != -1 && write_file(fd,
map,len) != (int)
len) {
+ if (fd != -1 && write_file(fd,
map, len) != (int)
len) {
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
rsyserr(FERROR, errno, "write failed on %s",
full_fname(fname));
exit_cleanup(RERR_FILEIO);
@@
-279,12
+277,10
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
sum_end(file_sum1);
read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
sum_end(file_sum1);
read_buf(f_in,file_sum2,MD4_SUM_LENGTH);
- if (verbose > 2)
{
+ if (verbose > 2)
rprintf(FINFO,"got file_sum\n");
rprintf(FINFO,"got file_sum\n");
- }
- if (fd != -1 && memcmp(file_sum1,file_sum2,MD4_SUM_LENGTH) != 0) {
+ if (fd != -1 && memcmp(file_sum1, file_sum2, MD4_SUM_LENGTH) != 0)
return 0;
return 0;
- }
return 1;
}
return 1;
}
@@
-293,7
+289,7
@@
static int receive_data(int f_in,struct map_struct *mapbuf,int fd,char *fname,
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
* main routine for receiver process.
*
* Receiver process runs on the same host as the generator process. */
-int recv_files(int f_in,
struct file_list *flist,
char *local_name)
+int recv_files(int f_in,
struct file_list *flist,
char *local_name)
{
int fd1,fd2;
STRUCT_STAT st;
{
int fd1,fd2;
STRUCT_STAT st;
@@
-308,9
+304,8
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
int save_make_backups = make_backups;
int i, recv_ok, phase = 0;
int save_make_backups = make_backups;
int i, recv_ok, phase = 0;
- if (verbose > 2)
{
+ if (verbose > 2)
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
- }
if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
if (flist->hlink_pool) {
pool_destroy(flist->hlink_pool);
@@
-353,9
+348,8
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
fname = f_name_to(file, fbuf);
if (dry_run) {
fname = f_name_to(file, fbuf);
if (dry_run) {
- if (!am_server && verbose)
{ /* log transfer */
+ if (!am_server && verbose)
rprintf(FINFO, "%s\n", fname);
rprintf(FINFO, "%s\n", fname);
- }
continue;
}
continue;
}
@@
-421,8
+415,10
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
mapbuf = NULL;
if (!get_tmpname(fnametmp,fname)) {
mapbuf = NULL;
if (!get_tmpname(fnametmp,fname)) {
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) close(fd1);
+ if (mapbuf)
+ unmap_file(mapbuf);
+ if (fd1 != -1)
+ close(fd1);
continue;
}
continue;
}
@@
-448,35
+444,33
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
receive_data(f_in,mapbuf,-1,NULL,file->length);
rsyserr(FERROR, errno, "mkstemp %s failed",
full_fname(fnametmp));
receive_data(f_in,mapbuf,-1,NULL,file->length);
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) close(fd1);
+ if (mapbuf)
+ unmap_file(mapbuf);
+ if (fd1 != -1)
+ close(fd1);
continue;
}
cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
continue;
}
cleanup_set(fnametmp, fname, file, mapbuf, fd1, fd2);
- if (!am_server && verbose)
{ /* log transfer */
+ if (!am_server && verbose)
rprintf(FINFO, "%s\n", fname);
rprintf(FINFO, "%s\n", fname);
- }
/* recv file data */
recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
log_recv(file, &initial_stats);
/* recv file data */
recv_ok = receive_data(f_in,mapbuf,fd2,fname,file->length);
log_recv(file, &initial_stats);
- if (mapbuf) unmap_file(mapbuf);
- if (fd1 != -1) {
+ if (mapbuf)
+ unmap_file(mapbuf);
+ if (fd1 != -1)
close(fd1);
close(fd1);
- }
if (close(fd2) < 0) {
rsyserr(FERROR, errno, "close failed on %s",
full_fname(fnametmp));
exit_cleanup(RERR_FILEIO);
}
if (close(fd2) < 0) {
rsyserr(FERROR, errno, "close failed on %s",
full_fname(fnametmp));
exit_cleanup(RERR_FILEIO);
}
- if (verbose > 2)
- rprintf(FINFO,"renaming %s to %s\n",fnametmp,fname);
-
if (recv_ok || keep_partial)
finish_transfer(fname, fnametmp, file, recv_ok);
else
if (recv_ok || keep_partial)
finish_transfer(fname, fnametmp, file, recv_ok);
else