pending-release-notes: add mhshow's "-prefer", and mh-format's %(kibi/kilo)

[nmh] / uip / rcvdist.c

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 4f7a83f7b30635993d17e9eadc97ea900364891e..6d144be18006f561ce29c2e3fd39a02ddb5132ed 100644 (file)
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -48,15 +48,9 @@ main (int argc, char **argv)
     FILE *fp;
     char *tfile = NULL;
 
-    done=unlink_done;
-
-#ifdef LOCALE
-    setlocale(LC_ALL, "");
-#endif
-    invo_name = r1bindex (argv[0], '/');
+    if (nmh_init(argv[0], 1)) { return 1; }
 
-    /* read user profile/context */
-    context_read();
+    done=unlink_done;
 
     /*
      * Configure this now, since any unknown switches to rcvdist get
@@ -181,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;
@@ -240,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);
 }
 
@@ -259,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);
 }