aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Heffner <mikeh@FreeBSD.org>2003-06-30 05:24:21 +0000
committerMike Heffner <mikeh@FreeBSD.org>2003-06-30 05:24:21 +0000
commitfa547236e73511be4f1289da4969cbc7a3c12798 (patch)
tree159150b9870d5c56cee5cb40c73fa9225b0a4ccd
parent1796d6118b58b3fde2859c2646c2cbfef5dc6431 (diff)
downloadsrc-fa547236e73511be4f1289da4969cbc7a3c12798.tar.gz
src-fa547236e73511be4f1289da4969cbc7a3c12798.zip
Import latest cvs version with the correct patchset (fixes ETA bug).
Notes
Notes: svn path=/vendor/lukemftp/dist/; revision=117059
-rw-r--r--contrib/lukemftp/FreeBSD-patchset2
-rw-r--r--contrib/lukemftp/src/ftp.16
-rw-r--r--contrib/lukemftp/src/progressbar.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/contrib/lukemftp/FreeBSD-patchset b/contrib/lukemftp/FreeBSD-patchset
index cb592b652a57..2f9ff8a1ba11 100644
--- a/contrib/lukemftp/FreeBSD-patchset
+++ b/contrib/lukemftp/FreeBSD-patchset
@@ -41,7 +41,7 @@ diff -ru src.orig/progressbar.c src/progressbar.c
#include "progressbar.h"
+
-+#define SECSPERHOUR 60
++#define SECSPERHOUR (60 * 60)
+#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)
diff --git a/contrib/lukemftp/src/ftp.1 b/contrib/lukemftp/src/ftp.1
index c719c861f501..47556b45fa3e 100644
--- a/contrib/lukemftp/src/ftp.1
+++ b/contrib/lukemftp/src/ftp.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: ftp.1,v 1.94 2003/05/14 14:31:00 wiz Exp $
+.\" $NetBSD: ftp.1,v 1.96 2003/06/26 17:48:37 wiz Exp $
.\"
.\" Copyright (c) 1996-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -1030,7 +1030,7 @@ Terminate the current operation.
Answer
.Sq yes ,
and transfer the file.
-.It Cm ?
+.It Cm \&?
Display a help message.
.El
.Pp
@@ -1433,7 +1433,7 @@ verbose is on.
.It Ic xferbuf Ar size
Set the size of the socket send and receive buffers to
.Ar size .
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
A synonym for
.Ic help .
.El
diff --git a/contrib/lukemftp/src/progressbar.c b/contrib/lukemftp/src/progressbar.c
index 2020fc706939..113ac00b6cee 100644
--- a/contrib/lukemftp/src/progressbar.c
+++ b/contrib/lukemftp/src/progressbar.c
@@ -62,7 +62,7 @@ __RCSID("$NetBSD: progressbar.c,v 1.3 2003/02/28 09:53:49 lukem Exp $");
#include "progressbar.h"
-#define SECSPERHOUR 60
+#define SECSPERHOUR (60 * 60)
#define SECSPERDAY ((long)60 * 60 * 24)
#if !defined(NO_PROGRESS)