svn commit: r252085 - head/usr.sbin/bsdconfig/share/media

Devin Teske dteske at FreeBSD.org
Sat Jun 22 03:50:15 UTC 2013


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:]]*/, "")


More information about the svn-src-head mailing list