From 4e51142022e4e2a57a65aa4fd4e3a66ba6041602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <tim.ruehsen@gmx.de>
Date: Fri, 15 Sep 2017 17:13:57 +0200
Subject: [PATCH] psl_*_count() return -1 if information is not available

---
 src/psl.c   | 27 ++++++++++++++++++---------
 tools/psl.c | 20 +++++++++++++++++---
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/src/psl.c b/src/psl.c
index 5d52944..8018340 100644
--- a/src/psl.c
+++ b/src/psl.c
@@ -1346,7 +1346,10 @@ const psl_ctx_t *psl_builtin(void)
  * This function returns number of public suffixes maintained by @psl.
  * The number of exceptions within the Public Suffix List are not included.
  *
- * Returns: Number of public suffixes entries in PSL context.
+ * If the information is not available, the return value is -1 (since 0.19).
+ * This is the case with DAFSA blobs or if @psl is NULL.
+ *
+ * Returns: Number of public suffixes entries in PSL context or -1 if this information is not available.
  *
  * Since: 0.1
  */
@@ -1355,9 +1358,9 @@ int psl_suffix_count(const psl_ctx_t *psl)
 	if (psl == &_builtin_psl)
 		return _psl_nsuffixes;
 	else if (psl)
-		return psl->nsuffixes;
+		return psl->dafsa ? -1 : psl->nsuffixes;
 	else
-		return 0;
+		return -1;
 }
 
 /**
@@ -1366,7 +1369,10 @@ int psl_suffix_count(const psl_ctx_t *psl)
  *
  * This function returns number of public suffix exceptions maintained by @psl.
  *
- * Returns: Number of public suffix exceptions in PSL context.
+ * If the information is not available, the return value is -1 (since 0.19).
+ * This is the case with DAFSA blobs or if @psl is NULL.
+ *
+ * Returns: Number of public suffix exceptions in PSL context or -1 if this information is not available.
  *
  * Since: 0.1
  */
@@ -1375,9 +1381,9 @@ int psl_suffix_exception_count(const psl_ctx_t *psl)
 	if (psl == &_builtin_psl)
 		return _psl_nexceptions;
 	else if (psl)
-		return psl->nexceptions;
+		return psl->dafsa ? -1 : psl->nexceptions;
 	else
-		return 0;
+		return -1;
 }
 
 /**
@@ -1386,7 +1392,10 @@ int psl_suffix_exception_count(const psl_ctx_t *psl)
  *
  * This function returns number of public suffix wildcards maintained by @psl.
  *
- * Returns: Number of public suffix wildcards in PSL context.
+ * If the information is not available, the return value is -1 (since 0.19).
+ * This is the case with DAFSA blobs or if @psl is NULL.
+ *
+ * Returns: Number of public suffix wildcards in PSL context or -1 if this information is not available.
  *
  * Since: 0.10.0
  */
@@ -1395,9 +1404,9 @@ int psl_suffix_wildcard_count(const psl_ctx_t *psl)
 	if (psl == &_builtin_psl)
 		return _psl_nwildcards;
 	else if (psl)
-		return psl->nwildcards;
+		return psl->dafsa ? -1 : psl->nwildcards;
 	else
-		return 0;
+		return -1;
 }
 
 /**
diff --git a/tools/psl.c b/tools/psl.c
index 7d7f37f..3375016 100644
--- a/tools/psl.c
+++ b/tools/psl.c
@@ -210,9 +210,23 @@ int main(int argc, const char *const *argv)
 		printf("dist filename: %s\n", psl_dist_filename());
 
 		if (psl && psl != psl_builtin()) {
-			printf("suffixes: %d\n", psl_suffix_count(psl));
-			printf("exceptions: %d\n", psl_suffix_exception_count(psl));
-			printf("wildcards: %d\n", psl_suffix_wildcard_count(psl));
+			static char not_avail[] = "- information not available -";
+			int n;
+
+			if ((n = psl_suffix_count(psl)) >= 0)
+				printf("suffixes: %d\n", n);
+			else
+				printf("suffixes: %s\n", not_avail);
+
+			if ((n = psl_suffix_exception_count(psl)) >= 0)
+				printf("exceptions: %d\n", n);
+			else
+				printf("exceptions: %s\n", not_avail);
+
+			if ((n = psl_suffix_wildcard_count(psl)) >= 0)
+				printf("wildcards: %d\n", n);
+			else
+				printf("wildcards: %s\n", not_avail);
 		}
 
 		psl_free(psl);