utils/versioncmp.h: Add a wrapper macro for `versioncmp'.

[mLib] / codec / bincode.c

diff --git a/codec/bincode.c b/codec/bincode.c
index 0a7d5c5..77d2457 100644 (file)
--- a/codec/bincode.c
+++ b/codec/bincode.c
@@ -36,6 +36,7 @@
 
 #include "codec.h"
 #include "dstr.h"
+#include "macros.h"
 #include "mdwopt.h"
 #include "quis.h"
 #include "report.h"
@@ -65,6 +66,7 @@ static const struct { const char *name; unsigned f; } flagtab[] = {
   { "igneqmid",                CDCF_IGNEQMID },
   { "ignzpad",         CDCF_IGNZPAD },
   { "ignnewl",         CDCF_IGNNEWL },
+  { "ignspc",          CDCF_IGNSPC },
   { "igninvch",                CDCF_IGNINVCH },
   { "ignjunk",         CDCF_IGNJUNK },
   { 0,                 0, }
@@ -139,7 +141,7 @@ int main(int argc, char *argv[])
   const char *indent = "";
   const char *imode, *omode, *ofile = 0;
   unsigned maxline = 64;
-  unsigned f = CDCF_IGNNEWL;
+  unsigned f = CDCF_IGNSPC | CDCF_IGNNEWL;
   const char *p;
   char *q;
   FILE *ifp, *ofp = stdout;
@@ -194,7 +196,7 @@ int main(int argc, char *argv[])
          n = strcspn(p, ",");
          for (i = 0; flagtab[i].name; i++) {
            if (strlen(flagtab[i].name) == n &&
-               strncmp(flagtab[i].name, p, n) == 0)
+               STRNCMP(flagtab[i].name, ==, p, n))
              goto found;
          }
          die(EXIT_FAILURE, "unknown flag `%.*s'", (int)n, p);
@@ -214,7 +216,7 @@ int main(int argc, char *argv[])
 
   for (cc = cctab;; cc++) {
     if (!*cc) die(EXIT_FAILURE, "unknown codec `%s'", *argv);
-    else if (strcmp(*argv, (*cc)->name) == 0) break;
+    else if (STRCMP(*argv, ==, (*cc)->name)) break;
   }
   argv++; argc--;
 
@@ -266,7 +268,7 @@ int main(int argc, char *argv[])
   if (!argc)
     code(c, "<stdin>", stdin, ofp);
   else for (i = 0; i < argc; i++) {
-    if (strcmp(argv[i], "-") == 0)
+    if (STRCMP(argv[i], ==, "-"))
       code(c, "<stdin>", stdin, ofp);
     else if ((ifp = fopen(argv[i], imode)) == 0) {
       die(EXIT_FAILURE, "couldn't open `%s' for reading: %s",