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
added "created dir" message
[rsync/rsync.git]
/
rsync.c
diff --git
a/rsync.c
b/rsync.c
index
874d8aa
..
d9b7e61
100644
(file)
--- a/
rsync.c
+++ b/
rsync.c
@@
-469,7
+469,7
@@
static void delete_files(struct file_list *flist)
static char *cleanup_fname = NULL;
static char *cleanup_fname = NULL;
-
int
sig_int(void)
+
void
sig_int(void)
{
if (cleanup_fname)
unlink(cleanup_fname);
{
if (cleanup_fname)
unlink(cleanup_fname);
@@
-486,8
+486,9
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
char *buf;
int i;
char *buf;
int i;
- if (verbose > 2)
+ if (verbose > 2)
{
fprintf(stderr,"recv_files(%d) starting\n",flist->count);
fprintf(stderr,"recv_files(%d) starting\n",flist->count);
+ }
if (recurse && delete_mode && !local_name && flist->count>0) {
delete_files(flist);
if (recurse && delete_mode && !local_name && flist->count>0) {
delete_files(flist);
@@
-513,25
+514,21
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
fprintf(stderr,"recv_files(%s)\n",fname);
/* open the file */
fprintf(stderr,"recv_files(%s)\n",fname);
/* open the file */
- if ((fd1 = open(fname,O_RDONLY)) == -1 &&
- (fd1 = open(fname,O_RDONLY|O_CREAT,flist->files[i].mode)) == -1) {
- fprintf(stderr,"recv_files failed to open %s\n",fname);
- return -1;
- }
+ fd1 = open(fname,O_RDONLY);
- if (fstat(fd1,&st) != 0) {
+ if (f
d1 != -1 && f
stat(fd1,&st) != 0) {
fprintf(stderr,"fstat %s : %s\n",fname,strerror(errno));
close(fd1);
return -1;
}
fprintf(stderr,"fstat %s : %s\n",fname,strerror(errno));
close(fd1);
return -1;
}
- if (!S_ISREG(st.st_mode)) {
+ if (
fd1 != -1 &&
!S_ISREG(st.st_mode)) {
fprintf(stderr,"%s : not a regular file\n",fname);
close(fd1);
return -1;
}
fprintf(stderr,"%s : not a regular file\n",fname);
close(fd1);
return -1;
}
- if (st.st_size > 0) {
+ if (
fd1 != -1 &&
st.st_size > 0) {
buf = map_file(fd1,st.st_size);
if (!buf) {
fprintf(stderr,"map_file failed\n");
buf = map_file(fd1,st.st_size);
if (!buf) {
fprintf(stderr,"map_file failed\n");
@@
-564,7
+561,10
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
/* recv file data */
receive_data(f_in,buf,fd2,fname);
/* recv file data */
receive_data(f_in,buf,fd2,fname);
- close(fd1);
+ if (fd1 != -1) {
+ unmap_file(buf,st.st_size);
+ close(fd1);
+ }
close(fd2);
if (verbose > 2)
close(fd2);
if (verbose > 2)
@@
-573,7
+573,7
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
if (make_backups) {
char fnamebak[MAXPATHLEN];
sprintf(fnamebak,"%s%s",fname,backup_suffix);
if (make_backups) {
char fnamebak[MAXPATHLEN];
sprintf(fnamebak,"%s%s",fname,backup_suffix);
- if (rename(fname,fnamebak) != 0) {
+ if (rename(fname,fnamebak) != 0
&& errno != ENOENT
) {
fprintf(stderr,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
exit(1);
}
fprintf(stderr,"rename %s %s : %s\n",fname,fnamebak,strerror(errno));
exit(1);
}
@@
-587,8
+587,6
@@
int recv_files(int f_in,struct file_list *flist,char *local_name)
cleanup_fname = NULL;
cleanup_fname = NULL;
- unmap_file(buf,st.st_size);
-
set_perms(fname,&flist->files[i],NULL,0);
}
set_perms(fname,&flist->files[i],NULL,0);
}
@@
-615,6
+613,8
@@
off_t send_files(struct file_list *flist,int f_out,int f_in)
while (1)
{
while (1)
{
+ read_check(f_in);
+
i = read_int(f_in);
if (i == -1) break;
i = read_int(f_in);
if (i == -1) break;
@@
-680,7
+680,7
@@
off_t send_files(struct file_list *flist,int f_out,int f_in)
if (!am_server && verbose)
printf("%s\n",fname);
if (!am_server && verbose)
printf("%s\n",fname);
- match_sums(f_out,s,buf,st.st_size);
+ match_sums(f_out,s,buf,st.st_size
,f_in
);
write_flush(f_out);
unmap_file(buf,st.st_size);
write_flush(f_out);
unmap_file(buf,st.st_size);