X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/cd1f39ab348b0e42d9aed1bcf5b1edc55dc93821..78a79d97fdd60156aeccb99c46fe2f7f98ae715d:/scp.c

diff --git a/scp.c b/scp.c
index 8b71390e..faf60ea4 100644
--- a/scp.c
+++ b/scp.c
@@ -686,12 +686,17 @@ static char *colon(char *str)
 
 /*
  * Return a pointer to the portion of str that comes after the last
- * slash (or backslash, if `local' is TRUE).
+ * slash (or backslash or colon, if `local' is TRUE).
  */
 static char *stripslashes(char *str, int local)
 {
     char *p;
 
+    if (local) {
+        p = strchr(str, ':');
+        if (p) str = p+1;
+    }
+
     p = strrchr(str, '/');
     if (p) str = p+1;
 
@@ -772,14 +777,13 @@ void scp_sftp_listdir(char *dirname)
     struct fxp_names *names;
     struct fxp_name *ournames;
     int nnames, namesize;
-    char *dir;
     int i;
 
     printf("Listing directory %s\n", dirname);
 
     dirh = fxp_opendir(dirname);
     if (dirh == NULL) {
-	printf("Unable to open %s: %s\n", dir, fxp_error());
+	printf("Unable to open %s: %s\n", dirname, fxp_error());
     } else {
 	nnames = namesize = 0;
 	ournames = NULL;
@@ -790,7 +794,7 @@ void scp_sftp_listdir(char *dirname)
 	    if (names == NULL) {
 		if (fxp_error_type() == SSH_FX_EOF)
 		    break;
-		printf("Reading directory %s: %s\n", dir, fxp_error());
+		printf("Reading directory %s: %s\n", dirname, fxp_error());
 		break;
 	    }
 	    if (names->nnames == 0) {
@@ -837,6 +841,7 @@ static struct scp_sftp_dirstack {
     int namepos, namelen;
     char *dirpath;
     char *wildcard;
+    int matched_something;	       /* wildcard match set was non-empty */
 } *scp_sftp_dirstack_head;
 static char *scp_sftp_remotepath, *scp_sftp_currentname;
 static char *scp_sftp_wildcard;
@@ -1197,6 +1202,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 			       head->names[head->namepos].filename))))
 		head->namepos++;       /* skip . and .. */
 	    if (head->namepos < head->namelen) {
+		head->matched_something = 1;
 		fname = dupcat(head->dirpath, "/",
 			       head->names[head->namepos++].filename,
 			       NULL);
@@ -1209,7 +1215,13 @@ int scp_get_sink_action(struct scp_sink_action *act)
 		 */
 		if (head->wildcard) {
 		    act->action = SCP_SINK_RETRY;
+		    if (!head->matched_something) {
+			tell_user(stderr, "pscp: wildcard '%s' matched "
+				  "no files", head->wildcard);
+			errs++;
+		    }
 		    sfree(head->wildcard);
+
 		} else {
 		    act->action = SCP_SINK_ENDDIR;
 		}
@@ -1330,6 +1342,7 @@ int scp_get_sink_action(struct scp_sink_action *act)
 		newitem->dirpath = dupstr(fname);
 	    if (scp_sftp_wildcard) {
 		newitem->wildcard = scp_sftp_wildcard;
+		newitem->matched_something = 0;
 		scp_sftp_wildcard = NULL;
 	    } else {
 		newitem->wildcard = NULL;
@@ -1689,9 +1702,7 @@ static void rsource(char *src)
 static void sink(char *targ, char *src)
 {
     char *destfname;
-    char ch;
     int targisdir = 0;
-    int settime;
     int exists;
     DWORD attr;
     HANDLE f;
@@ -1725,9 +1736,10 @@ static void sink(char *targ, char *src)
 	     * Prevent the remote side from maliciously writing to
 	     * files outside the target area by sending a filename
 	     * containing `../'. In fact, it shouldn't be sending
-	     * filenames with any slashes in at all; so we'll find
-	     * the last slash or backslash in the filename and use
-	     * only the part after that. (And warn!)
+	     * filenames with any slashes or colons in at all; so
+	     * we'll find the last slash, backslash or colon in the
+	     * filename and use only the part after that. (And
+	     * warn!)
 	     * 
 	     * In addition, we also ensure here that if we're
 	     * copying a single file and the target is a directory
@@ -1755,7 +1767,9 @@ static void sink(char *targ, char *src)
 	    striptarget = stripslashes(act.name, 1);
 	    if (striptarget != act.name) {
 		tell_user(stderr, "warning: remote host sent a compound"
-			  " pathname - possibly malicious! (ignored)");
+			  " pathname '%s'", act.name);
+		tell_user(stderr, "         renaming local file to '%s'",
+                          striptarget);
 	    }
 
 	    /*
@@ -1878,7 +1892,7 @@ static void sink(char *targ, char *src)
 	}
 	(void) scp_finish_filerecv();
 	sfree(destfname);
-	sfree(act.name);
+	sfree(act.buf);
     }
 }
 
@@ -1959,13 +1973,6 @@ static void toremote(int argc, char *argv[])
 	 */
 	srcpath = dupstr(src);
 	last = stripslashes(srcpath, 1);
-	if (last == srcpath) {
-	    last = strchr(srcpath, ':');
-	    if (last)
-		last++;
-	    else
-		last = srcpath;
-	}
 	*last = '\0';
 
 	dir = FindFirstFile(src, &fdat);
@@ -1974,7 +1981,6 @@ static void toremote(int argc, char *argv[])
 	    continue;
 	}
 	do {
-	    char *last;
 	    char *filename;
 	    /*
 	     * Ensure that . and .. are never matched by wildcards,