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
Print a warning message in the version if the platform cannot support 32-bit ints
[rsync/rsync.git]
/
receiver.c
diff --git
a/receiver.c
b/receiver.c
index
9621578
..
7be9588
100644
(file)
--- a/
receiver.c
+++ b/
receiver.c
@@
-1,5
+1,6
@@
-/*
- Copyright (C) Andrew Tridgell 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
Copyright (C) Paul Mackerras 1996
This program is free software; you can redistribute it and/or modify
@@
-36,14
+37,12
@@
extern char *compare_dest;
extern int make_backups;
extern char *backup_suffix;
extern int make_backups;
extern char *backup_suffix;
-
static struct delete_list {
dev_t dev;
INO_T inode;
} *delete_list;
static int dlist_len, dlist_alloc_len;
static struct delete_list {
dev_t dev;
INO_T inode;
} *delete_list;
static int dlist_len, dlist_alloc_len;
-
/* yuck! This function wouldn't have been necessary if I had the sorting
algorithm right. Unfortunately fixing the sorting algorithm would introduce
a backward incompatibility as file list indexes are sent over the link.
/* yuck! This function wouldn't have been necessary if I had the sorting
algorithm right. Unfortunately fixing the sorting algorithm would introduce
a backward incompatibility as file list indexes are sent over the link.
@@
-84,14
+83,15
@@
static void delete_one(struct file_struct *f)
{
if (!S_ISDIR(f->mode)) {
if (robust_unlink(f_name(f)) != 0) {
{
if (!S_ISDIR(f->mode)) {
if (robust_unlink(f_name(f)) != 0) {
- rprintf(FERROR,"
unlink %s
: %s\n",f_name(f),strerror(errno));
+ rprintf(FERROR,"
delete_one: unlink %s
: %s\n",f_name(f),strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting %s\n",f_name(f));
}
} else {
if (do_rmdir(f_name(f)) != 0) {
if (errno != ENOTEMPTY && errno != EEXIST)
} else if (verbose) {
rprintf(FINFO,"deleting %s\n",f_name(f));
}
} else {
if (do_rmdir(f_name(f)) != 0) {
if (errno != ENOTEMPTY && errno != EEXIST)
- rprintf(FERROR,"rmdir %s : %s\n",f_name(f),strerror(errno));
+ rprintf(FERROR,"delete_one: rmdir %s: %s\n",
+ f_name(f), strerror(errno));
} else if (verbose) {
rprintf(FINFO,"deleting directory %s\n",f_name(f));
}
} else if (verbose) {
rprintf(FINFO,"deleting directory %s\n",f_name(f));
}
@@
-104,17
+104,20
@@
static void delete_one(struct file_struct *f)
/* this deletes any files on the receiving side that are not present
on the sending side. For version 1.6.4 I have changed the behaviour
to match more closely what most people seem to expect of this option */
/* this deletes any files on the receiving side that are not present
on the sending side. For version 1.6.4 I have changed the behaviour
to match more closely what most people seem to expect of this option */
-
static
void delete_files(struct file_list *flist)
+void delete_files(struct file_list *flist)
{
struct file_list *local_file_list;
int i, j;
char *name;
extern int module_id;
{
struct file_list *local_file_list;
int i, j;
char *name;
extern int module_id;
+ extern int ignore_errors;
+ extern int max_delete;
+ static int deletion_count;
if (cvs_exclude)
add_cvs_excludes();
if (cvs_exclude)
add_cvs_excludes();
- if (io_error && !
lp_ignore_errors(module_id
)) {
+ if (io_error && !
(lp_ignore_errors(module_id) || ignore_errors
)) {
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
rprintf(FINFO,"IO error encountered - skipping file deletion\n");
return;
}
@@
-137,6
+140,7
@@
static void delete_files(struct file_list *flist)
rprintf(FINFO,"deleting in %s\n", name);
for (i=local_file_list->count-1;i>=0;i--) {
rprintf(FINFO,"deleting in %s\n", name);
for (i=local_file_list->count-1;i>=0;i--) {
+ if (max_delete && deletion_count > max_delete) break;
if (!local_file_list->files[i]->basename) continue;
if (remote_version < 19 &&
S_ISDIR(local_file_list->files[i]->mode))
if (!local_file_list->files[i]->basename) continue;
if (remote_version < 19 &&
S_ISDIR(local_file_list->files[i]->mode))
@@
-144,10
+148,12
@@
static void delete_files(struct file_list *flist)
if (-1 == flist_find(flist,local_file_list->files[i])) {
char *f = f_name(local_file_list->files[i]);
int k = strlen(f) - strlen(backup_suffix);
if (-1 == flist_find(flist,local_file_list->files[i])) {
char *f = f_name(local_file_list->files[i]);
int k = strlen(f) - strlen(backup_suffix);
+/* Hi Andrew, do we really need to play with backup_suffix here? */
if (make_backups && ((k <= 0) ||
(strcmp(f+k,backup_suffix) != 0))) {
(void) make_backup(f);
} else {
if (make_backups && ((k <= 0) ||
(strcmp(f+k,backup_suffix) != 0))) {
(void) make_backup(f);
} else {
+ deletion_count++;
delete_one(local_file_list->files[i]);
}
}
delete_one(local_file_list->files[i]);
}
}
@@
-222,8
+228,8
@@
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
extern int cleanup_got_literal;
if (verbose > 3) {
extern int cleanup_got_literal;
if (verbose > 3) {
- rprintf(FINFO,"data recv %d at %
d
\n",
- i,(
int
)offset);
+ rprintf(FINFO,"data recv %d at %
.0f
\n",
+ i,(
double
)offset);
}
stats.literal_data += i;
}
stats.literal_data += i;
@@
-240,7
+246,7
@@
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
}
i = -(i+1);
}
i = -(i+1);
- offset2 = i*n;
+ offset2 = i*
(OFF_T)
n;
len = n;
if (i == count-1 && remainder != 0)
len = remainder;
len = n;
if (i == count-1 && remainder != 0)
len = remainder;
@@
-248,13
+254,15
@@
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
stats.matched_data += len;
if (verbose > 3)
stats.matched_data += len;
if (verbose > 3)
- rprintf(FINFO,"chunk[%d] of size %d at %
d offset=%d
\n",
- i,len,(
int)offset2,(int
)offset);
+ rprintf(FINFO,"chunk[%d] of size %d at %
.0f offset=%.0f
\n",
+ i,len,(
double)offset2,(double
)offset);
- map = map_ptr(buf,offset2,len);
+ if (buf) {
+ map = map_ptr(buf,offset2,len);
- see_token(map, len);
- sum_update(map,len);
+ see_token(map, len);
+ sum_update(map,len);
+ }
if (fd != -1 && write_file(fd,map,len) != len) {
rprintf(FERROR,"write failed on %s : %s\n",
if (fd != -1 && write_file(fd,map,len) != len) {
rprintf(FERROR,"write failed on %s : %s\n",
@@
-264,7
+272,7
@@
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
offset += len;
}
offset += len;
}
- end_progress();
+ end_progress(
total_size
);
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
rprintf(FERROR,"write failed on %s : %s\n",
if (fd != -1 && offset > 0 && sparse_end(fd) != 0) {
rprintf(FERROR,"write failed on %s : %s\n",
@@
-288,6
+296,8
@@
static int receive_data(int f_in,struct map_struct *buf,int fd,char *fname,
}
}
+/* 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 f_gen)
{
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
{
@@
-304,16
+314,13
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
int recv_ok;
extern struct stats stats;
extern int preserve_perms;
int recv_ok;
extern struct stats stats;
extern int preserve_perms;
+ extern int delete_after;
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
struct stats initial_stats;
if (verbose > 2) {
rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
}
- if (recurse && delete_mode && !local_name && flist->count>0) {
- delete_files(flist);
- }
-
while (1) {
cleanup_disable();
while (1) {
cleanup_disable();
@@
-394,7
+401,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
if (fd1 != -1 && st.st_size > 0) {
buf = map_file(fd1,st.st_size);
if (verbose > 2)
if (fd1 != -1 && st.st_size > 0) {
buf = map_file(fd1,st.st_size);
if (verbose > 2)
- rprintf(FINFO,"recv mapped %s of size %
d\n",fnamecmp,(int
)st.st_size);
+ rprintf(FINFO,"recv mapped %s of size %
.0f\n",fnamecmp,(double
)st.st_size);
} else {
buf = NULL;
}
} else {
buf = NULL;
}
@@
-465,7
+472,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
finish_transfer(fname, fnametmp, file);
cleanup_disable();
finish_transfer(fname, fnametmp, file);
cleanup_disable();
-
+
if (!recv_ok) {
if (csum_length == SUM_LENGTH) {
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
if (!recv_ok) {
if (csum_length == SUM_LENGTH) {
rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
@@
-478,6
+485,12
@@
int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
}
}
}
}
+ if (delete_after) {
+ if (recurse && delete_mode && !local_name && flist->count>0) {
+ delete_files(flist);
+ }
+ }
+
if (preserve_hard_links)
do_hard_links(flist);
if (preserve_hard_links)
do_hard_links(flist);