diff options
| author | martin <martin@NetBSD.org> | 2021-06-14 11:52:52 +0000 |
|---|---|---|
| committer | martin <martin@NetBSD.org> | 2021-06-14 11:52:52 +0000 |
| commit | 20820be1aafbb3a0fcc5e4005d457670cbaf6781 (patch) | |
| tree | 2fe853811191840ea6d5b9c842e8c0a5f61ba2a5 | |
| parent | b256097fcad97bc9d8b21c4837d9712a2e4fe93b (diff) | |
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.
| -rw-r--r-- | usr.bin/ftp/cmds.c | 8 | ||||
| -rw-r--r-- | usr.bin/ftp/ftp.1 | 26 |
2 files changed, 17 insertions, 17 deletions
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c index d850f89a5c4..c603c1f3cd3 100644 --- a/usr.bin/ftp/cmds.c +++ b/usr.bin/ftp/cmds.c @@ -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 @@ setdebug(int argc, char *argv[]) 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 --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1 index a418f6cad8e..8322104bd1a 100644 --- a/usr.bin/ftp/ftp.1 +++ b/usr.bin/ftp/ftp.1 @@ -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 @@ when an ascii type transfer is made, these linefeeds may be 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 @@ format is .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. |
