[src/netbsd-9]: src/usr.bin/ftp Pull up following revision(s) (requested by l...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f031492a166
branches:  netbsd-9
changeset: 983932:4f031492a166
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 14 11:52:52 2021 +0000

description:
Pull up following revision(s) (requested by lukem in ticket #1294):

        usr.bin/ftp/cmds.c: revision 1.141
        usr.bin/ftp/ftp.1: revision 1.143

ftp(1): fix description of "debug"

"debug" command and documentation got accidentally renamed
to "ftp_debug" 13 years ago, and was only partially fixed.

diffstat:

 usr.bin/ftp/cmds.c |   8 ++++----
 usr.bin/ftp/ftp.1  |  26 +++++++++++++-------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diffs (86 lines):

diff -r 327a279b3194 -r 4f031492a166 usr.bin/ftp/cmds.c
--- a/usr.bin/ftp/cmds.c        Mon Jun 14 11:45:48 2021 +0000
+++ b/usr.bin/ftp/cmds.c        Mon Jun 14 11:52:52 2021 +0000
@@ -1,7 +1,7 @@
-/*     $NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp $        */
+/*     $NetBSD: cmds.c,v 1.140.2.1 2021/06/14 11:52:52 martin Exp $    */
 
 /*-
- * Copyright (c) 1996-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -96,7 +96,7 @@
 #if 0
 static char sccsid[] = "@(#)cmds.c     8.6 (Berkeley) 10/9/94";
 #else
-__RCSID("$NetBSD: cmds.c,v 1.140 2019/02/06 07:56:42 martin Exp $");
+__RCSID("$NetBSD: cmds.c,v 1.140.2.1 2021/06/14 11:52:52 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -1131,7 +1131,7 @@
                options |= SO_DEBUG;
        else
                options &= ~SO_DEBUG;
-       fprintf(ttyout, "Debugging %s (ftp_debug=%d).\n", onoff(ftp_debug), ftp_debug);
+       fprintf(ttyout, "Debugging %s (debug=%d).\n", onoff(ftp_debug), ftp_debug);
        code = ftp_debug > 0;
 }
 
diff -r 327a279b3194 -r 4f031492a166 usr.bin/ftp/ftp.1
--- a/usr.bin/ftp/ftp.1 Mon Jun 14 11:45:48 2021 +0000
+++ b/usr.bin/ftp/ftp.1 Mon Jun 14 11:52:52 2021 +0000
@@ -1,6 +1,6 @@
-.\"    $NetBSD: ftp.1,v 1.136 2017/07/03 21:34:57 wiz Exp $
+.\"    $NetBSD: ftp.1,v 1.136.8.1 2021/06/14 11:52:52 martin Exp $
 .\"
-.\" Copyright (c) 1996-2015 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1996-2021 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
@@ -57,7 +57,7 @@
 .\"
 .\"    @(#)ftp.1       8.3 (Berkeley) 10/9/94
 .\"
-.Dd April 24, 2015
+.Dd January 6, 2021
 .Dt FTP 1
 .Os
 .Sh NAME
@@ -442,6 +442,16 @@
 distinguished from a record delimiter only when
 .Ic \&cr
 is off.
+.It Ic debug Op Ar debug-value
+Toggle debugging mode.
+If an optional
+.Ar debug-value
+is specified it is used to set the debugging level.
+When debugging is on,
+.Nm
+prints each command sent to the remote machine, preceded
+by the string
+.Ql \-\-> .
 .It Ic delete Ar remote-file
 Delete the file
 .Ar remote-file
@@ -519,16 +529,6 @@
 .It Ic ftp Ar host Op Ar port
 A synonym for
 .Ic open .
-.It Ic ftp_debug Op Ar ftp_debug-value
-Toggle debugging mode.
-If an optional
-.Ar ftp_debug-value
-is specified it is used to set the debugging level.
-When debugging is on,
-.Nm
-prints each command sent to the remote machine, preceded
-by the string
-.Ql \-\-> .
 .It Ic gate Op Ar host Op Ar port
 Toggle gate-ftp mode, which used to connect through the
 TIS FWTK and Gauntlet ftp proxies.