- shorten -c's argument name to avoid ugly line split

- tidy up the description of -c and http_cookies
- add -c to usage()

2 files changed, 17 insertions, 12 deletions

diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index 6ccbb8f0f47..b6dfe8fae35 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" 	$OpenBSD: ftp.1,v 1.59 2007/06/13 13:52:26 pyr Exp $
+.\" 	$OpenBSD: ftp.1,v 1.60 2007/06/13 18:43:16 jmc Exp $
 .\" 	$NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
 .\"
 .\" Copyright (c) 1985, 1989, 1990, 1993
@@ -39,7 +39,7 @@
 .Sh SYNOPSIS
 .Nm ftp
 .Op Fl 46AadEegimnptVv
-.Op Fl c Ar cookiefile
+.Op Fl c Ar cookie
 .Op Fl P Ar port
 .Op Fl r Ar seconds
 .Op Ar host Op Ar port
@@ -109,15 +109,19 @@ to very old servers that do not implement passive mode properly.
 Causes
 .Nm
 to bypass the normal login procedure and use an anonymous login instead.
-.It Fl c
-Load a Netscape type cookiejar file.
-This option is only useful for HTTP and HTTPS transfers.
+.It Fl c Ar cookie
+Load a Netscape-like cookiejar file
+for HTTP and HTTPS transfers.
 With this option relevant cookies from the jar are sent with each HTTP(S)
 request.
-Setting the http_cookies environment variable has the same effect.
-If both the http_cookies environment variable is set and the
+Setting the
+.Ev http_cookies
+environment variable has the same effect.
+If both the
+.Ev http_cookies
+environment variable is set and the
 .Fl c
-argument is given, the latter will take precedence.
+argument is given, the latter takes precedence.
 .It Fl d
 Enables debugging.
 .It Fl E
@@ -1516,7 +1520,7 @@ URL of FTP proxy to use when making FTP URL requests
 .It Ev http_proxy
 URL of HTTP proxy to use when making HTTP or HTTPS URL requests.
 .It Ev http_cookies
-Path of a Netscape like cookiejar to use when making
+Path of a Netscape-like cookiejar file to use when making
 HTTP or HTTPS URL requests.
 .El
 .Sh PORT ALLOCATION
diff --git a/usr.bin/ftp/main.c b/usr.bin/ftp/main.c
index 958b71a3de2..43ce223e1a9 100644
--- a/usr.bin/ftp/main.c
+++ b/usr.bin/ftp/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.63 2007/06/13 13:52:26 pyr Exp $	*/
+/*	$OpenBSD: main.c,v 1.64 2007/06/13 18:43:16 jmc 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.63 2007/06/13 13:52:26 pyr Exp $";
+static const char rcsid[] = "$OpenBSD: main.c,v 1.64 2007/06/13 18:43:16 jmc Exp $";
 #endif /* not lint and not SMALL */
 
 /*
@@ -746,7 +746,8 @@ void
 usage(void)
 {
 	(void)fprintf(stderr,
-	    "usage: %s [-46AadEegimnptVv] [-P port] [-r seconds] [host [port]]\n"
+	    "usage: %s [-46AadEegimnptVv] [-c cookie] [-P port] "
+	    "[-r seconds] [host [port]]\n"
 	    "       %s [-o output] ftp://[user:password@]host[:port]/file[/]\n"
 	    "       %s [-o output] http://host[:port]/file\n"
 #ifndef SMALL