fetch-1.3:

Remove FreeBSD legacy options. -H was undocumented and ignored,
-h / -f / -c could be used to construct FTP URLs in an adhoc fashion.

4 files changed, 4 insertions, 66 deletions

diff --git a/net/fetch/Makefile b/net/fetch/Makefile
index 5f34d16b307..0565f72a67a 100644
--- a/net/fetch/Makefile
+++ b/net/fetch/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2009/02/05 17:14:06 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/02/05 22:19:57 joerg Exp $
 #
 
-DISTNAME=	fetch-1.2
+DISTNAME=	fetch-1.3
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/net/fetch/files/fetch.1 b/net/fetch/files/fetch.1
index 0d75628be28..6733d628c53 100644
--- a/net/fetch/files/fetch.1
+++ b/net/fetch/files/fetch.1
@@ -44,9 +44,6 @@
 .Op Fl N Ar file
 .Op Fl o Ar file
 .Op Fl w Ar seconds
-.Op Fl h Ar host
-.Op Fl c Ar dir
-.Op Fl f Ar file
 .Op Ar URL ...
 .Sh DESCRIPTION
 The
@@ -84,12 +81,6 @@ The number of reads actually performed is reported at verbosity level
 two or higher (see the
 .Fl v
 flag).
-.It Fl c Ar dir
-The file to retrieve is in directory
-.Ar dir
-on the remote host.
-This option is deprecated and is provided for backward compatibility
-only.
 .It Fl d
 Use a direct connection even if a proxy is configured.
 .It Fl F
@@ -99,17 +90,6 @@ flag, forces a restart even if the local and remote files have
 different modification times.
 Implies
 .Fl R .
-.It Fl f Ar file
-The file to retrieve is named
-.Ar file
-on the remote host.
-This option is deprecated and is provided for backward compatibility
-only.
-.It Fl h Ar host
-The file to retrieve is located on the host
-.Ar host .
-This option is deprecated and is provided for backward compatibility
-only.
 .It Fl i
 Only fetch if it the output file is older than the referenced URL.
 This option is overriden by
diff --git a/net/fetch/files/fetch.c b/net/fetch/files/fetch.c
index 9cdb19c26b8..581a75e594c 100644
--- a/net/fetch/files/fetch.c
+++ b/net/fetch/files/fetch.c
@@ -85,11 +85,8 @@ int	 A_flag;	/*    -A: do not follow 302 redirects */
 int	 a_flag;	/*    -a: auto retry */
 off_t	 B_size;	/*    -B: buffer size */
 int	 b_flag;	/*!   -b: workaround TCP bug */
-char    *c_dirname;	/*    -c: remote directory */
 int	 d_flag;	/*    -d: direct connection */
 int	 F_flag;	/*    -F: restart without checking mtime  */
-char	*f_filename;	/*    -f: file to fetch */
-char	*h_hostname;	/*    -h: host to fetch from */
 int	 i_flag;	/*    -i: fetch file if modified */
 int	 l_flag;	/*    -l: link rather than copy file: URLs */
 int	 m_flag;	/* -[Mm]: mirror mode */
@@ -784,7 +781,7 @@ main(int argc, char *argv[])
 	int c, e, r;
 
 	while ((c = getopt(argc, argv,
-	    "146AaB:bc:dFf:Hh:ilMmN:no:qRrS:sT:tUvw:")) != -1)
+	    "146AaB:bdFilMmN:no:qRrS:sT:tUvw:")) != -1)
 		switch (c) {
 		case '1':
 			once_flag = 1;
@@ -810,25 +807,12 @@ main(int argc, char *argv[])
 			warnx("warning: the -b option is deprecated");
 			b_flag = 1;
 			break;
-		case 'c':
-			c_dirname = optarg;
-			break;
 		case 'd':
 			d_flag = 1;
 			break;
 		case 'F':
 			F_flag = 1;
 			break;
-		case 'f':
-			f_filename = optarg;
-			break;
-		case 'H':
-			warnx("the -H option is now implicit, "
-			    "use -U to disable");
-			break;
-		case 'h':
-			h_hostname = optarg;
-			break;
 		case 'i':
 			i_flag = 1;
 			break;
@@ -901,20 +885,6 @@ main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	if (h_hostname || f_filename || c_dirname) {
-		if (!h_hostname || !f_filename || argc) {
-			usage();
-			exit(EX_USAGE);
-		}
-		/* XXX this is a hack. */
-		if (strcspn(h_hostname, "@:/") != strlen(h_hostname))
-			errx(1, "invalid hostname");
-		if (asprintf(argv, "ftp://%s/%s/%s", h_hostname,
-		    c_dirname ? c_dirname : "", f_filename) == -1)
-			errx(1, "%s", strerror(ENOMEM));
-		argc++;
-	}
-
 	if (!argc) {
 		usage();
 		exit(EX_USAGE);
diff --git a/net/fetch/files/fetch.cat1 b/net/fetch/files/fetch.cat1
index 6b73d66f5c4..81df66a415b 100644
--- a/net/fetch/files/fetch.cat1
+++ b/net/fetch/files/fetch.cat1
@@ -5,7 +5,7 @@ NNAAMMEE
 
 SSYYNNOOPPSSIISS
      ffeettcchh [--114466AAFFMMRRUUaaddiillmmnnqqrrssvv] [--BB _b_y_t_e_s] [--SS _b_y_t_e_s] [--TT _s_e_c_o_n_d_s] [--NN _f_i_l_e]
-           [--oo _f_i_l_e] [--ww _s_e_c_o_n_d_s] [--hh _h_o_s_t] [--cc _d_i_r] [--ff _f_i_l_e] [_U_R_L _._._.]
+           [--oo _f_i_l_e] [--ww _s_e_c_o_n_d_s] [_U_R_L _._._.]
 
 DDEESSCCRRIIPPTTIIOONN
      The ffeettcchh utility provides a command-line interface to the fetch(3)
@@ -32,24 +32,12 @@ DDEESSCCRRIIPPTTIIOONN
                  silently ignored.  The number of reads actually performed is
                  reported at verbosity level two or higher (see the --vv flag).
 
-     --cc _d_i_r      The file to retrieve is in directory _d_i_r on the remote host.
-                 This option is deprecated and is provided for backward com-
-                 patibility only.
-
      --dd          Use a direct connection even if a proxy is configured.
 
      --FF          In combination with the --rr flag, forces a restart even if the
                  local and remote files have different modification times.
                  Implies --RR.
 
-     --ff _f_i_l_e     The file to retrieve is named _f_i_l_e on the remote host.  This
-                 option is deprecated and is provided for backward compatibil-
-                 ity only.
-
-     --hh _h_o_s_t     The file to retrieve is located on the host _h_o_s_t.  This
-                 option is deprecated and is provided for backward compatibil-
-                 ity only.
-
      --ii          Only fetch if it the output file is older than the referenced
                  URL.  This option is overriden by --oo _-.