X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/b3dcd9b2e83d61b9441c95ccfb784ed718173244..7732d38a31d3215b26ab12e006b5bd4fda938718:/scp.c

diff --git a/scp.c b/scp.c
index b741092d..8237f902 100644
--- a/scp.c
+++ b/scp.c
@@ -1,11 +1,15 @@
 /*
- *  scp.c  -  Scp (Secure Copy) client for PuTTY.
- *  Joris van Rantwijk, Simon Tatham
+ * scp.c  -  Scp (Secure Copy) client for PuTTY.
+ * Joris van Rantwijk, Simon Tatham
  *
- *  This is mainly based on ssh-1.2.26/scp.c by Timo Rinne & Tatu Ylonen.
- *  They, in turn, used stuff from BSD rcp.
- *
- *  Adaptations to enable connecting a GUI by L. Gunnarsson - Sept 2000
+ * This is mainly based on ssh-1.2.26/scp.c by Timo Rinne & Tatu Ylonen.
+ * They, in turn, used stuff from BSD rcp.
+ * 
+ * (SGT, 2001-09-10: Joris van Rantwijk assures me that although
+ * this file as originally submitted was inspired by, and
+ * _structurally_ based on, ssh-1.2.26's scp.c, there wasn't any
+ * actual code duplicated, so the above comment shouldn't give rise
+ * to licensing issues.)
  */
 
 #include <windows.h>
@@ -22,9 +26,6 @@
 #include <limits.h>
 #include <time.h>
 #include <assert.h>
-/* GUI Adaptation - Sept 2000 */
-#include <winuser.h>
-#include <winbase.h>
 
 #define PUTTY_DO_GLOBALS
 #include "putty.h"
@@ -90,7 +91,7 @@ void logevent(char *string)
 {
 }
 
-void ldisc_send(char *buf, int len)
+void ldisc_send(char *buf, int len, int interactive)
 {
     /*
      * This is only here because of the calls to ldisc_send(NULL,
@@ -374,8 +375,6 @@ int from_backend(int is_stderr, char *data, int datalen)
 	return 0;
     }
 
-    inbuf_head = 0;
-
     /*
      * If this is before the real session begins, just return.
      */
@@ -603,6 +602,15 @@ static void do_cmd(char *host, char *user, char *cmd)
 	cfg.port = portnumber;
 
     /*
+     * Disable scary things which shouldn't be enabled for simple
+     * things like SCP and SFTP: agent forwarding, port forwarding,
+     * X forwarding.
+     */
+    cfg.x11_forward = 0;
+    cfg.agentfwd = 0;
+    cfg.portfwd[0] = cfg.portfwd[1] = '\0';
+
+    /*
      * Attempt to start the SFTP subsystem as a first choice,
      * falling back to the provided scp command if that fails.
      */
@@ -652,7 +660,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
 	sprintf(etastr, "%02ld:%02ld:%02ld",
 		eta / 3600, (eta % 3600) / 60, eta % 60);
 
-	pct = (int) (100.0 * (float) done / size);
+	pct = (int) (100 * (done * 1.0 / size));
 
 	len = printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%",
 		     name, done / 1024, ratebs / 1024.0, etastr, pct);
@@ -841,6 +849,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;
@@ -1201,6 +1210,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);
@@ -1213,7 +1223,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;
 		}
@@ -1334,6 +1350,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;
@@ -1883,7 +1900,7 @@ static void sink(char *targ, char *src)
 	}
 	(void) scp_finish_filerecv();
 	sfree(destfname);
-	sfree(act.name);
+	sfree(act.buf);
     }
 }