From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 19:35:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6783C106567B; Tue,  8 Apr 2008 19:35:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27C8A1065676
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 19:35:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 16A578FC1D
	for <perforce@freebsd.org>; Tue,  8 Apr 2008 19:35:02 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m38JZ1XK076603
	for <perforce@freebsd.org>; Tue, 8 Apr 2008 19:35:01 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m38JZ0e3076579
	for perforce@freebsd.org; Tue, 8 Apr 2008 19:35:00 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 8 Apr 2008 19:35:00 GMT
Message-Id: <200804081935.m38JZ0e3076579@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 139611 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Apr 2008 19:35:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=139611

Change 139611 by sam@sam_ebb on 2008/04/08 19:34:22

	grep is in /usr/bin; do it entirely in the shell (with help
	from the peanut gallery)

Affected files ...

.. //depot/projects/vap/etc/rc.d/wpa_supplicant#5 edit

Differences ...

==== //depot/projects/vap/etc/rc.d/wpa_supplicant#5 (text+ko) ====

@@ -18,21 +18,29 @@
 	return 1
 fi
 
+is_wired_interface()
+{
+	media=
+	ifconfig $1 2>/dev/null | while read line; do
+		case "$line" in
+		*media:*Ethernet*)
+			media="Ethernet"
+			;;
+		esac
+	done
+	test -z "$media"
+}
+
 case ${ifn} in
 ndis*)
 	driver="ndis"
 	;;
 *)
-	t="`ifconfig $1 2>/dev/null | grep media:`"
-	t=`expr "$t" : 'media: \([^ ]*\)'`
-	case "$t" in
-	Ethernet)
+	if is_wired_interface ${ifn} ; then
 		driver="wired"
-		;;
-	*)
+	else
 		driver="bsd"
-		;;
-	esac
+	fi
 	;;
 esac