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
Now support dynamic per-file checksum2 size.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
dd3eef6
..
740ce66
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-1,21
+1,21
@@
/* -*- c-file-style: "linux" -*-
rsync -- fast file replication program
/* -*- c-file-style: "linux" -*-
rsync -- fast file replication program
-
- Copyright (C) 1996-2000 by Andrew Tridgell
+
+ Copyright (C) 1996-2000 by Andrew Tridgell
Copyright (C) Paul Mackerras 1996
Copyright (C) 2002 by Martin Pool <mbp@samba.org>
Copyright (C) Paul Mackerras 1996
Copyright (C) 2002 by Martin Pool <mbp@samba.org>
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
@@
-41,6
+41,7
@@
extern int remote_version;
extern int always_checksum;
extern int modify_window;
extern char *compare_dest;
extern int always_checksum;
extern int modify_window;
extern char *compare_dest;
+extern int link_dest;
/* choose whether to skip a particular file */
/* choose whether to skip a particular file */
@@
-50,8
+51,23
@@
static int skip_file(char *fname,
if (st->st_size != file->length) {
return 0;
}
if (st->st_size != file->length) {
return 0;
}
-
- /* if always checksum is set then we use the checksum instead
+ if (link_dest) {
+ extern int preserve_perms;
+ extern int preserve_uid;
+ extern int preserve_gid;
+
+ if(preserve_perms
+ && (st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT))
+ return 0;
+
+ if (preserve_uid && st->st_uid != file->uid)
+ return 0;
+
+ if (preserve_gid && st->st_gid != file->gid)
+ return 0;
+ }
+
+ /* if always checksum is set then we use the checksum instead
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
of the file time to determine whether to sync */
if (always_checksum && S_ISREG(st->st_mode)) {
char sum[MD4_SUM_LENGTH];
@@
-60,7
+76,7
@@
static int skip_file(char *fname,
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
if (compare_dest != NULL) {
if (access(fname, 0) != 0) {
snprintf(fnamecmpdest,MAXPATHLEN,"%s/%s",
-
compare_dest,fname);
+ compare_dest,fname);
fname = fnamecmpdest;
}
}
fname = fnamecmpdest;
}
}
@@
-100,13
+116,21
@@
static int adapt_block_size(struct file_struct *file, int bsize)
/*
/*
- send a header that says "we have no checksums" down the f_out fd
+ * NULL sum_struct means we have no checksums
*/
*/
-static void send_null_sums(int f_out)
+
+void write_sum_head(int f, struct sum_struct *sum)
{
{
- write_int(f_out, 0);
- write_int(f_out, block_size);
- write_int(f_out, 0);
+ static struct sum_struct null_sum;
+
+ if (sum == (struct sum_struct *)NULL)
+ sum = &null_sum;
+
+ write_int(f, sum->count);
+ write_int(f, sum->blength);
+ if (remote_version >= 27)
+ write_int(f, sum->s2length);
+ write_int(f, sum->remainder);
}
}
@@
-122,22
+146,15
@@
static void send_null_sums(int f_out)
* Whew. */
static BOOL disable_deltas_p(void)
{
* Whew. */
static BOOL disable_deltas_p(void)
{
- extern int whole_file
, no_whole_file
;
+ extern int whole_file;
extern int local_server;
extern int write_batch;
extern int local_server;
extern int write_batch;
- assert(whole_file == 0 || whole_file == 1);
-
- /* whole_file and no_whole_file are never both on at the same time */
-
- if (whole_file)
+ if (whole_file > 0)
return True;
return True;
- else if (no_whole_file)
- return False;
- else if (write_batch)
+ if (whole_file == 0 || write_batch)
return False;
return False;
- else
- return local_server;
+ return local_server;
}
}
@@
-155,19
+172,18
@@
static void generate_and_send_sums(struct map_struct *buf, OFF_T len,
sum.count = (len + (block_len - 1)) / block_len;
sum.remainder = (len % block_len);
sum.count = (len + (block_len - 1)) / block_len;
sum.remainder = (len % block_len);
- sum.
n
= block_len;
+ sum.
blength
= block_len;
sum.flength = len;
sum.flength = len;
+ sum.s2length = csum_length;
/* not needed here sum.sums = NULL; */
if (sum.count && verbose > 3) {
rprintf(FINFO, "count=%ld rem=%ld n=%ld flength=%.0f\n",
(long) sum.count, (long) sum.remainder,
/* not needed here sum.sums = NULL; */
if (sum.count && verbose > 3) {
rprintf(FINFO, "count=%ld rem=%ld n=%ld flength=%.0f\n",
(long) sum.count, (long) sum.remainder,
- (long) sum.
n
, (double) sum.flength);
+ (long) sum.
blength
, (double) sum.flength);
}
}
- write_int(f_out, sum.count);
- write_int(f_out, sum.n);
- write_int(f_out, sum.remainder);
+ write_sum_head(f_out, &sum);
for (i = 0; i < sum.count; i++) {
int n1 = MIN(len, block_len);
for (i = 0; i < sum.count; i++) {
int n1 = MIN(len, block_len);
@@
-183,7
+199,7
@@
static void generate_and_send_sums(struct map_struct *buf, OFF_T len,
i, (double) offset, n1, (unsigned long) sum1);
}
write_int(f_out, sum1);
i, (double) offset, n1, (unsigned long) sum1);
}
write_int(f_out, sum1);
- write_buf(f_out, sum2,
csum_
length);
+ write_buf(f_out, sum2,
sum.s2
length);
len -= n1;
offset += n1;
}
len -= n1;
offset += n1;
}
@@
-198,9
+214,9
@@
static void generate_and_send_sums(struct map_struct *buf, OFF_T len,
*
* @note This comment was added later by mbp who was trying to work it
* out. It might be wrong.
*
* @note 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)
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
-{
+{
int fd;
STRUCT_STAT st;
struct map_struct *buf;
int fd;
STRUCT_STAT st;
struct map_struct *buf;
@@
-227,43
+243,43
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
return;
}
return;
}
- if (statret == 0 &&
- !preserve_perms &&
+ if (statret == 0 &&
+ !preserve_perms &&
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
/* if the file exists already and we aren't perserving
(S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) {
/* if the file exists already and we aren't perserving
-
pres
missions then act as though the remote end sent
-
us the file permissions we already have */
+
* per
missions then act as though the remote end sent
+
*
us the file permissions we already have */
file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
}
if (S_ISDIR(file->mode)) {
file->mode = (file->mode & _S_IFMT) | (st.st_mode & ~_S_IFMT);
}
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. */
-
+ /* 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; /* XXXX -- might cause inaccuracies?? -- mbp */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
rprintf(FERROR, RSYNC_NAME
": recv_generator: unlink \"%s\" to make room for directory: %s\n",
if (dry_run) return; /* XXXX -- might cause inaccuracies?? -- mbp */
if (statret == 0 && !S_ISDIR(st.st_mode)) {
if (robust_unlink(fname) != 0) {
rprintf(FERROR, RSYNC_NAME
": recv_generator: unlink \"%s\" to make room for directory: %s\n",
-
fname,strerror(errno));
+ fname,strerror(errno));
return;
}
statret = -1;
}
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
return;
}
statret = -1;
}
if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) {
- if (!(relative_paths && errno==ENOENT &&
- create_directory_path(fname, orig_umask)==0 &&
+ if (!(relative_paths && errno==ENOENT &&
+ create_directory_path(fname, orig_umask)==0 &&
do_mkdir(fname,file->mode)==0)) {
rprintf(FERROR, RSYNC_NAME ": recv_generator: mkdir \"%s\": %s (2)\n",
fname,strerror(errno));
}
}
do_mkdir(fname,file->mode)==0)) {
rprintf(FERROR, RSYNC_NAME ": recv_generator: mkdir \"%s\": %s (2)\n",
fname,strerror(errno));
}
}
- /* f_out is set to -1 when doing final directory
+ /* f_out is set to -1 when doing final directory
permission and modification time repair */
permission and modification time repair */
- if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1))
+ if (set_perms(fname,file,NULL,0) && verbose && (f_out != -1))
rprintf(FINFO,"%s/\n",fname);
return;
}
rprintf(FINFO,"%s/\n",fname);
return;
}
@@
-292,10
+308,10
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
set_perms(fname,file,&st,1);
return;
}
set_perms(fname,file,&st,1);
return;
}
- }
+ }
/* Not a symlink, so delete whatever's
* already there and put a new symlink
/* Not a symlink, so delete whatever's
* already there and put a new symlink
- * in place. */
+ * in place. */
delete_file(fname);
}
if (do_symlink(file->link,fname) != 0) {
delete_file(fname);
}
if (do_symlink(file->link,fname) != 0) {
@@
-313,9
+329,9
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
#ifdef HAVE_MKNOD
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
#ifdef HAVE_MKNOD
if (am_root && preserve_devices && IS_DEVICE(file->mode)) {
- if (statret != 0 ||
+ if (statret != 0 ||
st.st_mode != file->mode ||
st.st_mode != file->mode ||
- st.st_rdev != file->rdev) {
+ st.st_rdev != file->rdev) {
delete_file(fname);
if (verbose > 2)
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
delete_file(fname);
if (verbose > 2)
rprintf(FINFO,"mknod(%s,0%o,0x%x)\n",
@@
-356,6
+372,18
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
statret = -1;
if (statret == -1)
errno = saveerrno;
statret = -1;
if (statret == -1)
errno = saveerrno;
+#if HAVE_LINK
+ else if (link_dest && !dry_run) {
+ if (do_link(fnamecmpbuf, fname) != 0) {
+ if (verbose > 0)
+ rprintf(FINFO,"link %s => %s : %s\n",
+ fnamecmpbuf,
+ fname,
+ strerror(errno));
+ }
+ fnamecmp = fnamecmpbuf;
+ }
+#endif
else
fnamecmp = fnamecmpbuf;
}
else
fnamecmp = fnamecmpbuf;
}
@@
-363,7
+391,7
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
if (statret == -1) {
if (errno == ENOENT) {
write_int(f_out,i);
if (statret == -1) {
if (errno == ENOENT) {
write_int(f_out,i);
- if (!dry_run)
send_null_sums(f_out
);
+ if (!dry_run)
write_sum_head(f_out, NULL
);
} else {
if (verbose > 1)
rprintf(FERROR, RSYNC_NAME
} else {
if (verbose > 1)
rprintf(FERROR, RSYNC_NAME
@@
-380,15
+408,15
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
/* now pretend the file didn't exist */
write_int(f_out,i);
/* now pretend the file didn't exist */
write_int(f_out,i);
- if (!dry_run)
send_null_sums(f_out
);
+ if (!dry_run)
write_sum_head(f_out, NULL
);
return;
}
return;
}
- if (opt_ignore_existing && fnamecmp == fname) {
+ if (opt_ignore_existing && fnamecmp == fname) {
if (verbose > 1)
rprintf(FINFO,"%s exists\n",fname);
return;
if (verbose > 1)
rprintf(FINFO,"%s exists\n",fname);
return;
- }
+ }
if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
if (verbose > 1)
if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
if (verbose > 1)
@@
-409,18
+437,18
@@
void recv_generator(char *fname, struct file_list *flist, int i, int f_out)
if (disable_deltas_p()) {
write_int(f_out,i);
if (disable_deltas_p()) {
write_int(f_out,i);
-
send_null_sums(f_out
);
+
write_sum_head(f_out, NULL
);
return;
}
return;
}
- /* open the file */
+ /* open the file */
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
rprintf(FERROR,RSYNC_NAME": failed to open \"%s\", continuing : %s\n",fnamecmp,strerror(errno));
/* pretend the file didn't exist */
write_int(f_out,i);
fd = do_open(fnamecmp, O_RDONLY, 0);
if (fd == -1) {
rprintf(FERROR,RSYNC_NAME": failed to open \"%s\", continuing : %s\n",fnamecmp,strerror(errno));
/* pretend the file didn't exist */
write_int(f_out,i);
-
send_null_sums(f_out
);
+
write_sum_head(f_out, NULL
);
return;
}
return;
}
@@
-457,11
+485,11
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
if (verbose >= 2) {
rprintf(FINFO,
if (verbose >= 2) {
rprintf(FINFO,
- disable_deltas_p()
+ disable_deltas_p()
? "delta-transmission disabled for local transfer or --whole-file\n"
: "delta transmission enabled\n");
}
? "delta-transmission disabled for local transfer or --whole-file\n"
: "delta transmission enabled\n");
}
-
+
/* 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 */
/* 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 */
@@
-477,12
+505,11
@@
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? */
+ /* 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),
- flist,i,f);
+ recv_generator(local_name?local_name:f_name(file), flist,i,f);
file->mode = saved_mode;
}
file->mode = saved_mode;
}
@@
-496,19
+523,16
@@
void generate_files(int f,struct file_list *flist,char *local_name,int f_recv)
write_int(f,-1);
write_int(f,-1);
- 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 */
- for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
- struct file_struct *file = flist->files[i];
- recv_generator(local_name?local_name:f_name(file),
- flist,i,f);
- }
+ /* files can cycle through the system more than once
+ * to catch initial checksum errors */
+ for (i=read_int(f_recv); i != -1; i=read_int(f_recv)) {
+ struct file_struct *file = flist->files[i];
+ recv_generator(local_name?local_name:f_name(file), flist,i,f);
+ }
-
phase++;
-
if (verbose > 2)
-
rprintf(FINFO,"generate_files phase=%d\n",phase);
+ phase++;
+ if (verbose > 2)
+ rprintf(FINFO,"generate_files phase=%d\n",phase);
- write_int(f,-1);
- }
+ write_int(f,-1);
}
}