Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Added the inode number to the .rsyncsum file.
[rsync/rsync-patches.git]
/
fsync.diff
diff --git
a/fsync.diff
b/fsync.diff
index
42f85a4
..
0424fde
100644
(file)
--- a/
fsync.diff
+++ b/
fsync.diff
@@
-9,15
+9,15
@@
To use this patch, run these commands for a successful build:
--- old/options.c
+++ new/options.c
--- old/options.c
+++ new/options.c
-@@ -4
5,6 +45
,7 @@ int append_mode = 0;
+@@ -4
4,6 +44
,7 @@ int append_mode = 0;
int keep_dirlinks = 0;
int copy_dirlinks = 0;
int copy_links = 0;
+int do_fsync = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int keep_dirlinks = 0;
int copy_dirlinks = 0;
int copy_links = 0;
+int do_fsync = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
- int preserve_
perm
s = 0;
-@@ -3
39,6 +340
,7 @@ void usage(enum logcode F)
+ int preserve_
acl
s = 0;
+@@ -3
67,6 +368
,7 @@ void usage(enum logcode F)
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
rprintf(F," --partial-dir=DIR put a partially transferred file into DIR\n");
rprintf(F," --delay-updates put all updated files into place at transfer's end\n");
rprintf(F," -m, --prune-empty-dirs prune empty directory chains from the file-list\n");
@@
-25,35
+25,35
@@
To use this patch, run these commands for a successful build:
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
-@@ -525,6 +527,7 @@ static struct poptOption long_options[]
- {"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
+@@ -580,6 +582,7 @@ static struct poptOption long_options[]
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
- {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
+ {"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
+ {"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
+ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
+ {"fsync", 0, POPT_ARG_NONE, &do_fsync, 0, 0, 0 },
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
+ {"numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 1, 0, 0 },
+ {"no-numeric-ids", 0, POPT_ARG_VAL, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
- {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1727,6 +1730,9 @@ void server_options(char **args,int *arg
- args[ac++] = tmpdir;
- }
+@@ -1885,6 +1888,9 @@ void server_options(char **args,int *arg
+ args[ac++] = tmpdir;
+ }
-+
if (do_fsync && am_sender
)
-+ args[ac++] = "--fsync";
++
if (do_fsync
)
++
args[ac++] = "--fsync";
+
+
-
if (basis_dir[0] && am_sender
) {
- /* the server only needs this option if it is not the sender,
- * and it may be an older version that doesn't know this
+
if (basis_dir[0]
) {
+
/* the server only needs this option if it is not the sender,
+
* and it may be an older version that doesn't know this
--- old/receiver.c
+++ new/receiver.c
--- old/receiver.c
+++ new/receiver.c
-@@ -37,6 +37,7 @@ extern int protocol_version;
- extern int relative_paths;
+@@ -39,6 +39,7 @@ extern int relative_paths;
extern int preserve_hard_links;
extern int preserve_perms;
extern int preserve_hard_links;
extern int preserve_perms;
+ extern int preserve_xattrs;
+extern int do_fsync;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
+extern int do_fsync;
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-@@ -25
8,6 +259
,12 @@ static int receive_data(int f_in, char *
+@@ -25
9,6 +260
,12 @@ static int receive_data(int f_in, char *
exit_cleanup(RERR_FILEIO);
}
exit_cleanup(RERR_FILEIO);
}
@@
-63,12
+63,12
@@
To use this patch, run these commands for a successful build:
+ exit_cleanup(RERR_FILEIO);
+ }
+
+ exit_cleanup(RERR_FILEIO);
+ }
+
- sum_end(file_sum1);
+ sum_
len = sum_
end(file_sum1);
if (mapbuf)
--- old/t_stub.c
+++ new/t_stub.c
if (mapbuf)
--- old/t_stub.c
+++ new/t_stub.c
-@@ -2
2,6 +22
,7 @@
+@@ -2
1,6 +21
,7 @@
#include "rsync.h"
#include "rsync.h"
@@
-78,7
+78,7
@@
To use this patch, run these commands for a successful build:
int relative_paths = 0;
--- old/util.c
+++ new/util.c
int relative_paths = 0;
--- old/util.c
+++ new/util.c
-@@ -2
6,6 +26
,7 @@
+@@ -2
5,6 +25
,7 @@
extern int verbose;
extern int dry_run;
extern int module_id;
extern int verbose;
extern int dry_run;
extern int module_id;
@@
-86,16
+86,17
@@
To use this patch, run these commands for a successful build:
extern int modify_window;
extern int relative_paths;
extern int human_readable;
extern int modify_window;
extern int relative_paths;
extern int human_readable;
-@@ -3
14,6 +315,12
@@ int copy_file(const char *source, const
-
return -1
;
+@@ -3
09,6 +310,13
@@ int copy_file(const char *source, const
+
full_fname(source))
;
}
+ if (do_fsync && fsync(ofd) < 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ full_fname(dest));
}
+ if (do_fsync && fsync(ofd) < 0) {
+ rsyserr(FERROR, errno, "fsync failed on %s",
+ full_fname(dest));
++ close(ofd);
+ return -1;
+ }
+
+ return -1;
+ }
+
- return 0;
- }
-
+ if (close(ofd) < 0) {
+ rsyserr(FERROR, errno, "close failed on %s",
+ full_fname(dest));