nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Minor modification: in remote->local non-recursive mode matching a

Browse Source 
wildcard, we don't abandon ship completely if the wildcard matches a
directory; we just warn and carry on with the rest.

[originally from svn r1210]
This commit is contained in:
Simon Tatham 2001-08-27 10:24:55 +00:00
parent 0da98d052d
commit e6c8913093
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
scp.c
View File

@ -1234,16 +1234,28 @@ int scp_get_sink_action(struct scp_sink_action *act)
struct fxp_names *names; struct fxp_names *names;
/* /*
* It's a directory. If we're not in recursive mode and * It's a directory. If we're not in recursive mode,
* we haven't been passed a wildcard from * this merits a complaint (which is fatal if the name
* scp_sink_setup, this just merits a complaint. * was specified directly, but not if it was matched by
* a wildcard).
*
* We skip this complaint completely if
* scp_sftp_wildcard is set, because that's an
* indication that we're not actually supposed to
* _recursively_ transfer the dir, just scan it for
* things matching the wildcard.
*/ */
if (!scp_sftp_recursive && !scp_sftp_wildcard) { if (!scp_sftp_recursive && !scp_sftp_wildcard) {
tell_user(stderr, "pscp: %s: is a directory", fname); tell_user(stderr, "pscp: %s: is a directory", fname);
errs++; errs++;
if (must_free_fname) sfree(fname); if (must_free_fname) sfree(fname);
if (scp_sftp_dirstack_head) {
act->action = SCP_SINK_RETRY;
return 0;
} else {
return 1; return 1;
} }
}
/* /*
* Otherwise, the fun begins. We must fxp_opendir() the * Otherwise, the fun begins. We must fxp_opendir() the