[src/trunk]: src/usr.bin/ftp Use the first name we requested the http/https U...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9a7782549d9c
branches:  trunk
changeset: 821290:9a7782549d9c
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 31 21:05:35 2017 +0000

description:
Use the first name we requested the http/https URL for, not any name we ended
up with after random redirects.

diffstat:

 usr.bin/ftp/fetch.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r 7b574026e39b -r 9a7782549d9c usr.bin/ftp/fetch.c
--- a/usr.bin/ftp/fetch.c       Tue Jan 31 18:56:35 2017 +0000
+++ b/usr.bin/ftp/fetch.c       Tue Jan 31 21:05:35 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $       */
+/*     $NetBSD: fetch.c,v 1.227 2017/01/31 21:05:35 christos Exp $     */
 
 /*-
  * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: fetch.c,v 1.226 2016/12/15 04:49:15 nonaka Exp $");
+__RCSID("$NetBSD: fetch.c,v 1.227 2017/01/31 21:05:35 christos Exp $");
 #endif /* not lint */
 
 /*
@@ -1369,6 +1369,12 @@
                        savefile = ftp_strdup(cp + 1);
                else
                        savefile = ftp_strdup(decodedpath);
+               /*
+                * Use the first URL we requested not the name after a
+                * possible redirect, but careful to save it because our
+                * "safety" check is the match to outfile.
+                */
+               outfile = ftp_strdup(savefile);
        }
        DPRINTF("%s: savefile `%s'\n", __func__, savefile);
        if (EMPTYSTRING(savefile)) {