X-Git-Url: http://andersk.mit.edu/gitweb/gssapi-openssh.git/blobdiff_plain/30460aeb3d3c027b85eba1e4d45de75fb4b9d356..0b90ac9305f607f2e88da800bd56520fd0228d71:/openssh/scp.c

diff --git a/openssh/scp.c b/openssh/scp.c
index 6c9dd4d..c325fc3 100644
--- a/openssh/scp.c
+++ b/openssh/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.155 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: scp.c,v 1.156 2007/01/22 13:06:21 djm Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -310,7 +310,7 @@ main(int argc, char **argv)
 	addargs(&args, "-oClearAllForwardings yes");
 
 	fflag = tflag = 0;
-	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246zS:o:F:w:")) != -1)
+	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
 		switch (ch) {
 		/* User-visible flags. */
 		case '1':
@@ -318,9 +318,8 @@ main(int argc, char **argv)
 		case '4':
 		case '6':
 		case 'C':
-		case 'z':	
-			addargs(&args, "-%c", ch);
-			break;
+                        addargs(&args, "-%c", ch);
+                        break;
 		case 'o':
 		case 'c':
 		case 'i':
@@ -372,9 +371,6 @@ main(int argc, char **argv)
 			setmode(0, O_BINARY);
 #endif
 			break;
-		case 'w':
-			addargs(&args, "-w%s", optarg);
-			break;
 		default:
 			usage();
 		}
@@ -384,7 +380,7 @@ main(int argc, char **argv)
 	if ((pwd = getpwuid(userid = getuid())) == NULL)
 		fatal("unknown user %u", (u_int) userid);
 
-	if (!isatty(STDERR_FILENO))
+	if (!isatty(STDOUT_FILENO))
 		showprogress = 0;
 
 	remin = STDIN_FILENO;
@@ -1119,7 +1115,7 @@ usage(void)
 {
 	(void) fprintf(stderr,
 	    "usage: scp [-1246BCpqrv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
-	    "           [-l limit] [-o ssh_option] [-P port] [-w buffer size] [-S program]\n"
+	    "           [-l limit] [-o ssh_option] [-P port] [-S program]\n"
 	    "           [[user@]host1:]file1 [...] [[user@]host2:]file2\n");
 	exit(1);
 }