search for: blocking_io

...neral agreement that it would be a good thing (especially for systems that don't have rsh at all). However, the changes were never integrated into rsync. This patch adds the --with-rsh=CMD option to configure and modifies main.c to improve the blocking-IO setting code. The old code would set blocking_io to '1' if the string matched either "rsh" or "remsh" (whichever one was configured into rsync). The new code has a slightly modified version of this check (that still works even if RSYNC_RSH isn't defined to be "rsh"), but it also adds a way to force the b...

...uld just leave it for later. Code-wise it is almost trivial but user impact for those that depend on the default being rsh or remsh is potentially non-trivial. I think most that need rsh instead of ssh would be fine just setting RSYNC_RSH but the magic with [non]blocking io based on if ((blocking_io == -1) && (strcmp(cmd, RSYNC_RSH) == 0)) blocking_io = 1; might means some might have to add the --blocking-io option so they might as well use "-e rsh --blocking-io". Of course that bit of logic also means that "configure --with-rsh=ssh" would get the...

...pe.c rsync-2.5.6-filtered/pipe.c --- rsync-2.5.6/pipe.c 2002-04-08 09:39:56.000000000 +0200 +++ rsync-2.5.6-filtered/pipe.c 2003-11-16 13:20:34.000000000 +0100 @@ -146,3 +146,90 @@ } +pid_t run_filter(char *command[], int out, int *pipe_to_filter) +{ + pid_t pid; + int pipefds[2]; + extern int blocking_io; + + if (verbose >= 2) { + print_child_argv(command); + } + + if (pipe(pipefds) < 0) { + rprintf(FERROR, "pipe: %s\n", strerror(errno)); + exit_cleanup(RERR_IPC); + } + + pid = fork(); + if (pid == -1) { + rprintf(FERROR, "fork: %s\n", strerror(errno)); + exit_cleanu...

...named file could cause unpredictable damage. + */ + +#include <rsync.h> + +#define FNAME_CONV_PERSISTENCE_TIMEOUT 3000 /* milliseconds */ + +static int conv_persistent = 1; +static pid_t conv_pid = -1; +static int conv_write_fd = -1, conv_read_fd; +extern char* fname_convert_cmd; +extern int blocking_io; + +/** + * Splits cmd on spaces. + */ +static void split_on_spaces(char* cmd, char** parts) { + int nparts=0; + char *tok; + char *cmd2 = strdup(cmd); + if (!cmd2) { + rprintf(FERROR, "Out of memory while parsing filename filter %s\n", cmd); + exit_cleanup(RERR_MALLOC); + } + + for (to...

...s[argc++] = user; } args[argc++] = machine; #endif /* ---------------------------------------------------- Start ofc PFC patched section to handle the of the whole command under cygwin rsh ---------------------------------------------------- */ other_args[other_argc++] = rsync_path; if (blocking_io < 0) { char *cp; if ((cp = strrchr(cmd, '/')) != NULL) cp++; else cp = cmd; if (strcmp(cp, "rsh") == 0 || strcmp(cp, "remsh") == 0) blocking_io = 1; } server_options(other_args,&other_argc); } other_args[other_argc++] = ".&quot...

Dear rsync folks, I'd like to request/suggest that cli options to set TCP send/receive buffers be added to rsync client-side. Summary: I'm aware that a daemon's config-file can set socket options for the server side (e.g. SO_SNDBUF, SO_RCVBUF). That is useful. But when trying to get high-throughput rsync over long paths (i.e. large bandwidth*delay product), since

...applied. Let me know what you think. ..wayne.. ---8<------8<------8<------8<---cut here--->8------>8------>8------>8--- Index: options.c --- save/options.c Sat May 4 11:22:22 2002 +++ options.c Sat May 4 11:27:17 2002 @@ -86,6 +86,7 @@ int modify_window=0; #endif int blocking_io=-1; +int move_files=0; /** Network address family. **/ @@ -240,6 +241,7 @@ rprintf(F," --delete-after delete after transferring, not before\n"); rprintf(F," --ignore-errors delete even if there are IO errors\n"); rprintf(F," --max-...

...ress", 0, POPT_ARG_NONE, 0, OPT_PROGRESS, 0, 0 }, {"partial", 0, POPT_ARG_NONE, &keep_partial, 0, 0, 0 }, {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 }, {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, @@ -566,6 +566,10 @@ keep_partial = 1; break; + case OPT_PROGRESS: + do_progress = 1; + break; + case OPT_WRITE_BATCH: /* popt stores th...

...PC); } if (to_child_pipe[0] != STDIN_FILENO) close(to_child_pipe[0]); if (from_child_pipe[1] != STDOUT_FILENO) close(from_child_pipe[1]); set_blocking(STDIN_FILENO); if (blocking_io > 0) set_blocking(STDOUT_FILENO); execvp(command[0], command); // command is "SSH -l user 192.168.xx.xx rsync --server -vlogxxxxx " rsyserr(FERROR, errno, "Failed to exec %s", command[0]); exit_cleanup(R...

...ould this be causing a problem on SCO? Perhaps their * handling of permissions is strange? */ } --- options.c Tue Dec 30 13:16:25 2003 +++ ../rsync-2.6.0.gsa/options.c Thu Feb 12 12:22:21 2004 @@ -88,6 +88,7 @@ int ignore_errors=0; int modify_window=0; int blocking_io=-1; +int setgid_dirs=0; /** Network address family. **/ @@ -380,6 +381,7 @@ {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 }, {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 }, #endif + {"setgid_dirs&quo...

...rn cf((*f1)->basename, (*f2)->basename); + return cf(f_name(*f1), f_name(*f2)); } ===== options.c 1.1 vs edited ===== --- 1.1/rsync/options.c Thu Feb 13 11:51:39 2003 +++ edited/options.c Tue Sep 30 18:16:47 2003 @@ -83,6 +83,7 @@ int ignore_errors=0; int modify_window=0; int blocking_io=-1; +int ignore_case=0; /** Network address family. **/ @@ -207,6 +208,7 @@ rprintf(F," -v, --verbose increase verbosity\n"); rprintf(F," -q, --quiet decrease verbosity\n"); rprintf(F," -c, --checksum always checksum\...

...b/options.c index fd674754..7c7f31db 100644 --- a/options.c +++ b/options.c @@ -129,6 +129,8 @@ int need_messages_from_generator = 0; int max_delete = INT_MIN; OFF_T max_size = -1; OFF_T min_size = -1; +int max_age = 0; +int min_age = 0; int ignore_errors = 0; int modify_window = 0; int blocking_io = -1; @@ -698,6 +700,8 @@ static struct poptOption long_options[] = { {"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 }, {"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 }, {"min-size", 0, POP...

..." --stats give some file-transfer stats\n"); rprintf(F," -8, --8-bit-output leave high-bit chars unescaped in output\n"); @@ -1027,6 +1031,8 @@ static struct poptOption long_options[] = { {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 }, {"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, + {"congestion-alg", 0, POPT_ARG_STRING, &congestion_alg, 0, 0, 0 }, + {"diffserv"...

There's a rather old bug report in Debian's bug tracking system (see http://bugs.debian.org/27126) about wanting to be able to specify the maximum file size, as well as the minimum file size. Here's the text: Sometimes, it's useful to specify a file size range one is interested in. For example, I'd like to keep an up-to-date mirror of Debian, but I currently

...(double)offset,(double)j,(double)i,sum); diff -Naur rsync-2.6.1pre2/options.c rsync-inplace/options.c --- rsync-2.6.1pre2/options.c 2004-04-18 03:07:23.000000000 +1000 +++ rsync-inplace/options.c 2004-04-21 11:45:27.000000000 +1000 @@ -91,6 +91,7 @@ int modify_window = 0; int blocking_io = -1; int checksum_seed = 0; +int inplace = 0; unsigned int block_size = 0; @@ -231,6 +232,7 @@ rprintf(F," --backup-dir make backups into this directory\n"); rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACK...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...n Jan 27 20:11:57 2003 +++ rsync-2.5.6J/options.c Thu Feb 13 11:13:01 2003 @@ -45,6 +45,7 @@ int preserve_times = 0; int update_only = 0; int cvs_exclude = 0; +const char *rsync_exclude = NULL; int dry_run=0; int local_server=0; int ignore_times=0; @@ -84,7 +85,6 @@ int modify_window=0; int blocking_io=-1; - /** Network address family. **/ #ifdef INET6 int default_af_hint = 0; /* Any protocol */ @@ -233,6 +233,7 @@ rprintf(F," -e, --rsh=COMMAND specify the remote shell\n"); rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n&qu...

...Copyright (C) 2003, Andy Henson, Zexia Access Ltd <andy.31016@zexia.co.uk> * * 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 @@ -83,6 +84,7 @@ int ignore_errors=0; int modify_window=0; int blocking_io=-1; +int compare_auto=0; /** Network address family. **/ @@ -104,6 +106,7 @@ char *backup_suffix = BACKUP_SUFFIX; char *tmpdir = NULL; char *compare_dest = NULL; +char *compare_file = NULL; char *config_file = NULL; char *shell_cmd = NULL; char *log_format = NULL; @@ -155,7 +158,7 @@...

...-urN rsync-2.5.4/options.c rsync-2.5.4-fuzzy/options.c > --- rsync-2.5.4/options.c 2002-02-28 09:49:57.000000000 +1100 > +++ rsync-2.5.4-fuzzy/options.c 2002-04-03 16:43:54.000000000 +1000 > @@ -73,6 +73,7 @@ > #else > int modify_window=0; > #endif > +int fuzzy=0; > int blocking_io=-1; > > /** Network address family. **/ > @@ -245,6 +246,7 @@ > rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n"); > rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n"); > rprintf(F,&...

...-0000 1.124 +++ options.c 17 Jan 2004 05:04:55 -0000 @@ -81,12 +81,14 @@ int copy_unsafe_links=0; int size_only=0; int bwlimit=0; int delete_after=0; +int delete_sent_files = 0; int only_existing=0; int opt_ignore_existing=0; int max_delete=0; int ignore_errors=0; int modify_window=0; int blocking_io=-1; +int need_messages_from_generator = 0; unsigned int block_size = 0; @@ -245,6 +247,7 @@ void usage(enum logcode F) rprintf(F," --delete delete files that don't exist on the sending side\n"); rprintf(F," --delete-excluded also delete exc...