[empathy] Correct grouping in the hostname regexp
- From: Sjoerd Simons <sjoerds src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Correct grouping in the hostname regexp
- Date: Wed, 31 Aug 2011 14:25:21 +0000 (UTC)
commit fcd22fbdd8d4545b04e15f3bcb6e4384e7d0ded6
Author: Sjoerd Simons <sjoerd simons collabora co uk>
Date: Wed Aug 31 15:14:15 2011 +0100
Correct grouping in the hostname regexp
Correctly group our subregexp otherwise hostnames like the following
won't be recognized due to the way things expand:
a.com
example.c-om
libempathy-gtk/empathy-account-widget.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/libempathy-gtk/empathy-account-widget.c b/libempathy-gtk/empathy-account-widget.c
index e148ada..8df9174 100644
--- a/libempathy-gtk/empathy-account-widget.c
+++ b/libempathy-gtk/empathy-account-widget.c
@@ -154,9 +154,10 @@ static guint signals[LAST_SIGNAL] = { 0 };
#define ALPHADIGITDASHS "(["ALPHADIGITDASH"]*)"
#define HOSTNUMBER "("DIGITS"\\."DIGITS"\\."DIGITS"\\."DIGITS")"
-#define TOPLABEL ALPHAS"|(["ALPHA"]" ALPHADIGITDASHS "["ALPHADIGIT"])"
-#define DOMAINLABEL ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
- "["ALPHADIGIT"])"
+#define TOPLABEL "("ALPHAS \
+ "| (["ALPHA"]"ALPHADIGITDASHS "["ALPHADIGIT"]))"
+#define DOMAINLABEL "("ALPHADIGITS"|(["ALPHADIGIT"]" ALPHADIGITDASHS \
+ "["ALPHADIGIT"]))"
#define HOSTNAME "((" DOMAINLABEL "\\.)+" TOPLABEL ")"
/* Based on http://www.ietf.org/rfc/rfc1738.txt (section 5) */
#define HOST "("HOSTNAME "|" HOSTNUMBER")"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]