mhshow/test-charset: Use octal, not hex, in printf(1) format string.

[nmh] / uip / ap.c

diff --git a/uip/ap.c b/uip/ap.c
index 930d0ad4c70e2b7bfea08fe83daec08d2e65805d..0e3e8b554ae65f0df56be6f29935e9ab561da72f 100644 (file)
--- a/uip/ap.c
+++ b/uip/ap.c
@@ -9,7 +9,9 @@
 #include <h/addrsbr.h>
 #include <h/fmt_scan.h>
 #include <h/mts.h>
+#include "h/done.h"
 #include <h/utils.h>
+#include "sbr/terminal.h"
 
 #define        NADDRS  100
 
@@ -95,8 +97,7 @@ main (int argc, char **argv)
        }
        if (addrp == NADDRS)
            adios (NULL, "more than %d addresses", NADDRS);
-       else
-           addrs[addrp++] = cp;
+        addrs[addrp++] = cp;
     }
     addrs[addrp] = NULL;
 
@@ -128,7 +129,7 @@ main (int argc, char **argv)
        status += process (addrs[addrp], width);
 
     fmt_free (fmt, 1);
-    done (status);
+    done(!!status);
     return 1;
 }
 
@@ -171,13 +172,13 @@ process (char *arg, int length)
 
        cptr = fmt_findcomp ("text");
        if (cptr) {
-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);
            cptr->c_text = p->pq_text;
            p->pq_text = NULL;
        }
        cptr = fmt_findcomp ("error");
        if (cptr) {
-            mh_xfree(cptr->c_text);
+            free(cptr->c_text);
            cptr->c_text = p->pq_error;
            p->pq_error = NULL;
        }
@@ -186,8 +187,8 @@ process (char *arg, int length)
        fputs (charstring_buffer (scanl), stdout);
        charstring_free (scanl);
 
-        mh_xfree(p->pq_text);
-        mh_xfree(p->pq_error);
+        free(p->pq_text);
+        free(p->pq_error);
        q = p->pq_next;
        free(p);
     }