From f98cc4a86357f0fe42e935e17d2bf93c062745ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 14 Sep 2017 20:20:42 +0200
Subject: [PATCH] Do simpler things to create wildcard domains

---
 chrome_addon/lib/main.js | 17 ++++++-----------
 cli/main.c               | 15 ++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/chrome_addon/lib/main.js b/chrome_addon/lib/main.js
index ad25fa4..7376114 100644
--- a/chrome_addon/lib/main.js
+++ b/chrome_addon/lib/main.js
@@ -288,21 +288,16 @@ function wildcard_domain(domain)
 {
     var parts = domain.split(".");
 
-    if (parts.length >= 3)
+    // Standard root domain (zzz.xxx.com) or more
+    if (parts.length > 2)
     {
-	// Seems to be a two level root domain (ie zzz.xxx.co.uk ...)
-	if (parts[parts.length-2].lenght <= 3)
-	{
-	    if (parts.length > 3)
-		return "*" + "." + parts[parts.length-3] + "." + parts[parts.length-2] + "." + parts[parts.length-1];
-	}
-	// Standard root domain (zzz.xxx.com)
-	else
-	    return "*" + "." + parts[parts.length-2] + "." + parts[parts.length-1];
+	res = "*.";
+	for (i=1; i<parts.length; i++)
+	    res += parts[i];
     }
     // Simple xxx.com
     else if (parts.length == 2)
-	return "*" + "." + parts[0] + "." + parts[1];
+	return "*." + domain;
 
     return "";
 }
diff --git a/cli/main.c b/cli/main.c
index 98a6765..2e9b65d 100644
--- a/cli/main.c
+++ b/cli/main.c
@@ -297,20 +297,13 @@ static char* wildcard_domain(char* domain)
     }
 
     // Final level
-    level_length[cur_level] = tmp - level_ptr[cur_level-1];
+    level_length[cur_level-1] = tmp - level_ptr[cur_level-1];
 
     tmp = NULL;
-    if (cur_level >= 3)
+    if (cur_level > 2)
     {
-        // Seems to be a two level root domain (ie zzz.xxx.co.uk ...)
-        if (level_length[cur_level-2] <= 3)
-        {
-            if (cur_level > 3)
-                tmp = level_ptr[cur_level-3];
-        }
-        else
-            // Standard root domain (zzz.xxx.com)
-            tmp = level_ptr[cur_level-2];
+        // Standard root domain (zzz.xxx.com) or more
+        tmp = level_ptr[1];
     }
     // Simple xxx.com
     else if (cur_level == 2)