svn commit: r252877 - stable/9/etc

[Andriy Gapon]

Author: avg
Date: Sat Jul  6 09:02:30 2013
New Revision: 252877
URL: http://svnweb.freebsd.org/changeset/base/252877

Log:
  MFC r248820: rc.subr: disabling globbing while processing devfs rules

Modified:
  stable/9/etc/rc.subr
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/rc.subr
==============================================================================
--- stable/9/etc/rc.subr	Sat Jul  6 08:59:27 2013	(r252876)
+++ stable/9/etc/rc.subr	Sat Jul  6 09:02:30 2013	(r252877)
@@ -1318,7 +1318,7 @@ make_symlink()
 #
 devfs_rulesets_from_file()
 {
-	local file _err _me
+	local file _err _me _opts
 	file="$1"
 	_me="devfs_rulesets_from_file"
 	_err=0
@@ -1331,6 +1331,11 @@ devfs_rulesets_from_file()
 		debug "$_me: no such file ($file)"
 		return 0
 	fi
+
+	# Disable globbing so that the rule patterns are not expanded
+	# by accident with matching filesystem entries.
+	_opts=$-; set -f
+
 	debug "reading rulesets from file ($file)"
 	{ while read line
 	do
@@ -1377,6 +1382,7 @@ devfs_rulesets_from_file()
 			break
 		fi
 	done } < $file
+	case $_opts in *f*) ;; *) set +f ;; esac
 	return $_err
 }