From 2809643ac193e5464c3a27f1c34458e253ee85dc Mon Sep 17 00:00:00 2001
From: cathugger <cathugger@cock.li>
Date: Mon, 23 Oct 2017 07:06:59 +0000
Subject: [PATCH] nicer messages

---
 base16_from.c |  3 ++-
 base32_from.c |  3 ++-
 main.c        | 17 +++++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/base16_from.c b/base16_from.c
index 4e991f9..0ae6d69 100644
--- a/base16_from.c
+++ b/base16_from.c
@@ -73,7 +73,8 @@ int base16_valid(const char *src,size_t *count)
 {
 	const char *p;
 
-	for (p = src;base16f[(u8)*p] != 0xFF;++p) ;
+	for (p = src;base16f[(u8)*p] != 0xFF;++p)
+		;
 
 	if (count)
 		*count = p - src;
diff --git a/base32_from.c b/base32_from.c
index 843c01c..35eb444 100644
--- a/base32_from.c
+++ b/base32_from.c
@@ -92,7 +92,8 @@ int base32_valid(const char *src,size_t *count)
 {
 	const char *p;
 
-	for (p = src;base32f[(u8)*p] != 0xFF;++p) ;
+	for (p = src;base32f[(u8)*p] != 0xFF;++p)
+		;
 
 	if (count)
 		*count = p - src;
diff --git a/main.c b/main.c
index 9e64a74..9a372ce 100644
--- a/main.c
+++ b/main.c
@@ -356,18 +356,27 @@ static void filters_add(const char *filter)
 
 	if (!base32_valid(filter,&ret)) {
 		fprintf(stderr,"filter \"%s\" is invalid\n",filter);
+		fprintf(stderr,"        ");
+		while (ret--)
+			fputc(' ',stderr);
+		fprintf(stderr,"^\n");
 		return;
 	}
 	ret = BASE32_FROM_LEN(ret);
 	if (!ret)
 		return;
 #ifdef INTFILTER
-	if (ret > sizeof(IFT))
+	size_t maxsz = sizeof(IFT);
 #else
-	if (ret > sizeof(bf.f))
+	size_t maxsz = sizeof(bf.f);
 #endif
-	{
+	if (ret > maxsz) {
 		fprintf(stderr,"filter \"%s\" is too long\n",filter);
+		fprintf(stderr,"        ");
+		maxsz = BASE32_TO_LEN(maxsz);
+		while (--maxsz)
+			fputc(' ',stderr);
+		fprintf(stderr,"^\n");
 		return;
 	}
 	base32_from(bf.f,&bf.mask,filter);
@@ -614,7 +623,7 @@ static void filters_print()
 		*a = 0;
 		fprintf(stderr,"\t%s\n",buf0);
 	}
-	fprintf(stderr,"totally %zu %s\n",l,l == 1 ? "filter" : "filters");
+	fprintf(stderr,"in total, %zu %s\n",l,l == 1 ? "filter" : "filters");
 }
 
 // statistics, if enabled