summaryrefslogtreecommitdiffstats
path: root/contrib/lukemftp
diff options
context:
space:
mode:
authormikeh <mikeh@FreeBSD.org>2003-06-30 05:24:21 +0000
committermikeh <mikeh@FreeBSD.org>2003-06-30 05:24:21 +0000
commitc4fed4c1eba2e0b17e6141786077a7a742051384 (patch)
tree62c5d19190b21a786a6da82d7f0587354e3afd7c /contrib/lukemftp
parente6dfb3860abe2078a8f73134b2a74981de357e28 (diff)
parent1a9c5ec288958763225f89933759c4ffe1ba5344 (diff)
downloadFreeBSD-src-c4fed4c1eba2e0b17e6141786077a7a742051384.zip
FreeBSD-src-c4fed4c1eba2e0b17e6141786077a7a742051384.tar.gz
This commit was generated by cvs2svn to compensate for changes in r117059,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/lukemftp')
-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 cb592b6..2f9ff8a 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 c719c86..47556b4 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 2020fc7..113ac00 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)
OpenPOWER on IntegriCloud