ViewVC Help

View File | Revision Log | Show Annotations | Download File | View Changeset | Root Listing

root/src/trunk/usr.bin/fetch/fetch.c

Comparing trunk/usr.bin/fetch/fetch.c (file contents):
Revision 11585 by laffer1, Tue Jul 21 23:33:22 2015 UTC vs.
Revision 11586 by laffer1, Sun Jul 8 15:40:58 2018 UTC

#	Line 1 | Line 1
1	+	/* $MidnightBSD$ */
2		/*-
3		* Copyright (c) 2000-2014 Dag-Erling Smørgrav
4		* Copyright (c) 2013 Michael Gmelin <freebsd@grem.de>
#	Line 28 | Line 29
29		*/
30
31		#include <sys/cdefs.h>
32	<	__FBSDID("$FreeBSD: stable/10/usr.bin/fetch/fetch.c 262558 2014-02-27 13:25:26Z des $");
32	>	__FBSDID("$FreeBSD: stable/10/usr.bin/fetch/fetch.c 294194 2016-01-16 20:24:02Z des $");
33
34		#include <sys/param.h>
35		#include <sys/socket.h>
#	Line 102 | Line 103 | enum options
103		OPTION_HTTP_REFERER,
104		OPTION_HTTP_USER_AGENT,
105		OPTION_NO_PROXY,
105	–	OPTION_SSL_ALLOW_SSL2,
106		OPTION_SSL_CA_CERT_FILE,
107		OPTION_SSL_CA_CERT_PATH,
108		OPTION_SSL_CLIENT_CERT_FILE,
#	Line 154 | Line 154 | static struct option longopts[] =
154		{ "referer", required_argument, NULL, OPTION_HTTP_REFERER },
155		{ "user-agent", required_argument, NULL, OPTION_HTTP_USER_AGENT },
156		{ "no-proxy", required_argument, NULL, OPTION_NO_PROXY },
157	–	{ "allow-sslv2", no_argument, NULL, OPTION_SSL_ALLOW_SSL2 },
157		{ "ca-cert", required_argument, NULL, OPTION_SSL_CA_CERT_FILE },
158		{ "ca-path", required_argument, NULL, OPTION_SSL_CA_CERT_PATH },
159		{ "cert", required_argument, NULL, OPTION_SSL_CLIENT_CERT_FILE },
#	Line 845 | Line 844 | static void
844		usage(void)
845		{
846		fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
847	<	"usage: fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
848	<	"       [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
849	<	"       [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
850	<	"       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
851	<	"       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
847	>	"usage: fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
848	>	"       [--ca-cert=file] [--ca-path=dir] [--cert=file] [--crl=file]",
849	>	"       [-i file] [--key=file] [-N file] [--no-passive] [--no-proxy=list]",
850	>	"       [--no-sslv3] [--no-tlsv1] [--no-verify-hostname] [--no-verify-peer]",
851	>	"       [-o file] [--referer=URL] [-S bytes] [-T seconds]",
852		"       [--user-agent=agent-string] [-w seconds] URL ...",
853	<	"       fetch [-146AadFlMmnPpqRrsUv] [--allow-sslv2] [-B bytes]",
854	<	"       [--bind-address=host] [--ca-cert=file] [--ca-path=dir] [--cert=file]",
855	<	"       [--crl=file] [-i file] [--key=file] [-N file] [--no-passive]",
856	<	"       [--no-proxy=list] [--no-sslv3] [--no-tlsv1] [--no-verify-hostname]",
857	<	"       [--no-verify-peer] [-o file] [--referer=URL] [-S bytes] [-T seconds]",
853	>	"       fetch [-146AadFlMmnPpqRrsUv] [-B bytes] [--bind-address=host]",
854	>	"       [--ca-cert=file] [--ca-path=dir] [--cert=file] [--crl=file]",
855	>	"       [-i file] [--key=file] [-N file] [--no-passive] [--no-proxy=list]",
856	>	"       [--no-sslv3] [--no-tlsv1] [--no-verify-hostname] [--no-verify-peer]",
857	>	"       [-o file] [--referer=URL] [-S bytes] [-T seconds]",
858		"       [--user-agent=agent-string] [-w seconds] -h host -f file [-c dir]");
859		}
860
#	Line 1003 | Line 1002 | main(int argc, char *argv[])
1002		break;
1003		case OPTION_NO_PROXY:
1004		setenv("NO_PROXY", optarg, 1);
1006	–	break;
1007	–	case OPTION_SSL_ALLOW_SSL2:
1008	–	setenv("SSL_ALLOW_SSL2", "", 1);
1005		break;
1006		case OPTION_SSL_CA_CERT_FILE:
1007		setenv("SSL_CA_CERT_FILE", optarg, 1);

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines