cepheid

commit 0aa5326a05be8deb3d1aa5a2d01cb6ddfb0738e6
parent 58377c23450c9213e10d599df096dce0dca1263e
Author: hhvn <dev@hhvn.uk>
Date:   Wed,  5 Oct 2022 17:48:21 +0100

dbtool calls dbdeclare()

Diffstat:
M
Makefile
 | 
2
+-
M
db/db.c
 | 
2
+-
M
db/dbtool.c
 | 
3
+++

3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ db-clean:
 	@cd $(DBDIR); make clean
 dbtool:
 	@echo $(DBDIR): make $(DBTOOL)
-	@cd $(DBDIR); make dbtool
+	@cd $(DBDIR); make CFLAGS="$(CFLAGS)" dbtool
 
 data:
 	@echo $(DATADIR): make
diff --git a/db/db.c b/db/db.c
@@ -742,7 +742,7 @@ dbcleanup(void) {
 	int i;
 
 	prev = dbs;
-	p = prev->next;
+	if (prev) p = prev->next;
 	while (prev) {
 		for (i = 0; i < MAXGROUPS; i++)
 			if (prev->tracked[i])
diff --git a/db/dbtool.c b/db/dbtool.c
@@ -41,6 +41,9 @@ main(int argc, char *argv[]) {
 	char **list;
 	size_t len, i;
 
+	if (argc >= 2)
+		dbdeclare(argv[1]);
+
 	if (argc == 2) {
 		len = dblistgroups(&list, argv[1]);
 		if (!list)