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
Don't define DEBUG with --enable-debug, because that makes zlib emit strange messages
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
1ab2bdd
..
93faa54
100644
(file)
--- a/
generator.c
+++ b/
generator.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
@@
-55,7
+56,7
@@
static int skip_file(char *fname,
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
- s
l
printf(fnamecmpdest,MAXPATHLEN,"%s/%s",
+ s
n
printf(fnamecmpdest,MAXPATHLEN,"%s/%s",
compare_dest,fname);
fname = fnamecmpdest;
}
compare_dest,fname);
fname = fnamecmpdest;
}
@@
-176,6
+177,15
@@
static struct sum_struct *generate_sums(struct map_struct *buf,OFF_T len,int n)
}
}
+
+/*
+ * Acts on file number I from FLIST, whose name is fname.
+ *
+ * First fixes up permissions, then generates checksums for the file.
+ *
+ * (This comment was added later by mbp who was trying to work it out;
+ * it might be wrong.)
+ */
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
{
int fd;
@@
-214,10
+224,17
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
}
if (S_ISDIR(file->mode)) {
}
if (S_ISDIR(file->mode)) {
+ /* The file to be received is a directory, so we need
+ * to prepare appropriately. If there is already a
+ * file of that name and it is *not* a directory, then
+ * we need to delete it. If it doesn't exist, then
+ * recursively create it. */
+
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
if (dry_run) return;
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
- rprintf(FERROR,"unlink %s : %s\n",fname,strerror(errno));
+ rprintf(FERROR,"recv_generator: unlink %s: %s\n",
+ fname,strerror(errno));
return;
}
statret = -1;
return;
}
statret = -1;
@@
-226,11
+243,13
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
if (!(relative_paths && errno==ENOENT &&
create_directory_path(fname)==0 &&
do_mkdir(fname,file->mode)==0)) {
if (!(relative_paths && errno==ENOENT &&
create_directory_path(fname)==0 &&
do_mkdir(fname,file->mode)==0)) {
- rprintf(FERROR,"
mkdir %s
: %s (2)\n",
+ rprintf(FERROR,"
recv_generator: mkdir %s
: %s (2)\n",
fname,strerror(errno));
}
}
fname,strerror(errno));
}
}
- if (set_perms(fname,file,NULL,0) && verbose)
+ /* f_out is set to -1 when doing final directory
+ permission and modification time repair */
+ if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1))
rprintf(FINFO,"%s/\n",fname);
return;
}
rprintf(FINFO,"%s/\n",fname);
return;
}
@@
-312,7
+331,7
@@
void recv_generator(char *fname,struct file_list *flist,int i,int f_out)
if ((statret == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
int saveerrno = errno;
if ((statret == -1) && (compare_dest != NULL)) {
/* try the file at compare_dest instead */
int saveerrno = errno;
- s
l
printf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
+ s
n
printf(fnamecmpbuf,MAXPATHLEN,"%s/%s",compare_dest,fname);
statret = link_stat(fnamecmpbuf,&st);
if (!S_ISREG(st.st_mode))
statret = -1;
statret = link_stat(fnamecmpbuf,&st);
if (!S_ISREG(st.st_mode))
statret = -1;
@@
-412,6
+431,11
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
rprintf(FINFO,"generator starting pid=%d count=%d\n",
(int)getpid(),flist->count);
rprintf(FINFO,"generator starting pid=%d count=%d\n",
(int)getpid(),flist->count);
+ /* we expect to just sit around now, so don't exit on a
+ timeout. If we really get a timeout then the other process should
+ exit */
+ io_timeout = 0;
+
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
mode_t saved_mode = file->mode;
for (i = 0; i < flist->count; i++) {
struct file_struct *file = flist->files[i];
mode_t saved_mode = file->mode;
@@
-422,6
+446,8
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
them. This is then fixed after the files are transferred */
if (!am_root && S_ISDIR(file->mode)) {
file->mode |= S_IWUSR; /* user write */
them. This is then fixed after the files are transferred */
if (!am_root && S_ISDIR(file->mode)) {
file->mode |= S_IWUSR; /* user write */
+ /* XXX: Could this be causing a problem on SCO? Perhaps their
+ * handling of permissions is strange? */
}
recv_generator(local_name?local_name:f_name(file),
}
recv_generator(local_name?local_name:f_name(file),
@@
-439,11
+465,6
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
write_int(f,-1);
write_int(f,-1);
- /* we expect to just sit around now, so don't exit on a
- timeout. If we really get a timeout then the other process should
- exit */
- io_timeout = 0;
-
if (remote_version >= 13) {
/* in newer versions of the protocol the files can cycle through
the system more than once to catch initial checksum errors */
if (remote_version >= 13) {
/* in newer versions of the protocol the files can cycle through
the system more than once to catch initial checksum errors */