Added context_find_prefix().

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 02feefaa445765d10c19946004b485cf5f9bb36f..a11f1b7da665f3883324d75d46fe44624dae699f 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -337,7 +337,8 @@ try_it_again:
            adios (drft, "unable to stat");
        printf ("Draft \"%s\" exists (%ld bytes).", drft, (long) st.st_size);
        for (i = LISTDSW; i != YESW;) {
-           if (!(argp = getans ("\nDisposition? ", isdf ? aqrunl : aqrul)))
+           if (!(argp = read_switch_multiword ("\nDisposition? ",
+                                               isdf ? aqrunl : aqrul)))
                done (1);
            switch (i = smatch (*argp, isdf ? aqrunl : aqrul)) {
                case NOSW: 
@@ -371,18 +372,21 @@ try_it_again:
     if ((out = creat (drft, m_gmprot ())) == NOTOK)
        adios (drft, "unable to create");
     if (cp) {
-       char *scanl;
+       charstring_t scanl;
 
        i = format_len + 1024;
-       scanl = mh_xmalloc((size_t) i + 2);
+       scanl = charstring_create (i + 2);
        dat[0] = 0;
        dat[1] = 0;
        dat[2] = 0;
        dat[3] = outputlinelen;
        dat[4] = 0;
-       fmt_scan(fmt, scanl, i + 1, i, dat, NULL);
-       write(out, scanl, strlen(scanl));
-       free(scanl);
+       fmt_scan(fmt, scanl, i, dat, NULL);
+       if (write(out, charstring_buffer (scanl),
+                 charstring_bytes (scanl)) < 0) {
+           advise (drft, "write");
+       }
+       charstring_free(scanl);
     } else {
        cpydata (in, out, form, drft);
        close (in);