From owner-svn-src-head@FreeBSD.ORG  Sat Jun 22 03:50:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 1CA5DED;
 Sat, 22 Jun 2013 03:50:15 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0F06F19D2;
 Sat, 22 Jun 2013 03:50:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5M3oE2b063605;
 Sat, 22 Jun 2013 03:50:14 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5M3oEaL063604;
 Sat, 22 Jun 2013 03:50:14 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201306220350.r5M3oEaL063604@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Sat, 22 Jun 2013 03:50:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r252085 - head/usr.sbin/bsdconfig/share/media
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Jun 2013 03:50:15 -0000

Author: dteske
Date: Sat Jun 22 03:50:14 2013
New Revision: 252085
URL: http://svnweb.freebsd.org/changeset/base/252085

Log:
  Oops, previous revision (r252084) broke non-full-path resolution (e.g.,
  ftp://ftp.freebsd.org or ftp://ftp.freebsd.org/). Now both full-path and
  non-full resolution is working regardless of trailing-slash.

Modified:
  head/usr.sbin/bsdconfig/share/media/ftp.subr

Modified: head/usr.sbin/bsdconfig/share/media/ftp.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/media/ftp.subr	Sat Jun 22 03:44:49 2013	(r252084)
+++ head/usr.sbin/bsdconfig/share/media/ftp.subr	Sat Jun 22 03:50:14 2013	(r252085)
@@ -661,7 +661,7 @@ f_media_init_ftp()
 			if echo "$rx" | awk -v dir="/${ftp_dir#/}" '
 				BEGIN {
 					found = 0
-					sub("/$", "", dir)
+					if ( dir != "/" ) sub("/$", "", dir)
 				}
 				/^Remote directory: / {
 					sub(/^[^:]*:[[:space:]]*/, "")