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

git-svn-id: svn://svn.tartarus.org/sgt/putty@4992 cda61777-01e9-0310-a592-d414129be87e

diff --git a/doc/psftp.but b/doc/psftp.but
index d9c070c..5f6a65d 100644 (file)
--- a/doc/psftp.but
+++ b/doc/psftp.but
@@ -338,6 +338,12 @@ You can also list the contents of a different directory by typing
 \c dir /home/fred
 \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}.
 
 \S{psftp-cmd-chmod} The \c{chmod} command: change permissions on

diff --git a/psftp.c b/psftp.c
index bd1f9cb..de1964e 100644 (file)
--- a/psftp.c
+++ b/psftp.c
@@ -777,7 +777,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
     struct fxp_names *names;
     struct fxp_name **ournames;
     int nnames, namesize;
-    char *dir, *cdir;
+    char *dir, *cdir, *unwcdir, *wildcard;
     struct sftp_packet *pktin;
     struct sftp_request *req, *rreq;
     int i;
@@ -792,9 +792,35 @@ int sftp_cmd_ls(struct sftp_command *cmd)
     else
        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);
     if (!cdir) {
        printf("%s: %s\n", dir, fxp_error());
+       sfree(unwcdir);
        return 0;
     }
 
@@ -835,7 +861,8 @@ int sftp_cmd_ls(struct sftp_command *cmd)
            }
 
            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);
        }
@@ -861,6 +888,7 @@ int sftp_cmd_ls(struct sftp_command *cmd)
     }
 
     sfree(cdir);
+    sfree(unwcdir);
 
     return 1;
 }
@@ -987,7 +1015,7 @@ int sftp_general_get(struct sftp_command *cmd, int restart, int multiple)
            if (!multiple && i < cmd->nwords)
                outfname = cmd->words[i++];
            else
-               outfname = stripslashes(origfname, 1);
+               outfname = stripslashes(origfname, 0);
 
            ret = sftp_get_file(fname, outfname, recurse, restart, NULL);