X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/01c034ad857128c51482a563befb374e38ebe668..32874aeac8dacbca26663777b39a79efc5d8dc4b:/scp.c

diff --git a/scp.c b/scp.c
index 413cf4c8..f414eb8f 100644
--- a/scp.c
+++ b/scp.c
@@ -56,7 +56,7 @@ static char *password = NULL;
 static int errs = 0;
 /* GUI Adaptation - Sept 2000 */
 #define NAME_STR_MAX 2048
-static char statname[NAME_STR_MAX+1];
+static char statname[NAME_STR_MAX + 1];
 static unsigned long statsize = 0;
 static int statperct = 0;
 static unsigned long statelapsed = 0;
@@ -67,17 +67,20 @@ static void source(char *src);
 static void rsource(char *src);
 static void sink(char *targ, char *src);
 /* GUI Adaptation - Sept 2000 */
-static void tell_char(FILE *stream, char c);
-static void tell_str(FILE *stream, char *str);
-static void tell_user(FILE *stream, char *fmt, ...);
+static void tell_char(FILE * stream, char c);
+static void tell_str(FILE * stream, char *str);
+static void tell_user(FILE * stream, char *fmt, ...);
 static void send_char_msg(unsigned int msg_id, char c);
 static void send_str_msg(unsigned int msg_id, char *str);
 static void gui_update_stats(char *name, unsigned long size,
-                             int percentage, unsigned long elapsed);
+			     int percentage, unsigned long elapsed);
 
-void logevent(char *string) { }
+void logevent(char *string)
+{
+}
 
-void ldisc_send(char *buf, int len) {
+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
@@ -88,38 +91,38 @@ void ldisc_send(char *buf, int len) {
 }
 
 void verify_ssh_host_key(char *host, int port, char *keytype,
-                         char *keystr, char *fingerprint) {
+			 char *keystr, char *fingerprint)
+{
     int ret;
 
     static const char absentmsg[] =
-        "The server's host key is not cached in the registry. You\n"
-        "have no guarantee that the server is the computer you\n"
-        "think it is.\n"
-        "The server's key fingerprint is:\n"
-        "%s\n"
-        "If you trust this host, enter \"y\" to add the key to\n"
-        "PuTTY's cache and carry on connecting.\n"
-        "If you do not trust this host, enter \"n\" to abandon the\n"
-        "connection.\n"
-        "Continue connecting? (y/n) ";
+	"The server's host key is not cached in the registry. You\n"
+	"have no guarantee that the server is the computer you\n"
+	"think it is.\n"
+	"The server's key fingerprint is:\n"
+	"%s\n"
+	"If you trust this host, enter \"y\" to add the key to\n"
+	"PuTTY's cache and carry on connecting.\n"
+	"If you do not trust this host, enter \"n\" to abandon the\n"
+	"connection.\n" "Continue connecting? (y/n) ";
 
     static const char wrongmsg[] =
-        "WARNING - POTENTIAL SECURITY BREACH!\n"
-        "The server's host key does not match the one PuTTY has\n"
-        "cached in the registry. This means that either the\n"
-        "server administrator has changed the host key, or you\n"
-        "have actually connected to another computer pretending\n"
-        "to be the server.\n"
-        "The new key fingerprint is:\n"
-        "%s\n"
-        "If you were expecting this change and trust the new key,\n"
-        "enter Yes to update PuTTY's cache and continue connecting.\n"
-        "If you want to carry on connecting but without updating\n"
-        "the cache, enter No.\n"
-        "If you want to abandon the connection completely, press\n"
-        "Return to cancel. Pressing Return is the ONLY guaranteed\n"
-        "safe choice.\n"
-        "Update cached key? (y/n, Return cancels connection) ";
+	"WARNING - POTENTIAL SECURITY BREACH!\n"
+	"The server's host key does not match the one PuTTY has\n"
+	"cached in the registry. This means that either the\n"
+	"server administrator has changed the host key, or you\n"
+	"have actually connected to another computer pretending\n"
+	"to be the server.\n"
+	"The new key fingerprint is:\n"
+	"%s\n"
+	"If you were expecting this change and trust the new key,\n"
+	"enter Yes to update PuTTY's cache and continue connecting.\n"
+	"If you want to carry on connecting but without updating\n"
+	"the cache, enter No.\n"
+	"If you want to abandon the connection completely, press\n"
+	"Return to cancel. Pressing Return is the ONLY guaranteed\n"
+	"safe choice.\n"
+	"Update cached key? (y/n, Return cancels connection) ";
 
     static const char abandoned[] = "Connection abandoned.\n";
 
@@ -130,63 +133,63 @@ void verify_ssh_host_key(char *host, int port, char *keytype,
      */
     ret = verify_host_key(host, port, keytype, keystr);
 
-    if (ret == 0)                      /* success - key matched OK */
-        return;
-    if (ret == 2) {                    /* key was different */
-        fprintf(stderr, wrongmsg, fingerprint);
+    if (ret == 0)		       /* success - key matched OK */
+	return;
+    if (ret == 2) {		       /* key was different */
+	fprintf(stderr, wrongmsg, fingerprint);
 	fflush(stderr);
-        if (fgets(line, sizeof(line), stdin) &&
-            line[0] != '\0' && line[0] != '\n') {
-            if (line[0] == 'y' || line[0] == 'Y')
-                store_host_key(host, port, keytype, keystr);
-        } else {
-            fprintf(stderr, abandoned);
+	if (fgets(line, sizeof(line), stdin) &&
+	    line[0] != '\0' && line[0] != '\n') {
+	    if (line[0] == 'y' || line[0] == 'Y')
+		store_host_key(host, port, keytype, keystr);
+	} else {
+	    fprintf(stderr, abandoned);
 	    fflush(stderr);
-            exit(0);
-        }
+	    exit(0);
+	}
     }
-    if (ret == 1) {                    /* key was absent */
-        fprintf(stderr, absentmsg, fingerprint);
-        if (fgets(line, sizeof(line), stdin) &&
-            (line[0] == 'y' || line[0] == 'Y'))
-            store_host_key(host, port, keytype, keystr);
-        else {
-            fprintf(stderr, abandoned);
-            exit(0);
-        }
+    if (ret == 1) {		       /* key was absent */
+	fprintf(stderr, absentmsg, fingerprint);
+	if (fgets(line, sizeof(line), stdin) &&
+	    (line[0] == 'y' || line[0] == 'Y'))
+	    store_host_key(host, port, keytype, keystr);
+	else {
+	    fprintf(stderr, abandoned);
+	    exit(0);
+	}
     }
 }
 
 /* GUI Adaptation - Sept 2000 */
 static void send_msg(HWND h, UINT message, WPARAM wParam)
 {
-    while (!PostMessage( h, message, wParam, 0))
-        SleepEx(1000,TRUE);
+    while (!PostMessage(h, message, wParam, 0))
+	SleepEx(1000, TRUE);
 }
 
-static void tell_char(FILE *stream, char c)
+static void tell_char(FILE * stream, char c)
 {
     if (!gui_mode)
 	fputc(c, stream);
-    else
-    {
+    else {
 	unsigned int msg_id = WM_STD_OUT_CHAR;
-	if (stream == stderr) msg_id = WM_STD_ERR_CHAR;
-	send_msg( (HWND)atoi(gui_hwnd), msg_id, (WPARAM)c );
+	if (stream == stderr)
+	    msg_id = WM_STD_ERR_CHAR;
+	send_msg((HWND) atoi(gui_hwnd), msg_id, (WPARAM) c);
     }
 }
 
-static void tell_str(FILE *stream, char *str)
+static void tell_str(FILE * stream, char *str)
 {
     unsigned int i;
 
-    for( i = 0; i < strlen(str); ++i )
+    for (i = 0; i < strlen(str); ++i)
 	tell_char(stream, str[i]);
 }
 
-static void tell_user(FILE *stream, char *fmt, ...)
+static void tell_user(FILE * stream, char *fmt, ...)
 {
-    char str[0x100]; /* Make the size big enough */
+    char str[0x100];		       /* Make the size big enough */
     va_list ap;
     va_start(ap, fmt);
     vsprintf(str, fmt, ap);
@@ -195,30 +198,30 @@ static void tell_user(FILE *stream, char *fmt, ...)
     tell_str(stream, str);
 }
 
-static void gui_update_stats(char *name, unsigned long size, int percentage, unsigned long elapsed)
+static void gui_update_stats(char *name, unsigned long size,
+			     int percentage, unsigned long elapsed)
 {
     unsigned int i;
 
-    if (strcmp(name,statname) != 0)
-    {
-	for( i = 0; i < strlen(name); ++i )
-	    send_msg( (HWND)atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM)name[i]);
-	send_msg( (HWND)atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM)'\n' );
-	strcpy(statname,name);
+    if (strcmp(name, statname) != 0) {
+	for (i = 0; i < strlen(name); ++i)
+	    send_msg((HWND) atoi(gui_hwnd), WM_STATS_CHAR,
+		     (WPARAM) name[i]);
+	send_msg((HWND) atoi(gui_hwnd), WM_STATS_CHAR, (WPARAM) '\n');
+	strcpy(statname, name);
     }
-    if (statsize != size)
-    {
-	send_msg( (HWND)atoi(gui_hwnd), WM_STATS_SIZE, (WPARAM)size );
+    if (statsize != size) {
+	send_msg((HWND) atoi(gui_hwnd), WM_STATS_SIZE, (WPARAM) size);
 	statsize = size;
     }
-    if (statelapsed != elapsed)
-    {
-	send_msg( (HWND)atoi(gui_hwnd), WM_STATS_ELAPSED, (WPARAM)elapsed );
+    if (statelapsed != elapsed) {
+	send_msg((HWND) atoi(gui_hwnd), WM_STATS_ELAPSED,
+		 (WPARAM) elapsed);
 	statelapsed = elapsed;
     }
-    if (statperct != percentage)
-    {
-	send_msg( (HWND)atoi(gui_hwnd), WM_STATS_PERCENT, (WPARAM)percentage );
+    if (statperct != percentage) {
+	send_msg((HWND) atoi(gui_hwnd), WM_STATS_PERCENT,
+		 (WPARAM) percentage);
 	statperct = percentage;
     }
 }
@@ -228,11 +231,11 @@ static void gui_update_stats(char *name, unsigned long size, int percentage, uns
  */
 void fatalbox(char *fmt, ...)
 {
-    char str[0x100]; /* Make the size big enough */
+    char str[0x100];		       /* Make the size big enough */
     va_list ap;
     va_start(ap, fmt);
     strcpy(str, "Fatal:");
-    vsprintf(str+strlen(str), fmt, ap);
+    vsprintf(str + strlen(str), fmt, ap);
     va_end(ap);
     strcat(str, "\n");
     tell_str(stderr, str);
@@ -241,11 +244,11 @@ void fatalbox(char *fmt, ...)
 }
 void connection_fatal(char *fmt, ...)
 {
-    char str[0x100]; /* Make the size big enough */
+    char str[0x100];		       /* Make the size big enough */
     va_list ap;
     va_start(ap, fmt);
     strcpy(str, "Fatal:");
-    vsprintf(str+strlen(str), fmt, ap);
+    vsprintf(str + strlen(str), fmt, ap);
     va_end(ap);
     strcat(str, "\n");
     tell_str(stderr, str);
@@ -257,7 +260,8 @@ void connection_fatal(char *fmt, ...)
  * Be told what socket we're supposed to be using.
  */
 static SOCKET scp_ssh_socket;
-char *do_select(SOCKET skt, int startup) {
+char *do_select(SOCKET skt, int startup)
+{
     if (startup)
 	scp_ssh_socket = skt;
     else
@@ -275,13 +279,14 @@ extern int select_result(WPARAM, LPARAM);
  * do this until we have enough data.
  */
 
-static unsigned char *outptr;          /* where to put the data */
-static unsigned outlen;                /* how much data required */
+static unsigned char *outptr;	       /* where to put the data */
+static unsigned outlen;		       /* how much data required */
 static unsigned char *pending = NULL;  /* any spare data */
-static unsigned pendlen=0, pendsize=0; /* length and phys. size of buffer */
-void from_backend(int is_stderr, char *data, int datalen) {
-    unsigned char *p = (unsigned char *)data;
-    unsigned len = (unsigned)datalen;
+static unsigned pendlen = 0, pendsize = 0;	/* length and phys. size of buffer */
+void from_backend(int is_stderr, char *data, int datalen)
+{
+    unsigned char *p = (unsigned char *) data;
+    unsigned len = (unsigned) datalen;
 
     /*
      * stderr data is just spouted to local stderr and otherwise
@@ -298,29 +303,33 @@ void from_backend(int is_stderr, char *data, int datalen) {
      * If this is before the real session begins, just return.
      */
     if (!outptr)
-        return;
+	return;
 
     if (outlen > 0) {
-        unsigned used = outlen;
-        if (used > len) used = len;
-        memcpy(outptr, p, used);
-        outptr += used; outlen -= used;
-        p += used; len -= used;
+	unsigned used = outlen;
+	if (used > len)
+	    used = len;
+	memcpy(outptr, p, used);
+	outptr += used;
+	outlen -= used;
+	p += used;
+	len -= used;
     }
 
     if (len > 0) {
-        if (pendsize < pendlen + len) {
-            pendsize = pendlen + len + 4096;
-            pending = (pending ? srealloc(pending, pendsize) :
-                       smalloc(pendsize));
-            if (!pending)
-                fatalbox("Out of memory");
-        }
-        memcpy(pending+pendlen, p, len);
-        pendlen += len;
+	if (pendsize < pendlen + len) {
+	    pendsize = pendlen + len + 4096;
+	    pending = (pending ? srealloc(pending, pendsize) :
+		       smalloc(pendsize));
+	    if (!pending)
+		fatalbox("Out of memory");
+	}
+	memcpy(pending + pendlen, p, len);
+	pendlen += len;
     }
 }
-static int ssh_scp_recv(unsigned char *buf, int len) {
+static int ssh_scp_recv(unsigned char *buf, int len)
+{
     outptr = buf;
     outlen = len;
 
@@ -329,31 +338,31 @@ static int ssh_scp_recv(unsigned char *buf, int len) {
      * need.
      */
     if (pendlen > 0) {
-        unsigned pendused = pendlen;
-        if (pendused > outlen)
-            pendused = outlen;
+	unsigned pendused = pendlen;
+	if (pendused > outlen)
+	    pendused = outlen;
 	memcpy(outptr, pending, pendused);
-        memmove(pending, pending+pendused, pendlen-pendused);
+	memmove(pending, pending + pendused, pendlen - pendused);
 	outptr += pendused;
 	outlen -= pendused;
-        pendlen -= pendused;
-        if (pendlen == 0) {
-            pendsize = 0;
-            sfree(pending);
-            pending = NULL;
-        }
-        if (outlen == 0)
-            return len;
+	pendlen -= pendused;
+	if (pendlen == 0) {
+	    pendsize = 0;
+	    sfree(pending);
+	    pending = NULL;
+	}
+	if (outlen == 0)
+	    return len;
     }
 
     while (outlen > 0) {
-        fd_set readfds;
+	fd_set readfds;
 
-        FD_ZERO(&readfds);
-        FD_SET(scp_ssh_socket, &readfds);
-        if (select(1, &readfds, NULL, NULL, NULL) < 0)
-            return 0;                  /* doom */
-        select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ);
+	FD_ZERO(&readfds);
+	FD_SET(scp_ssh_socket, &readfds);
+	if (select(1, &readfds, NULL, NULL, NULL) < 0)
+	    return 0;		       /* doom */
+	select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
     }
 
     return len;
@@ -362,16 +371,17 @@ static int ssh_scp_recv(unsigned char *buf, int len) {
 /*
  * Loop through the ssh connection and authentication process.
  */
-static void ssh_scp_init(void) {
+static void ssh_scp_init(void)
+{
     if (scp_ssh_socket == INVALID_SOCKET)
 	return;
     while (!back->sendok()) {
-        fd_set readfds;
-        FD_ZERO(&readfds);
-        FD_SET(scp_ssh_socket, &readfds);
-        if (select(1, &readfds, NULL, NULL, NULL) < 0)
-            return;                    /* doom */
-        select_result((WPARAM)scp_ssh_socket, (LPARAM)FD_READ);
+	fd_set readfds;
+	FD_ZERO(&readfds);
+	FD_SET(scp_ssh_socket, &readfds);
+	if (select(1, &readfds, NULL, NULL, NULL) < 0)
+	    return;		       /* doom */
+	select_result((WPARAM) scp_ssh_socket, (LPARAM) FD_READ);
     }
 }
 
@@ -380,11 +390,11 @@ static void ssh_scp_init(void) {
  */
 static void bump(char *fmt, ...)
 {
-    char str[0x100]; /* Make the size big enough */
+    char str[0x100];		       /* Make the size big enough */
     va_list ap;
     va_start(ap, fmt);
     strcpy(str, "Fatal:");
-    vsprintf(str+strlen(str), fmt, ap);
+    vsprintf(str + strlen(str), fmt, ap);
     va_end(ap);
     strcat(str, "\n");
     tell_str(stderr, str);
@@ -403,21 +413,22 @@ static int get_line(const char *prompt, char *str, int maxlen, int is_pw)
     DWORD savemode, newmode, i;
 
     if (is_pw && password) {
-        static int tried_once = 0;
-
-        if (tried_once) {
-            return 0;
-        } else {
-            strncpy(str, password, maxlen);
-            str[maxlen-1] = '\0';
-            tried_once = 1;
-            return 1;
-        }
+	static int tried_once = 0;
+
+	if (tried_once) {
+	    return 0;
+	} else {
+	    strncpy(str, password, maxlen);
+	    str[maxlen - 1] = '\0';
+	    tried_once = 1;
+	    return 1;
+	}
     }
 
     /* GUI Adaptation - Sept 2000 */
     if (gui_mode) {
-	if (maxlen>0) str[0] = '\0';
+	if (maxlen > 0)
+	    str[0] = '\0';
     } else {
 	hin = GetStdHandle(STD_INPUT_HANDLE);
 	hout = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -425,23 +436,26 @@ static int get_line(const char *prompt, char *str, int maxlen, int is_pw)
 	    bump("Cannot get standard input/output handles");
 
 	GetConsoleMode(hin, &savemode);
-        newmode = savemode | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
-        if (is_pw)
-            newmode &= ~ENABLE_ECHO_INPUT;
-        else
-            newmode |= ENABLE_ECHO_INPUT;
-        SetConsoleMode(hin, newmode);
+	newmode = savemode | ENABLE_PROCESSED_INPUT | ENABLE_LINE_INPUT;
+	if (is_pw)
+	    newmode &= ~ENABLE_ECHO_INPUT;
+	else
+	    newmode |= ENABLE_ECHO_INPUT;
+	SetConsoleMode(hin, newmode);
 
 	WriteFile(hout, prompt, strlen(prompt), &i, NULL);
-	ReadFile(hin, str, maxlen-1, &i, NULL);
+	ReadFile(hin, str, maxlen - 1, &i, NULL);
 
 	SetConsoleMode(hin, savemode);
 
-	if ((int)i > maxlen) i = maxlen-1; else i = i - 2;
+	if ((int) i > maxlen)
+	    i = maxlen - 1;
+	else
+	    i = i - 2;
 	str[i] = '\0';
 
 	if (is_pw)
-            WriteFile(hout, "\r\n", 2, &i, NULL);
+	    WriteFile(hout, "\r\n", 2, &i, NULL);
     }
 
     return 1;
@@ -462,25 +476,26 @@ static void do_cmd(char *host, char *user, char *cmd)
     do_defaults(host, &cfg);
     if (cfg.host[0] == '\0') {
 	/* No settings for this host; use defaults */
-        do_defaults(NULL, &cfg);
-	strncpy(cfg.host, host, sizeof(cfg.host)-1);
-	cfg.host[sizeof(cfg.host)-1] = '\0';
+	do_defaults(NULL, &cfg);
+	strncpy(cfg.host, host, sizeof(cfg.host) - 1);
+	cfg.host[sizeof(cfg.host) - 1] = '\0';
 	cfg.port = 22;
     }
 
     /* Set username */
     if (user != NULL && user[0] != '\0') {
-	strncpy(cfg.username, user, sizeof(cfg.username)-1);
-	cfg.username[sizeof(cfg.username)-1] = '\0';
+	strncpy(cfg.username, user, sizeof(cfg.username) - 1);
+	cfg.username[sizeof(cfg.username) - 1] = '\0';
     } else if (cfg.username[0] == '\0') {
 	namelen = 0;
 	if (GetUserName(user, &namelen) == FALSE)
 	    bump("Empty user name");
 	user = smalloc(namelen * sizeof(char));
 	GetUserName(user, &namelen);
-	if (verbose) tell_user(stderr, "Guessing user name: %s", user);
-	strncpy(cfg.username, user, sizeof(cfg.username)-1);
-	cfg.username[sizeof(cfg.username)-1] = '\0';
+	if (verbose)
+	    tell_user(stderr, "Guessing user name: %s", user);
+	strncpy(cfg.username, user, sizeof(cfg.username) - 1);
+	cfg.username[sizeof(cfg.username) - 1] = '\0';
 	free(user);
     }
 
@@ -491,7 +506,7 @@ static void do_cmd(char *host, char *user, char *cmd)
 	cfg.port = portnumber;
 
     strncpy(cfg.remote_cmd, cmd, sizeof(cfg.remote_cmd));
-    cfg.remote_cmd[sizeof(cfg.remote_cmd)-1] = '\0';
+    cfg.remote_cmd[sizeof(cfg.remote_cmd) - 1] = '\0';
     cfg.nopty = TRUE;
 
     back = &ssh_backend;
@@ -508,7 +523,7 @@ static void do_cmd(char *host, char *user, char *cmd)
  *  Update statistic information about current file.
  */
 static void print_stats(char *name, unsigned long size, unsigned long done,
-                        time_t start, time_t now)
+			time_t start, time_t now)
 {
     float ratebs;
     unsigned long eta;
@@ -517,8 +532,8 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
 
     /* GUI Adaptation - Sept 2000 */
     if (gui_mode)
-	gui_update_stats(name, size, (int)(100 * (done*1.0/size)),
-                         (unsigned long)difftime(now, start));
+	gui_update_stats(name, size, (int) (100 * (done * 1.0 / size)),
+			 (unsigned long) difftime(now, start));
     else {
 	if (now > start)
 	    ratebs = (float) done / (now - start);
@@ -535,8 +550,7 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
 	pct = (int) (100.0 * (float) done / size);
 
 	printf("\r%-25.25s | %10ld kB | %5.1f kB/s | ETA: %8s | %3d%%",
-	       name, done / 1024, ratebs / 1024.0,
-	       etastr, pct);
+	       name, done / 1024, ratebs / 1024.0, etastr, pct);
 
 	if (done == size)
 	    printf("\n");
@@ -547,19 +561,14 @@ static void print_stats(char *name, unsigned long size, unsigned long done,
  *  Find a colon in str and return a pointer to the colon.
  *  This is used to separate hostname from filename.
  */
-static char * colon(char *str)
+static char *colon(char *str)
 {
     /* We ignore a leading colon, since the hostname cannot be
-     empty. We also ignore a colon as second character because
-     of filenames like f:myfile.txt. */
-    if (str[0] == '\0' ||
-	str[0] == ':' ||
-	str[1] == ':')
+       empty. We also ignore a colon as second character because
+       of filenames like f:myfile.txt. */
+    if (str[0] == '\0' || str[0] == ':' || str[1] == ':')
 	return (NULL);
-    while (*str != '\0' &&
-	   *str != ':' &&
-	   *str != '/' &&
-	   *str != '\\')
+    while (*str != '\0' && *str != ':' && *str != '/' && *str != '\\')
 	str++;
     if (*str == ':')
 	return (str);
@@ -581,19 +590,19 @@ static int response(void)
 
     p = 0;
     switch (resp) {
-      case 0:		/* ok */
+      case 0:			       /* ok */
 	return (0);
       default:
 	rbuf[p++] = resp;
 	/* fallthrough */
-      case 1:		/* error */
-      case 2:		/* fatal error */
+      case 1:			       /* error */
+      case 2:			       /* fatal error */
 	do {
 	    if (ssh_scp_recv(&ch, 1) <= 0)
 		bump("Protocol error: Lost connection");
 	    rbuf[p++] = ch;
 	} while (p < sizeof(rbuf) && ch != '\n');
-	rbuf[p-1] = '\0';
+	rbuf[p - 1] = '\0';
 	if (resp == 1)
 	    tell_user(stderr, "%s\n", rbuf);
 	else
@@ -614,11 +623,11 @@ static void run_err(const char *fmt, ...)
     va_start(ap, fmt);
     errs++;
     strcpy(str, "scp: ");
-    vsprintf(str+strlen(str), fmt, ap);
+    vsprintf(str + strlen(str), fmt, ap);
     strcat(str, "\n");
     back->send("\001", 1);	       /* scp protocol error prefix */
     back->send(str, strlen(str));
-    tell_user(stderr, "%s",str);
+    tell_user(stderr, "%s", str);
     va_end(ap);
 }
 
@@ -637,31 +646,31 @@ static void source(char *src)
     time_t stat_starttime, stat_lasttime;
 
     attr = GetFileAttributes(src);
-    if (attr == (DWORD)-1) {
+    if (attr == (DWORD) - 1) {
 	run_err("%s: No such file or directory", src);
 	return;
     }
 
     if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
 	if (recursive) {
-            /*
-             * Avoid . and .. directories.
-             */
-            char *p;
-            p = strrchr(src, '/');
-            if (!p)
-                p = strrchr(src, '\\');
-            if (!p)
-                p = src;
-            else
-                p++;
-            if (!strcmp(p, ".") || !strcmp(p, ".."))
-                /* skip . and .. */;
-            else
-                rsource(src);
-        } else {
+	    /*
+	     * Avoid . and .. directories.
+	     */
+	    char *p;
+	    p = strrchr(src, '/');
+	    if (!p)
+		p = strrchr(src, '\\');
+	    if (!p)
+		p = src;
+	    else
+		p++;
+	    if (!strcmp(p, ".") || !strcmp(p, ".."))
+		/* skip . and .. */ ;
+	    else
+		rsource(src);
+	} else {
 	    run_err("%s: not a regular file", src);
-        }
+	}
 	return;
     }
 
@@ -710,16 +719,17 @@ static void source(char *src)
     for (i = 0; i < size; i += 4096) {
 	char transbuf[4096];
 	DWORD j, k = 4096;
-	if (i + k > size) k = size - i;
-	if (! ReadFile(f, transbuf, k, &j, NULL) || j != k) {
-	    if (statistics) printf("\n");
+	if (i + k > size)
+	    k = size - i;
+	if (!ReadFile(f, transbuf, k, &j, NULL) || j != k) {
+	    if (statistics)
+		printf("\n");
 	    bump("%s: Read error", src);
 	}
 	back->send(transbuf, k);
 	if (statistics) {
 	    stat_bytes += k;
-	    if (time(NULL) != stat_lasttime ||
-		i + k == size) {
+	    if (time(NULL) != stat_lasttime || i + k == size) {
 		stat_lasttime = time(NULL);
 		print_stats(last, size, stat_bytes,
 			    stat_starttime, stat_lasttime);
@@ -767,8 +777,7 @@ static void rsource(char *src)
     while (ok) {
 	if (strcmp(fdat.cFileName, ".") == 0 ||
 	    strcmp(fdat.cFileName, "..") == 0) {
-	} else if (strlen(src) + 1 + strlen(fdat.cFileName) >=
-		   sizeof(buf)) {
+	} else if (strlen(src) + 1 + strlen(fdat.cFileName) >= sizeof(buf)) {
 	    run_err("%s/%s: Name too long", src, fdat.cFileName);
 	} else {
 	    sprintf(buf, "%s/%s", src, fdat.cFileName);
@@ -805,7 +814,7 @@ static void sink(char *targ, char *src)
     char *stat_name;
 
     attr = GetFileAttributes(targ);
-    if (attr != (DWORD)-1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
+    if (attr != (DWORD) - 1 && (attr & FILE_ATTRIBUTE_DIRECTORY) != 0)
 	targisdir = 1;
 
     if (targetshouldbedirectory && !targisdir)
@@ -814,7 +823,7 @@ static void sink(char *targ, char *src)
     back->send("", 1);
     while (1) {
 	settime = 0;
-	gottime:
+      gottime:
 	if (ssh_scp_recv(&ch, 1) <= 0)
 	    return;
 	if (ch == '\n')
@@ -826,20 +835,19 @@ static void sink(char *targ, char *src)
 		bump("Lost connection");
 	    buf[i++] = ch;
 	} while (i < sizeof(buf) && ch != '\n');
-	buf[i-1] = '\0';
+	buf[i - 1] = '\0';
 	switch (buf[0]) {
-	  case '\01':	/* error */
-	    tell_user(stderr, "%s\n", buf+1);
+	  case '\01':		       /* error */
+	    tell_user(stderr, "%s\n", buf + 1);
 	    errs++;
 	    continue;
-	  case '\02':	/* fatal error */
-	    bump("%s", buf+1);
+	  case '\02':		       /* fatal error */
+	    bump("%s", buf + 1);
 	  case 'E':
 	    back->send("", 1);
 	    return;
 	  case 'T':
-	    if (sscanf(buf, "T%ld %*d %ld %*d",
-		       &mtime, &atime) == 2) {
+	    if (sscanf(buf, "T%ld %*d %ld %*d", &mtime, &atime) == 2) {
 		settime = 1;
 		back->send("", 1);
 		goto gottime;
@@ -852,7 +860,7 @@ static void sink(char *targ, char *src)
 	    bump("Protocol error: Expected control record");
 	}
 
-	if (sscanf(buf+1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3)
+	if (sscanf(buf + 1, "%u %lu %[^\n]", &mode, &size, namebuf) != 3)
 	    bump("Protocol error: Illegal file descriptor format");
 	/* Security fix: ensure the file ends up where we asked for it. */
 	if (targisdir) {
@@ -870,7 +878,7 @@ static void sink(char *targ, char *src)
 	    strcpy(namebuf, targ);
 	}
 	attr = GetFileAttributes(namebuf);
-	exists = (attr != (DWORD)-1);
+	exists = (attr != (DWORD) - 1);
 
 	if (buf[0] == 'D') {
 	    if (exists && (attr & FILE_ATTRIBUTE_DIRECTORY) == 0) {
@@ -878,9 +886,8 @@ static void sink(char *targ, char *src)
 		continue;
 	    }
 	    if (!exists) {
-		if (! CreateDirectory(namebuf, NULL)) {
-		    run_err("%s: Cannot create directory",
-			    namebuf);
+		if (!CreateDirectory(namebuf, NULL)) {
+		    run_err("%s: Cannot create directory", namebuf);
 		    continue;
 		}
 	    }
@@ -913,11 +920,13 @@ static void sink(char *targ, char *src)
 	for (i = 0; i < size; i += 4096) {
 	    char transbuf[4096];
 	    DWORD j, k = 4096;
-	    if (i + k > size) k = size - i;
+	    if (i + k > size)
+		k = size - i;
 	    if (ssh_scp_recv(transbuf, k) == 0)
 		bump("Lost connection");
-	    if (wrerror) continue;
-	    if (! WriteFile(f, transbuf, k, &j, NULL) || j != k) {
+	    if (wrerror)
+		continue;
+	    if (!WriteFile(f, transbuf, k, &j, NULL) || j != k) {
 		wrerror = 1;
 		if (statistics)
 		    printf("\r%-25.25s | %50s\n",
@@ -927,8 +936,7 @@ static void sink(char *targ, char *src)
 	    }
 	    if (statistics) {
 		stat_bytes += k;
-		if (time(NULL) > stat_lasttime ||
-		    i + k == size) {
+		if (time(NULL) > stat_lasttime || i + k == size) {
 		    stat_lasttime = time(NULL);
 		    print_stats(stat_name, size, stat_bytes,
 				stat_starttime, stat_lasttime);
@@ -962,7 +970,7 @@ static void toremote(int argc, char *argv[])
     char *cmd;
     int i;
 
-    targ = argv[argc-1];
+    targ = argv[argc - 1];
 
     /* Separate host from filename */
     host = targ;
@@ -988,7 +996,7 @@ static void toremote(int argc, char *argv[])
 
     if (argc == 2) {
 	/* Find out if the source filespec covers multiple files
-	 if so, we should set the targetshouldbedirectory flag */
+	   if so, we should set the targetshouldbedirectory flag */
 	HANDLE fh;
 	WIN32_FIND_DATA fdat;
 	if (colon(argv[0]) != NULL)
@@ -1006,8 +1014,7 @@ static void toremote(int argc, char *argv[])
 	    verbose ? " -v" : "",
 	    recursive ? " -r" : "",
 	    preserve ? " -p" : "",
-	    targetshouldbedirectory ? " -d" : "",
-	    targ);
+	    targetshouldbedirectory ? " -d" : "", targ);
     do_cmd(host, user, cmd);
     sfree(cmd);
 
@@ -1044,15 +1051,14 @@ static void toremote(int argc, char *argv[])
 		 */
 		int len = strlen(src), dlen = strlen(fdat.cFileName);
 		if (len == dlen && !strcmp(src, fdat.cFileName)) {
-		    /* ok */;
-		} else if (len > dlen+1 && src[len-dlen-1] == '\\' &&
-			   !strcmp(src+len-dlen, fdat.cFileName)) {
-		    /* ok */;
+		    /* ok */ ;
+		} else if (len > dlen + 1 && src[len - dlen - 1] == '\\' &&
+			   !strcmp(src + len - dlen, fdat.cFileName)) {
+		    /* ok */ ;
 		} else
 		    continue;	       /* ignore this one */
 	    }
-	    if (strlen(src) + strlen(fdat.cFileName) >=
-		sizeof(namebuf)) {
+	    if (strlen(src) + strlen(fdat.cFileName) >= sizeof(namebuf)) {
 		tell_user(stderr, "%s: Name too long", src);
 		continue;
 	    }
@@ -1113,8 +1119,7 @@ static void tolocal(int argc, char *argv[])
 	    verbose ? " -v" : "",
 	    recursive ? " -r" : "",
 	    preserve ? " -p" : "",
-	    targetshouldbedirectory ? " -d" : "",
-	    src);
+	    targetshouldbedirectory ? " -d" : "", src);
     do_cmd(host, user, cmd);
     sfree(cmd);
 
@@ -1154,12 +1159,15 @@ static void get_dir_list(int argc, char *argv[])
 	    user = NULL;
     }
 
-    cmd = smalloc(4*strlen(src) + 100);
+    cmd = smalloc(4 * strlen(src) + 100);
     strcpy(cmd, "ls -la '");
     p = cmd + strlen(cmd);
     for (q = src; *q; q++) {
 	if (*q == '\'') {
-	    *p++ = '\''; *p++ = '\\'; *p++ = '\''; *p++ = '\'';
+	    *p++ = '\'';
+	    *p++ = '\\';
+	    *p++ = '\'';
+	    *p++ = '\'';
 	} else {
 	    *p++ = *q;
 	}
@@ -1185,8 +1193,7 @@ static void init_winsock(void)
     winsock_ver = MAKEWORD(1, 1);
     if (WSAStartup(winsock_ver, &wsadata))
 	bump("Unable to initialise WinSock");
-    if (LOBYTE(wsadata.wVersion) != 1 ||
-	HIBYTE(wsadata.wVersion) != 1)
+    if (LOBYTE(wsadata.wVersion) != 1 || HIBYTE(wsadata.wVersion) != 1)
 	bump("WinSock version is incompatible with 1.1");
 }
 
@@ -1198,7 +1205,8 @@ static void usage(void)
     printf("PuTTY Secure Copy client\n");
     printf("%s\n", ver);
     printf("Usage: pscp [options] [user@]host:source target\n");
-    printf("       pscp [options] source [source...] [user@]host:target\n");
+    printf
+	("       pscp [options] source [source...] [user@]host:target\n");
     printf("       pscp [options] -ls user@host:filespec\n");
     printf("Options:\n");
     printf("  -p        preserve file attributes\n");
@@ -1215,7 +1223,8 @@ static void usage(void)
      * the command-line help. The only people who need to know
      * about it are programmers, and they can read the source.
      */
-    printf("  -gui hWnd GUI mode with the windows handle for receiving messages\n");
+    printf
+	("  -gui hWnd GUI mode with the windows handle for receiving messages\n");
 #endif
     exit(1);
 }
@@ -1246,21 +1255,21 @@ int main(int argc, char *argv[])
 	    preserve = 1;
 	else if (strcmp(argv[i], "-q") == 0)
 	    statistics = 0;
-	else if (strcmp(argv[i], "-h") == 0 ||
-		 strcmp(argv[i], "-?") == 0)
+	else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "-?") == 0)
 	    usage();
-	else if (strcmp(argv[i], "-P") == 0 && i+1 < argc)
+	else if (strcmp(argv[i], "-P") == 0 && i + 1 < argc)
 	    portnumber = atoi(argv[++i]);
-	else if (strcmp(argv[i], "-pw") == 0 && i+1 < argc)
+	else if (strcmp(argv[i], "-pw") == 0 && i + 1 < argc)
 	    password = argv[++i];
-	else if (strcmp(argv[i], "-gui") == 0 && i+1 < argc) {
+	else if (strcmp(argv[i], "-gui") == 0 && i + 1 < argc) {
 	    gui_hwnd = argv[++i];
 	    gui_mode = 1;
 	} else if (strcmp(argv[i], "-ls") == 0)
-		list = 1;
-	else if (strcmp(argv[i], "--") == 0)
-	{ i++; break; }
-	else
+	    list = 1;
+	else if (strcmp(argv[i], "--") == 0) {
+	    i++;
+	    break;
+	} else
 	    usage();
     }
     argc -= i;
@@ -1279,7 +1288,7 @@ int main(int argc, char *argv[])
 	if (argc > 2)
 	    targetshouldbedirectory = 1;
 
-	if (colon(argv[argc-1]) != NULL)
+	if (colon(argv[argc - 1]) != NULL)
 	    toremote(argc, argv);
 	else
 	    tolocal(argc, argv);
@@ -1296,9 +1305,11 @@ int main(int argc, char *argv[])
     /* GUI Adaptation - August 2000 */
     if (gui_mode) {
 	unsigned int msg_id = WM_RET_ERR_CNT;
-	if (list) msg_id = WM_LS_RET_ERR_CNT;
-	while (!PostMessage( (HWND)atoi(gui_hwnd), msg_id, (WPARAM)errs, 0/*lParam*/ ) )
-	    SleepEx(1000,TRUE);
+	if (list)
+	    msg_id = WM_LS_RET_ERR_CNT;
+	while (!PostMessage
+	       ((HWND) atoi(gui_hwnd), msg_id, (WPARAM) errs,
+		0 /*lParam */ ))SleepEx(1000, TRUE);
     }
     return (errs == 0 ? 0 : 1);
 }