mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-03-01 21:07:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced the option-parsing failure mode to handle the situation

Browse Source 
where the parser didn't get a chance to parse the --files-from
option yet, but we still need to know it was there in order to get
the error message back to the client.
This commit is contained in:
Wayne Davison
2005-03-01 00:42:32 +00:00
parent 62f27e3c02
commit b03c719f04
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
clientserver.c
View File

@@ -498,8 +498,24 @@ static int rsync_module(int f_in, int f_out, int i)
* get the error back to the client. This means getting
* the protocol setup finished first in later versions. */
setup_protocol(f_out, f_in);
if (files_from && !am_sender && strcmp(files_from, "-") != 0)
write_byte(f_out, 0);
if (!am_sender) {
/* Since we failed in our option parsing, we may not
* have finished parsing that the client sent us a
* --files-from option, so look for it manually.
* Without this, the socket would be in the wrong
* state for the upcoming error message. */
if (!files_from) {
int i;
for (i = 0; i < argc; i++) {
if (strncmp(argv[i], "--files-from", 12) == 0) {
files_from = "";
break;
}
}
}
if (files_from)
write_byte(f_out, 0);
}
io_start_multiplex_out();
}