summaryrefslogtreecommitdiff
path: root/usr.bin/ftp/main.c
diff options
context:
space:
mode:
authorMartynas Venckus <martynas@cvs.openbsd.org>2009-04-26 21:26:04 +0000
committerMartynas Venckus <martynas@cvs.openbsd.org>2009-04-26 21:26:04 +0000
commitea0f72a852d6dc33748c7116ad2ce277735bf5cd (patch)
tree27a28c4d83277cba194461fec24aef8bb851cef7 /usr.bin/ftp/main.c
parent2ea65187c3a8c7cfbfabdf522738e51739427fb8 (diff)
figure out titles automatically by using remote file name. remove
-T and just show titles by default for non-verbose transfers; discussed with, ok theo, sthen@
Diffstat (limited to 'usr.bin/ftp/main.c')
-rw-r--r--usr.bin/ftp/main.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index a0d1674c8f1..a5f62c29362 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.72 2009/04/13 01:47:04 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.73 2009/04/26 21:26:03 martynas Exp $ */
/* $NetBSD: main.c,v 1.24 1997/08/18 10:20:26 lukem Exp $ */
/*
@@ -66,7 +66,7 @@ static const char copyright[] =
#endif /* not lint */
#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: main.c,v 1.72 2009/04/13 01:47:04 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.73 2009/04/26 21:26:03 martynas Exp $";
#endif /* not lint and not SMALL */
/*
@@ -182,7 +182,7 @@ main(volatile int argc, char *argv[])
cookiefile = getenv("http_cookies");
#endif /* !SMALL */
- while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:tT:vV")) != -1) {
+ while ((ch = getopt(argc, argv, "46AaCc:dEegik:mno:pP:r:tvV")) != -1) {
switch (ch) {
case '4':
family = PF_INET;
@@ -281,10 +281,6 @@ main(volatile int argc, char *argv[])
trace = 1;
break;
- case 'T':
- title = strdup(optarg);
- break;
-
case 'v':
verbose = 1;
break;
@@ -775,7 +771,7 @@ usage(void)
"d"
#endif /* !SMALL */
"EegimnptVv] [-k seconds] [-P port] [-r seconds]\n"
- " [-T title] [host [port]]\n"
+ " [host [port]]\n"
" %s "
#ifndef SMALL
"[-C] "