include grsutil in build

.gitignore

@@ -16,3 +16,6 @@ build
 reference
 symbols
 stabs
+*.cmarkers
+*.names
+*.EXE

Makefile

@@ -12,7 +12,10 @@ all: wordperfect8_i386.deb
 macro/mactool:
 	make -C macro
 
-wordperfect8_i386: libcompat.so libwppatch.so | macro/mactool
+util/grsutil:
+	make -C util
+
+wordperfect8_i386: libcompat.so libwppatch.so | macro/mactool util/grsutil
 	bash build8.sh $@
 
 libcompat.so: compat.o
@@ -31,3 +34,4 @@ clean:
 	rm -rf lib
 	make -C intercept clean
 	make -C macro clean
+	make -C util clean

build8.sh

@@ -204,9 +204,11 @@ chmod -R 0755 root/lib
 
 # Add any extra utility programs.
 install -D --mode=0755 ../macro/mactool root/shbin10/mactool
+install -D --mode=0755 ../util/grsutil root/shbin10/grsutil
 
 # Remove any debugging symbols from our code.
 strip root/shbin10/mactool
+strip root/shbin10/grsutil
 strip root/lib/libwppatch.so
 
 # Install into prefix

macro/macros/utils.h

@@ -1,10 +1,10 @@
 #ifndef __UTILS_H
 #define __UTILS_H
 
-/* Specify the only editmode you support */
-#define passthru_key_unless(mode)       \
+/* Specify the only state flags you support */
+#define require(mode, ...)              \
     if (!stateset(mode))                \
-        {original key}                  \
+        __VA_ARGS__                     \
         {quit}                          \
     fi