X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a5e6228afbf1809d33d9a31e0895c5e955c39ce1..85096e5eda83525eadddc9c6b1bc8135ac22e54a:/fsync.diff diff --git a/fsync.diff b/fsync.diff index f782f24..af3b80c 100644 --- a/fsync.diff +++ b/fsync.diff @@ -18,7 +18,7 @@ diff --git a/options.c b/options.c int preserve_links = 0; int preserve_hard_links = 0; int preserve_acls = 0; -@@ -378,6 +379,7 @@ void usage(enum logcode F) +@@ -382,6 +383,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"); @@ -26,7 +26,7 @@ diff --git a/options.c b/options.c rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n"); rprintf(F," --timeout=SECONDS set I/O timeout in seconds\n"); rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n"); -@@ -607,6 +609,7 @@ static struct poptOption long_options[] = { +@@ -613,6 +615,7 @@ static struct poptOption long_options[] = { {"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 }, {"no-timeout", 0, POPT_ARG_VAL, &io_timeout, 0, 0, 0 }, {"contimeout", 0, POPT_ARG_INT, &connect_timeout, 0, 0, 0 }, @@ -34,7 +34,7 @@ diff --git a/options.c b/options.c {"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 }, {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 }, -@@ -1955,6 +1958,9 @@ void server_options(char **args, int *argc_p) +@@ -1977,6 +1980,9 @@ void server_options(char **args, int *argc_p) args[ac++] = tmpdir; }