}
if (fd_pair(error_pipe) < 0) {
- rprintf(FERROR,"error pipe failed in do_recv\n");
+ rsyserr(FERROR, errno, "pipe failed in do_recv");
exit_cleanup(RERR_SOCKETIO);
}
if (protocol_version >= 23 && !read_batch)
io_start_multiplex_in();
+ /* We set our stderr file handle to blocking because ssh might have
+ * set it to non-blocking. This can be particularly troublesome if
+ * stderr is a clone of stdout, because ssh would have set our stdout
+ * to non-blocking at the same time (which can easily cause us to lose
+ * output from our print statements). This kluge shouldn't cause ssh
+ * any problems for how we use it. Note also that we delayed setting
+ * this until after the above protocol setup so that we know for sure
+ * that ssh is done twiddling its file descriptors. */
+ set_blocking(STDERR_FILENO);
+
if (am_sender) {
keep_dirlinks = 0; /* Must be disabled on the sender. */
io_start_buffering_out();
host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
- *p = 0;
+ *p = '\0';
path = p+1;
- } else {
+ } else
path = "";
- }
- p = strchr(host,':');
+ if (*host == '[' && (p = strchr(host, ']')) != NULL) {
+ host++;
+ *p++ = '\0';
+ if (*p != ':')
+ p = NULL;
+ } else
+ p = strchr(host, ':');
if (p) {
rsync_port = atoi(p+1);
- *p = 0;
+ *p = '\0';
}
return start_socket_client(host, path, argc-1, argv+1);
}
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
rprintf(FERROR,
- "--files-from hostname is not transfer hostname\n");
+ "--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
if (p[1] == ':') { /* double colon */
host = argv[argc-1] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
- *p = 0;
+ *p = '\0';
path = p+1;
- } else {
+ } else
path = "";
- }
- p = strchr(host,':');
+ if (*host == '[' && (p = strchr(host, ']')) != NULL) {
+ host++;
+ *p++ = '\0';
+ if (*p != ':')
+ p = NULL;
+ } else
+ p = strchr(host, ':');
if (p) {
rsync_port = atoi(p+1);
- *p = 0;
+ *p = '\0';
}
return start_socket_client(host, path, argc-1, argv);
}
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
rprintf(FERROR,
- "--files-from hostname is not transfer hostname\n");
+ "--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX);
}
if (!p) { /* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
- "--files-from is remote but transfer is local\n");
+ "--files-from cannot be remote when the transfer is local\n");
exit_cleanup(RERR_SYNTAX);
}
} else if (p[1] == ':') { /* double colon */