Fix Building on Ubuntu, Logic Errors

  * Makefile
    - Since GNU make and BSD make treat `$<` differently, switch to
      using `${OBJ}` macro for the `$(PROJECT)` target

  * clang-opts.mk
    - Add `-Wno-reserved-id-macro` to `WRN` macro

  * initdb.c
    - Ensure proper NUL termination when trying to `stat(2)` the
      directory given to initialize the database in

  * nombre.c
    - Correct Linux detection macro

  * parsecmd.c
    - Fix control flow issue for group operations in `nombre_newdef()`,
      correctly detecting when an invalid number of arguments were given

  * subnom.c
    - Added macro to determine correct format string for printing
      definitions based on host platform

Author: newnix

Makefile

@@ -63,7 +63,7 @@ subnom.o: nombre.h initdb.h parsecmd.h subnom.h
 dbverify.o: nombre.h dbverify.h
 
 $(PROJECT): $(OBJ)
-	@$(CC) -o $@ $> -fuse-ld=${LD} ${LDFLAGS}
+	@$(CC) -o $@ ${OBJ} -fuse-ld=${LD} ${LDFLAGS}
 
 help:
 	@printf "Build options for %s\n" "${PROJECT}"

clang-opts.mk

@@ -3,7 +3,7 @@ CC = clang
 LD = lld
 
 WRN = -Wextra -Wall -Weverything -Wdeprecated -pedantic -Werror -Wno-padded -Wno-cast-qual -Wno-unused-command-line-argument\
-			-Wno-disabled-macro-expansion
+			-Wno-disabled-macro-expansion -Wno-reserved-id-macro
 CFLAGS = ${WRN} ${MACRO_OVERRIDES} -std=${STD} -Oz -fpic -fpie -pipe -fPIC -fPIE -fvectorize -fstack-protector \
 				 -fstrict-enums -fstrict-return -fstack-protector-strong -fmerge-all-constants -fstack-protector-all \
 				 -Qn -fstrict-aliasing -ffunction-sections -fdata-sections -fuse-ld=${LD}

initdb.c

@@ -184,6 +184,7 @@ nom_dirtest(const char * dbname, const size_t dbnamelen) {
 	while (dirsep --> 0) {
 		if ((dbname[dirsep] ^ DIRSEP) == 0) {
 			memccpy(dbdir, dbname, 0, (size_t)(dirsep + 1)); /* dbdir should now have the directory info from the specified path */
+			dbdir[dirsep] = 0; /* Ensure proper NUL termination */
 			if (dbg) { NOMDBG("Captured %s as the nombre DB directory\n", dbdir); }
 			userid = getuid();
 			/* Group info tests could be improved, currently just using the primary GID */

nombre.c

@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef LINUX
+#if defined(__linux__)
 #include <bsd/string.h>
 #endif /* end LINUX */
 #include <unistd.h>

parsecmd.c

@@ -195,9 +195,10 @@ nombre_newdef(nomcmd * restrict cmdbuf, const char ** restrict args) {
 			retc = snprintf(cmdbuf->gensql, (size_t)PATHMAX, 
 					"INSERT INTO definitions VALUES (\'%s\', \'%s\', (SELECT id FROM categories WHERE name LIKE(\'%s\')));",
 					cmdbuf->defdata[NOMBRE_DBTERM], defstr, cmdbuf->defdata[NOMBRE_DBCATG]);
+		} else {
+			retc = BADARGS;
+			NOMERR("Invalid number of arguments for %s!\n", __func__);
 		}
-		retc = BADARGS;
-		NOMERR("Invalid number of arguments for %s!\n", __func__);
 	} else {
 		memccpy(cmdbuf->defdata[NOMBRE_DBTERM], *args, 0, (size_t)DEFLEN); args++;
 		upcase(cmdbuf->defdata[NOMBRE_DBTERM]);

subnom.c

@@ -190,7 +190,12 @@ runcmd(nomcmd * restrict cmdbuf, int genlen) {
 			}
 			for (register uint_fast16_t i = 1; retc == SQLITE_ROW; i++, retc = sqlite3_step(stmt)) {
 				if (i > 1) {
-					fprintf(stdout,"  #%d: %s\n",  i, sqlite3_column_text(stmt,0));
+					/* Because the size here is apparently inconsistent across platforms */
+#if defined(__linux__)
+					fprintf(stdout,"  #%zu: %s\n",  i, sqlite3_column_text(stmt,0));
+#else
+					fprintf(stdout," #%u: %s\n", i, sqlite3_column_text(stmt,0));
+#endif
 				} else {
 					fprintf(stdout,"%s: %s\n", cmdbuf->defdata[NOMBRE_DBTERM], sqlite3_column_text(stmt,0));
 				}