X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/0f00dc4c8eb47e67bc0f148c2dd109f73a451e0a..HEAD:/math/genwheel.c

diff --git a/math/genwheel.c b/math/genwheel.c
index 94d05722..0354cc28 100644
--- a/math/genwheel.c
+++ b/math/genwheel.c
@@ -35,6 +35,7 @@
 
 #include <mLib/darray.h>
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/mdwopt.h>
 #include <mLib/quis.h>
 #include <mLib/report.h>
@@ -61,6 +62,7 @@ int main(int argc, char *argv[])
   const char *header = "wheel.h";
   const char *name = "wheel";
   const char *sym = 0;
+  const char *hdrbase;
   unsigned long i, n;
   unsigned long mod;
   int o;
@@ -96,6 +98,9 @@ int main(int argc, char *argv[])
     }
   }
 
+  if ((hdrbase = strrchr(header, '/')) == 0) hdrbase = header;
+  else hdrbase++;
+
   for (mod = 1, i = 2, n = 0;
        n < np;
        i++) {
@@ -123,8 +128,8 @@ int main(int argc, char *argv[])
     if (!sym) {
       for (q = header; *q; q++) {
 	int ch = (unsigned char)*q;
-	if (isalnum(ch))
-	  ch = toupper(ch);
+	if (ISALNUM(ch))
+	  ch = TOUPPER(ch);
 	else
 	  ch = '_';
 	DPUTC(&d, ch);
@@ -173,7 +178,7 @@ extern const %s %s[];\n\
 #include \"%s\"\n\
 \n\
 const %s %s[] = {",
-	    header, type, name);
+	    hdrbase, type, name);
     for (i = 0; i < DA_LEN(&v); i++) {
       if (i % 8 == 0)
 	fputs("\n  ", fp);