From f8517950888c704743e1b80dfa1c1ca72f4e04a3 Mon Sep 17 00:00:00 2001
From: lukem <lukem@NetBSD.org>
Date: Wed, 12 Jan 2005 22:37:41 +0000
Subject: [PATCH] Fix ftp url reget when globs are being used. Provided by
 Mathieu Arnold <mat@FreeBSD.org>.

---
 usr.bin/ftp/fetch.c   | 9 ++++++---
 usr.bin/ftp/version.h | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index f14045f0e2d4..7a257583d0cb 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fetch.c,v 1.154 2004/12/10 06:44:15 lukem Exp $	*/
+/*	$NetBSD: fetch.c,v 1.155 2005/01/12 22:37:41 lukem Exp $	*/
 
 /*-
  * Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.154 2004/12/10 06:44:15 lukem Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.155 2005/01/12 22:37:41 lukem Exp $");
 #endif /* not lint */
 
 /*
@@ -1596,7 +1596,10 @@ fetch_ftp(const char *url)
 
 		ointeractive = interactive;
 		interactive = 0;
-		xargv[0] = "mget";
+		if (restartautofetch)
+			xargv[0] = "mreget";
+		else
+			xargv[0] = "mget";
 		mget(xargc, xargv);
 		interactive = ointeractive;
 	} else {
diff --git a/usr.bin/ftp/version.h b/usr.bin/ftp/version.h
index 3e2ebc073f8e..b864b6815d89 100644
--- a/usr.bin/ftp/version.h
+++ b/usr.bin/ftp/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.43 2005/01/03 09:50:10 lukem Exp $	*/
+/*	$NetBSD: version.h,v 1.44 2005/01/12 22:37:41 lukem Exp $	*/
 /*-
  * Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -40,5 +40,5 @@
 #endif
 
 #ifndef FTP_VERSION
-#define	FTP_VERSION	"20050103"
+#define	FTP_VERSION	"20050112"
 #endif