From: kn <kn@openbsd.org>
Date: Tue, 12 Dec 2023 22:00:43 +0000 (+0000)
Subject: Make -o less special, drop -o '' support, always use last value
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=15d415b9ec9b4c7dff352ff39ef7a0e15e39c098;p=openbsd

Make -o less special, drop -o '' support, always use last value

ftp(1) says -o is about a single file/URL, but option handling takes the
empty string as "reset previous -o value", which makes little sense, is
undocumented and counter-intuitively works as if no -o was specified.

OK millert
---

diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 53e588efef2..2aecd5ad3ee 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.143 2023/11/30 14:52:00 kn Exp $	*/
+/*	$OpenBSD: main.c,v 1.144 2023/12/12 22:00:43 kn Exp $	*/
 /*	$NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $	*/
 
 /*
@@ -502,14 +502,8 @@ main(volatile int argc, char *argv[])
 
 		case 'o':
 			outfile = optarg;
-			if (*outfile == '\0') {
-				pipeout = 0;
-				outfile = NULL;
-				ttyout = stdout;
-			} else {
-				pipeout = strcmp(outfile, "-") == 0;
-				ttyout = pipeout ? stderr : stdout;
-			}
+			pipeout = strcmp(outfile, "-") == 0;
+			ttyout = pipeout ? stderr : stdout;
 			break;
 
 		case 'p':