summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Obser <florian@cvs.openbsd.org>2019-05-14 18:25:32 +0000
committerFlorian Obser <florian@cvs.openbsd.org>2019-05-14 18:25:32 +0000
commit2e140c24c71895c3f26cbcf21917c65a5f6f0aa2 (patch)
tree5e1d5af43cbe70a40ca472dd0d068f5861eba2c0
parent6893edb4debd6bd367af14c1d0a75b7cef654a26 (diff)
-v forces verbose mode even if stdin is not a terminal
Found the hard way by bluhm Debugged with deraadt & bluhm
-rw-r--r--usr.bin/ftp/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index f3c4f053062..a9f87f10151 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.125 2019/05/14 02:32:08 sunil Exp $ */
+/* $OpenBSD: main.c,v 1.126 2019/05/14 18:25:31 florian Exp $ */
/*
* Copyright (c) 2015 Sunil Nimmagadda <sunil@openbsd.org>
@@ -116,6 +116,9 @@ main(int argc, char **argv)
case 'V':
verbose = 0;
break;
+ case 'v':
+ verbose = 1;
+ break;
case 'w':
connect_timeout = strtonum(optarg, 0, 200, &e);
if (e)
@@ -145,7 +148,6 @@ main(int argc, char **argv)
case 'r':
case 's':
case 't':
- case 'v':
break;
default:
usage();