From 762593385c2492e630946b9253083367bee19181 Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Fri, 29 Oct 2010 17:50:13 +0200
Subject: wifi: proper fix for SSID regexp

---
 widgets/wifi.lua | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'widgets')

diff --git a/widgets/wifi.lua b/widgets/wifi.lua
index f2e2b7d..3e30dc9 100644
--- a/widgets/wifi.lua
+++ b/widgets/wifi.lua
@@ -7,6 +7,7 @@
 local tonumber = tonumber
 local math = { ceil = math.ceil }
 local setmetatable = setmetatable
+local helpers = require("vicious.helpers")
 local io = {
     open = io.open,
     popen = io.popen
@@ -57,7 +58,7 @@ local function worker(format, warg)
     -- Output differs from system to system, some stats can be
     -- separated by =, and not all drivers report all stats
     winfo["{ssid}"] =  -- SSID can have almost anything in it
-      string.match(iw, 'ESSID[=:]"([%w%p]+[%s%w%p]*)"') or winfo["{ssid}"]
+      helpers.escape(string.match(iw, 'ESSID[=:]"(.-)"') or winfo["{ssid}"])
     winfo["{mode}"] =  -- Modes are simple, but also match the "-" in Ad-Hoc
       string.match(iw, "Mode[=:]([%w%-]*)") or winfo["{mode}"]
     winfo["{chan}"] =  -- Channels are plain digits
-- 
cgit v1.2.3