From 15595b33dc88724253a147b7894c953a5d3110e6 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 26 Nov 2009 13:52:50 -0800
Subject: [PATCH] gsm: CGDCONT parsing fixes (bgo #602552)

Ignore spaces and account for random parentheses in the CGDCONT
response.  Also fixes parsing CGDCONT=? on nozomi.
---
 src/mm-generic-gsm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c
index f2053c53..5bd1c328 100644
--- a/src/mm-generic-gsm.c
+++ b/src/mm-generic-gsm.c
@@ -1319,7 +1319,7 @@ cid_range_read (MMSerialPort *port,
         GRegex *r;
         GMatchInfo *match_info;
 
-        r = g_regex_new ("\\+CGDCONT: \\((\\d+)-(\\d+)\\),\"(\\S+)\"",
+        r = g_regex_new ("\\+CGDCONT:\\s*\\((\\d+)-(\\d+)\\),\\(?\"(\\S+)\"",
                          G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
                          0, &info->error);
         if (r) {
@@ -1385,7 +1385,7 @@ existing_apns_read (MMSerialPort *port,
         GRegex *r;
         GMatchInfo *match_info;
 
-        r = g_regex_new ("\\+CGDCONT: (\\d+)\\s*,\"(\\S+)\",\"(\\S+)\",\"(\\S+)\"",
+        r = g_regex_new ("\\+CGDCONT:\\s*(\\d+)\\s*,\"(\\S+)\",\"(\\S+)\",\"(\\S*)\"",
                          G_REGEX_DOLLAR_ENDONLY | G_REGEX_RAW,
                          0, &info->error);
         if (r) {