Newer versions of Automake want to include the test-driver script,

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index a87a5e84d324773b239cb19c908b26a666c2cf09..ae55f61360dd20af8c68c7d4e77f1e19544b93ff 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -118,11 +118,11 @@ main (int argc, char **argv)
        done (1);
 
     vec[vecp++] = "-dist";
-    vec[vecp++] = drft;
     if ((cp = context_find ("mhlproc"))) {
       vec[vecp++] = "-mhlproc";
       vec[vecp++] = cp;
     }
+    vec[vecp++] = drft;
     vec[vecp] = NULL;
 
     for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
@@ -175,7 +175,8 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 {
     register int char_read = 0, format_len, i, state;
     register char **ap;
-    char *cp, *scanl, name[NAMESZ], tmpbuf[SBUFSIZ];
+    char *cp, name[NAMESZ], tmpbuf[SBUFSIZ];
+    charstring_t scanl;
     register struct comp *cptr;
     FILE *out;
     m_getfld_state_t gstate = 0;
@@ -234,17 +235,17 @@ finished: ;
     m_getfld_state_destroy (&gstate);
 
     i = format_len + char_read + 256;
-    scanl = mh_xmalloc ((size_t) i + 2);
+    scanl = charstring_create (i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
-    fmt_scan (fmt, scanl, i + 1, i, dat, NULL);
-    fputs (scanl, out);
+    fmt_scan (fmt, scanl, i, dat, NULL);
+    fputs (charstring_buffer (scanl), out);
 
     if (ferror (out))
        adios (drft, "error writing");
     fclose (out);
 
-    free (scanl);
+    charstring_free (scanl);
     fmt_free(fmt, 1);
 }
 
@@ -253,11 +254,11 @@ static void
 unlink_done (int status)
 {
     if (backup[0])
-       unlink (backup);
+       (void) m_unlink (backup);
     if (drft[0])
-       unlink (drft);
+       (void) m_unlink (drft);
     if (tmpfil[0])
-       unlink (tmpfil);
+       (void) m_unlink (tmpfil);
 
     exit (status ? RCV_MBX : RCV_MOK);
 }