Module Name: src
Committed By: christos
Date: Mon Sep 30 13:03:37 UTC 2024
Modified Files:
src/usr.bin/ftp: ftp.1 main.c
Log Message:
fix markup (h -> H), explain about multiple headers, fix usage (from RVP)
To generate a diff of this commit:
cvs rdiff -u -r1.157 -r1.158 src/usr.bin/ftp/ftp.1
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/ftp/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/ftp.1
diff -u src/usr.bin/ftp/ftp.1:1.157 src/usr.bin/ftp/ftp.1:1.158
--- src/usr.bin/ftp/ftp.1:1.157 Fri Sep 27 12:31:36 2024
+++ src/usr.bin/ftp/ftp.1 Mon Sep 30 09:03:36 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.157 2024/09/27 16:31:36 riastradh Exp $
+.\" $NetBSD: ftp.1,v 1.158 2024/09/30 13:03:36 christos Exp $
.\"
.\" Copyright (c) 1996-2024 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -57,7 +57,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berkeley) 10/9/94
.\"
-.Dd September 25, 2024
+.Dd September 30, 2024
.Dt FTP 1
.Os
.Sh NAME
@@ -67,7 +67,7 @@
.Nm
.Op Fl 46AadefginpRtVv\&?
.Op Fl b Ar bufsize
-.Op Fl h Ar header
+.Op Fl H Ar header
.Op Fl N Ar netrc
.Op Fl o Ar output
.Op Fl P Ar port
@@ -232,6 +232,9 @@ string as a custom
header for an
.Th HTTP
request.
+You can specify multiple headers by repeating the
+.Fl H
+option.
.It Fl i
Turns off interactive prompting during
multiple file transfers.
Index: src/usr.bin/ftp/main.c
diff -u src/usr.bin/ftp/main.c:1.132 src/usr.bin/ftp/main.c:1.133
--- src/usr.bin/ftp/main.c:1.132 Wed Sep 25 12:55:39 2024
+++ src/usr.bin/ftp/main.c Mon Sep 30 09:03:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.132 2024/09/25 16:55:39 christos Exp $ */
+/* $NetBSD: main.c,v 1.133 2024/09/30 13:03:37 christos Exp $ */
/*-
* Copyright (c) 1996-2023 The NetBSD Foundation, Inc.
@@ -98,7 +98,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985, 19
#if 0
static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 10/9/94";
#else
-__RCSID("$NetBSD: main.c,v 1.132 2024/09/25 16:55:39 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.133 2024/09/30 13:03:37 christos Exp $");
#endif
#endif /* not lint */
@@ -1080,8 +1080,9 @@ synopsis(FILE * stream)
const char * progname = getprogname();
fprintf(stream,
-"usage: %s [-46AadefginpRtVv] [-N NETRC] [-o OUTPUT] [-P PORT] [-q QUITTIME]\n"
-" [-r RETRY] [-s SRCADDR] [-T DIR,MAX[,INC]] [-x XFERSIZE]\n"
+"usage: %s [-46AadefginpRtVv] [-H HEADER] [-N NETRC] [-o OUTPUT] [-P PORT]\n"
+" [-q QUITTIME] [-r RETRY] [-s SRCADDR] [-T DIR,MAX[,INC]]\n"
+" [-x XFERSIZE]\n"
" [[USER@]HOST [PORT]]\n"
" [[USER@]HOST:[PATH][/]]\n"
" [file:///PATH]\n"
