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

Wildcards in ls'. I think that completes psftp-multi'. Woo!

Browse Source 
[originally from svn r4992]
[this svn revision also touched putty-wishlist]
This commit is contained in:
Simon Tatham 2004-12-16 17:45:29 +00:00
parent a4fe439184
commit 69303f2d3e
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/psftp.but
View File

@ -338,6 +338,12 @@ You can also list the contents of a different directory by typing
\c dir /home/fred \c dir /home/fred
\c dir sources \c dir sources
And you can list a subset of the contents of a directory by
providing a wildcard:
\c dir /home/fred/*.txt
\c dir sources/*.c
The \c{ls} command works exactly the same way as \c{dir}. The \c{ls} command works exactly the same way as \c{dir}.
\S{psftp-cmd-chmod} The \c{chmod} command: change permissions on \S{psftp-cmd-chmod} The \c{chmod} command: change permissions on

34
psftp.c
View File

@ -777,7 +777,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
struct fxp_names *names; struct fxp_names *names;
struct fxp_name **ournames; struct fxp_name **ournames;
int nnames, namesize; int nnames, namesize;
char *dir, *cdir; char *dir, *cdir, *unwcdir, *wildcard;
struct sftp_packet *pktin; struct sftp_packet *pktin;
struct sftp_request *req, *rreq; struct sftp_request *req, *rreq;
int i; int i;
@ -792,9 +792,35 @@ int sftp_cmd_ls(struct sftp_command *cmd)
else else
dir = cmd->words[1]; dir = cmd->words[1];
unwcdir = snewn(1 + strlen(dir), char);
if (wc_unescape(unwcdir, dir)) {
dir = unwcdir;
wildcard = NULL;
} else {
char *tmpdir;
int len, check;
wildcard = stripslashes(dir, 0);
unwcdir = dupstr(dir);
len = wildcard - dir;
unwcdir[len] = '\0';
if (len > 0 && unwcdir[len-1] == '/')
unwcdir[len-1] = '\0';
tmpdir = snewn(1 + len, char);
check = wc_unescape(tmpdir, unwcdir);
sfree(tmpdir);
if (!check) {
printf("Multiple-level wildcards are not supported\n");
sfree(unwcdir);
return 0;
}
dir = unwcdir;
}
cdir = canonify(dir); cdir = canonify(dir);
if (!cdir) { if (!cdir) {
printf("%s: %s\n", dir, fxp_error()); printf("%s: %s\n", dir, fxp_error());
sfree(unwcdir);
return 0; return 0;
} }
@ -835,7 +861,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
} }
for (i = 0; i < names->nnames; i++) for (i = 0; i < names->nnames; i++)
ournames[nnames++] = fxp_dup_name(&names->names[i]); if (!wildcard || wc_match(wildcard, names->names[i].filename))
ournames[nnames++] = fxp_dup_name(&names->names[i]);
fxp_free_names(names); fxp_free_names(names);
} }
@ -861,6 +888,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
} }
sfree(cdir); sfree(cdir);
sfree(unwcdir);
return 1; return 1;
} }
@ -987,7 +1015,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
if (!multiple && i < cmd->nwords) if (!multiple && i < cmd->nwords)
outfname = cmd->words[i++]; outfname = cmd->words[i++];
else else
outfname = stripslashes(origfname, 1); outfname = stripslashes(origfname, 0);
ret = sftp_get_file(fname, outfname, recurse, restart, NULL); ret = sftp_get_file(fname, outfname, recurse, restart, NULL);