Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Apr 2008 19:35:00 GMT
From:      Sam Leffler <sam@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 139611 for review
Message-ID:  <200804081935.m38JZ0e3076579@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200804081935.m38JZ0e3076579>