From cedd8898892dd1717bd98ed2917a03a31b1b45c1 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Mon, 11 Apr 2005 10:36:01 +0000
Subject: handle ESSID with spaces (#15352)

---
 perl-install/standalone/drakroam | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/standalone/drakroam')

diff --git a/perl-install/standalone/drakroam b/perl-install/standalone/drakroam
index e76399ee9..c54240ee6 100755
--- a/perl-install/standalone/drakroam
+++ b/perl-install/standalone/drakroam
@@ -260,7 +260,7 @@ sub UpdateStatus() {
 	my $CurrentSignal = "-";
 	print "Updating\n" if $::testing;
 	foreach (run_program::get_stdout($IWConfig, $device)) {
-		/ESSID:"(\S*)"/ and $CurrentNet = $1;
+		/ESSID:"(.*?)"/ and $CurrentNet = $1;
 		/Mode:(\S*)\s/ and $CurrentMode = $1;
 		/key:(\S*)\s/ and $CurrentWEP = $1;
 		m!Quality:(\S*)/! and $CurrentSignal = $1;
@@ -288,7 +288,7 @@ sub UpdateAvailable() {
 	foreach (`$IWList scan 2>/dev/null`) {
 		/([^ ]+)([ \t]+)Scan completed :/ and $device = $1;
 		/([^ ]+)([ \t]+)No scan results/ and  $device = $1;
-		/ESSID:"(\S*)"/ and $essid = $1;
+		/ESSID:".*?"/ and $essid = $1;
 		/Mode:(\S*)/ and $mode = $1;
 		m!Quality:(\S*)/! and $signal = $1;
 		if (/key:(\S*)\s/) {
-- 
cgit v1.2.1