Fix build errors in PSCP after line discipline upheaval

[originally from svn r898]

diff --git a/putty.h b/putty.h
index 5423ae91f5c9949009f94b02cf97a88a2d876bd0..a06ed7d0d8b3eed9d5adcff411af92d4b768e588 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -344,7 +344,7 @@ void term_invalidate(void);
 void term_blink(int set_cursor);
 void term_paste(void);
 void term_nopaste(void);
-int telnet_ldisc(int option);
+int term_ldisc(int option);
 void from_backend(int is_stderr, char *data, int len);
 void logfopen (void); 
 void logfclose (void);

diff --git a/scp.c b/scp.c
index c13be5ec091df5602c916579fa1736b0b6d29086..c53e6b691abd178bbb23467500cb7a0ddb645289 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
+#include <assert.h>
 /* GUI Adaptation - Sept 2000 */
 #include <winuser.h>
 #include <winbase.h>
@@ -76,6 +77,16 @@ static void gui_update_stats(char *name, unsigned long size,
 
 void logevent(char *string) { }
 
+void ldisc_send(char *buf, int len) {
+    /*
+     * This is only here because of the calls to ldisc_send(NULL,
+     * 0) in ssh.c. Nothing in PSCP actually needs to use the ldisc
+     * as an ldisc. So if we get called with any real data, I want
+     * to know about it.
+     */
+    assert(len == 0);
+}
+
 void verify_ssh_host_key(char *host, int port, char *keytype,
                          char *keystr, char *fingerprint) {
     int ret;