--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
---- Makefile.in 2 May 2004 17:04:14 -0000 1.100
-+++ Makefile.in 13 May 2004 19:15:31 -0000
+--- Makefile.in 15 May 2004 00:48:11 -0000 1.101
++++ Makefile.in 15 May 2004 20:47:12 -0000
@@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
zlib/zutil.o zlib/adler32.o
OBJS2=options.o flist.o io.o compat.o hlink.o token.o uidlist.o socket.o \
fileio.o batch.o clientname.o
OBJS3=progress.o pipe.o
---- generator.c 13 May 2004 06:55:01 -0000 1.82
-+++ generator.c 13 May 2004 19:15:31 -0000
+--- generator.c 15 May 2004 19:31:10 -0000 1.83
++++ generator.c 15 May 2004 20:47:12 -0000
@@ -51,6 +51,7 @@ extern int list_only;
extern int only_existing;
extern int orig_umask;
/* choose whether to skip a particular file */
-@@ -256,7 +257,62 @@ static void generate_and_send_sums(struc
+@@ -256,7 +257,61 @@ static void generate_and_send_sums(struc
}
}
+ STRUCT_STAT *st)
+{
+ int fd = -1;
-
++
+ if (statret == 0) {
+ if (S_ISREG(st->st_mode)) {
+ if (update_only
+ }
+ fd = do_open(fname, O_RDONLY, 0);
+ if (fd == -1) {
-+ rprintf(FERROR, "failed to open %s, continuing : %s\n",
-+ full_fname(fname), strerror(errno));
++ rsyserr(FERROR, errno, "failed to open %s, continuing",
++ full_fname(fname));
+ return -1;
+ }
+ return fd;
+
+ if (fd == -1 && compare_dest != NULL)
+ fd = open_alternate_base_comparedir(fname);
-+
+
+ if (fd == -1 && fuzzy)
+ fd = open_alternate_base_fuzzy(fname);
+
+ /* Update stat to understand size */
+ if (fd != -1) {
+ if (do_fstat(fd, st) != 0) {
-+ rprintf(FERROR, "fstat %s : %s\n",
-+ full_fname(fname), strerror(errno));
++ rsyserr(FERROR, errno, "fstat %s", full_fname(fname));
+ }
+ }
+
/**
* Acts on file number @p i from @p flist, whose name is @p fname.
-@@ -272,8 +328,6 @@ void recv_generator(char *fname, struct
+@@ -272,8 +327,6 @@ void recv_generator(char *fname, struct
STRUCT_STAT st;
struct map_struct *mapbuf;
int statret;
if (list_only)
return;
-@@ -398,108 +452,38 @@ void recv_generator(char *fname, struct
+@@ -400,107 +453,39 @@ void recv_generator(char *fname, struct
}
#endif
- 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));
+- rsyserr(FINFO, errno, "link %s => %s",
+- fnamecmpbuf, fname);
- }
- }
- fnamecmp = fnamecmpbuf;
- } else if (verbose > 1) {
+ /* Failed to stat for some reason besides "not found". */
+ if (statret == -1 && errno != ENOENT) {
-+ if (verbose > 1)
- rprintf(FERROR,
-- "recv_generator: failed to open %s: %s\n",
-+ "recv_generator failed to stat %s: %s\n",
- full_fname(fname), strerror(errno));
-- }
++ if (verbose > 1) {
+ rsyserr(FERROR, errno,
+- "recv_generator: failed to open %s",
++ "recv_generator failed to stat %s",
+ full_fname(fname));
+ }
return;
}
- return;
- write_int(f_out,i);
- if (!dry_run) write_sum_head(f_out, NULL);
-+ if ((fd = open_base_file(file, fname, statret, &st)) == -2)
- return;
+- return;
- }
-
- if (opt_ignore_existing && fnamecmp == fname) {
- if (verbose > 1)
- rprintf(FINFO,"%s exists\n",fname);
-- return;
++ if ((fd = open_base_file(file, fname, statret, &st)) == -2)
+ return;
- }
- if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
- fd = do_open(fnamecmp, O_RDONLY, 0);
-
if (fd == -1) {
-- rprintf(FERROR, "failed to open %s, continuing: %s\n",
-- full_fname(fnamecmp), strerror(errno));
+- rsyserr(FERROR, errno, "failed to open %s, continuing",
+- full_fname(fnamecmp));
- /* pretend the file didn't exist */
+ /* the file didn't exist, or we can pretend it doesn't */
if (preserve_hard_links && hard_link_check(file, HL_SKIP))
return;
}
-@@ -509,7 +493,7 @@ void recv_generator(char *fname, struct
+@@ -510,7 +495,7 @@ void recv_generator(char *fname, struct
mapbuf = NULL;
if (verbose > 3) {
}
--- options.c 6 May 2004 21:08:01 -0000 1.148
-+++ options.c 13 May 2004 19:15:32 -0000
++++ options.c 15 May 2004 20:47:13 -0000
@@ -91,6 +91,7 @@ int ignore_errors = 0;
int modify_window = 0;
int blocking_io = -1;
*argc = ac;
return;
---- receiver.c 13 May 2004 07:08:22 -0000 1.77
-+++ receiver.c 13 May 2004 19:15:32 -0000
+--- receiver.c 15 May 2004 19:31:10 -0000 1.78
++++ receiver.c 15 May 2004 20:47:13 -0000
@@ -46,6 +46,7 @@ extern int module_id;
extern int ignore_errors;
extern int orig_umask;
static void delete_one(char *fn, int is_dir)
{
-@@ -293,8 +294,6 @@ int recv_files(int f_in,struct file_list
+@@ -294,8 +295,6 @@ int recv_files(int f_in,struct file_list
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
struct map_struct *mapbuf;
int i;
struct file_struct *file;
-@@ -357,35 +356,31 @@ int recv_files(int f_in,struct file_list
+@@ -358,35 +357,31 @@ int recv_files(int f_in,struct file_list
if (verbose > 2)
rprintf(FINFO,"recv_files(%s)\n",fname);
+ fd1 = open_alternate_base_fuzzy(fname);
if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
- rprintf(FERROR, "fstat %s failed: %s\n",
-- full_fname(fnamecmp), strerror(errno));
-+ full_fname(fname), strerror(errno));
+ rsyserr(FERROR, errno, "fstat %s failed",
+- full_fname(fnamecmp));
++ full_fname(fname));
receive_data(f_in,NULL,-1,NULL,file->length);
close(fd1);
continue;
receive_data(f_in, NULL, -1, NULL, file->length);
close(fd1);
continue;
-@@ -406,8 +401,10 @@ int recv_files(int f_in,struct file_list
+@@ -407,8 +402,10 @@ int recv_files(int f_in,struct file_list
if (fd1 != -1 && st.st_size > 0) {
mapbuf = map_file(fd1,st.st_size);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff