From eb63e75379854d53971733cd35dc1a33dbe84d9b Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 17:06:20 +0100
Subject: [PATCH 1/3] No need for pipe here

---
 pihole | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole b/pihole
index d8217fed..45cd0af0 100755
--- a/pihole
+++ b/pihole
@@ -70,7 +70,7 @@ setupLCDFunction() {
 queryFunc() {
   domain="${2}"
   for list in /etc/pihole/list.*; do
-    count=$(grep ${domain} $list | wc -l)
+    count=$(grep -c ${domain} $list)
     echo "::: ${list} (${count} results)"
     if [[ ${count} > 0 ]]; then
       grep ${domain} ${list}

From 6cd3c9347282dd21602c59d35ef9873316edea56 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 17:09:49 +0100
Subject: [PATCH 2/3] Also query white- and blacklist

---
 pihole | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pihole b/pihole
index 45cd0af0..5abdc01c 100755
--- a/pihole
+++ b/pihole
@@ -69,7 +69,8 @@ setupLCDFunction() {
 
 queryFunc() {
   domain="${2}"
-  for list in /etc/pihole/list.*; do
+  lists=( /etc/pihole/list.* /etc/pihole/whitelist.txt /etc/pihole/blacklist.txt)
+  for list in ${lists[@]}; do
     count=$(grep -c ${domain} $list)
     echo "::: ${list} (${count} results)"
     if [[ ${count} > 0 ]]; then

From 74cb79252cf22109b863bf8d022afa52f87da2c5 Mon Sep 17 00:00:00 2001
From: DL6ER <derigs@ph1.uni-koeln.de>
Date: Mon, 5 Dec 2016 17:12:28 +0100
Subject: [PATCH 3/3] Only looking for blocking entries (do not scan
 whitelist.txt)

---
 pihole | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pihole b/pihole
index 5abdc01c..8adb15ed 100755
--- a/pihole
+++ b/pihole
@@ -69,7 +69,7 @@ setupLCDFunction() {
 
 queryFunc() {
   domain="${2}"
-  lists=( /etc/pihole/list.* /etc/pihole/whitelist.txt /etc/pihole/blacklist.txt)
+  lists=( /etc/pihole/list.* /etc/pihole/blacklist.txt)
   for list in ${lists[@]}; do
     count=$(grep -c ${domain} $list)
     echo "::: ${list} (${count} results)"