MFH (r261233): fix whitespace and bump copyright

MFH (r261234): increase buffer size
This commit is contained in:
Dag-Erling Smørgrav 2014-02-27 13:25:26 +00:00
parent 3867068efe
commit 2638ddee85
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/stable/10/; revision=262558
2 changed files with 8 additions and 7 deletions

View File

@ -1,5 +1,5 @@
.\"-
.\" Copyright (c) 2000-2013 Dag-Erling Smørgrav
.\" Copyright (c) 2000-2014 Dag-Erling Smørgrav
.\" Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
.\" All rights reserved.
.\" Portions Copyright (c) 1999 Massachusetts Institute of Technology; used
@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
.Dd July 30, 2013
.Dd January 28, 2014
.Dt FETCH 1
.Os
.Sh NAME
@ -118,7 +118,7 @@ Automatically retry the transfer upon soft failures.
Allow SSL version 2 when negotiating the connection.
.It Fl B Ar bytes , Fl -buffer-size= Ns Ar bytes
Specify the read buffer size in bytes.
The default is 4096 bytes.
The default is 16,384 bytes.
Attempts to set a buffer size lower than this will be silently
ignored.
The number of reads actually performed is reported at verbosity level

View File

@ -1,5 +1,5 @@
/*-
* Copyright (c) 2000-2011 Dag-Erling Smørgrav
* Copyright (c) 2000-2014 Dag-Erling Smørgrav
* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
* All rights reserved.
*
@ -49,7 +49,7 @@ __FBSDID("$FreeBSD$");
#include <fetch.h>
#define MINBUFSIZE 4096
#define MINBUFSIZE 16384
#define TIMEOUT 120
/* Option flags */
@ -109,7 +109,7 @@ enum options
OPTION_SSL_CLIENT_KEY_FILE,
OPTION_SSL_CRL_FILE,
OPTION_SSL_NO_SSL3,
OPTION_SSL_NO_TLS1,
OPTION_SSL_NO_TLS1,
OPTION_SSL_NO_VERIFY_HOSTNAME,
OPTION_SSL_NO_VERIFY_PEER
};
@ -147,7 +147,7 @@ static struct option longopts[] =
{ "passive-portrange-default", no_argument, NULL, 'T' },
{ "verbose", no_argument, NULL, 'v' },
{ "retry-delay", required_argument, NULL, 'w' },
/* options without a single character equivalent */
{ "bind-address", required_argument, NULL, OPTION_BIND_ADDRESS },
{ "no-passive", no_argument, NULL, OPTION_NO_FTP_PASSIVE_MODE },
@ -716,6 +716,7 @@ fetch(char *URL, const char *path)
sigalrm = siginfo = sigint = 0;
/* suck in the data */
setvbuf(f, NULL, _IOFBF, B_size);
signal(SIGINFO, sig_handler);
while (!sigint) {
if (us.size != -1 && us.size - count < B_size &&