Clean up scp client - re-indent to my coding style and remove

[u/mdw/putty] / scpssh.c

diff --git a/scpssh.c b/scpssh.c
index b51cbb8..0447af3 100644 (file)
--- a/scpssh.c
+++ b/scpssh.c
@@ -27,6 +27,7 @@
 #define SSH_CMSG_EOF           19
 #define SSH_SMSG_EXIT_STATUS   20
 #define SSH_CMSG_EXIT_CONFIRMATION     33
+#define SSH_MSG_IGNORE         32
 #define SSH_MSG_DEBUG          36
 
 #define GET_32BIT(cp) \
@@ -36,10 +37,10 @@
     ((unsigned long)(unsigned char)(cp)[3]))
 
 #define PUT_32BIT(cp, value) { \
-    (cp)[0] = (value) >> 24; \
-    (cp)[1] = (value) >> 16; \
-    (cp)[2] = (value) >> 8; \
-    (cp)[3] = (value); }
+    (cp)[0] = (unsigned char)((value) >> 24); \
+    (cp)[1] = (unsigned char)((value) >> 16); \
+    (cp)[2] = (unsigned char)((value) >> 8); \
+    (cp)[3] = (unsigned char)(value); }
 
 static SOCKET s = INVALID_SOCKET;
 
@@ -146,6 +147,9 @@ next_packet:
        }
        goto next_packet;
     }
+    if (pktin.type == SSH_MSG_IGNORE) {
+       goto next_packet;
+    }
 }
 
 static void s_wrpkt_start(int type, int len) {