Make sure we return the descriptor from the file handle. Noted by

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 2f7da4166c36466e0623891c5b54c0f7d978b123..ae87209fd343a80db91a9028d7f8b4e846091da6 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -1,6 +1,4 @@
-
-/*
- * comp.c -- compose a message
+/* comp.c -- compose a message

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -10,6 +8,7 @@
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>
 #include <h/mh.h>
 #include <h/utils.h>
 #include <h/fmt_scan.h>

+#include "../sbr/m_maildir.h"

 #include <fcntl.h>
 
 #define COMP_SWITCHES \
 #include <fcntl.h>
 
 #define COMP_SWITCHES \


@@ -31,7 +30,7 @@
     X("cc address", 0, CCSW) \
     X("from address", 0, FROMSW) \
     X("fcc mailbox", 0, FCCSW) \
     X("cc address", 0, CCSW) \
     X("from address", 0, FROMSW) \
     X("fcc mailbox", 0, FCCSW) \

-    X("width colums", 0, WIDTHSW) \
+    X("width columns", 0, WIDTHSW) \

     X("subject text", 0, SUBJECTSW) \
 
 #define X(sw, minchars, id) id,
     X("subject text", 0, SUBJECTSW) \
 
 #define X(sw, minchars, id) id,


@@ -123,7 +122,7 @@ main (int argc, char **argv)
 
                case BILDSW:
                    build++;
 
                case BILDSW:
                    build++;

-                   /* fall through */
+                   /* FALLTHRU */

                case NWHATSW: 
                    nwhat++;
                    continue;
                case NWHATSW: 
                    nwhat++;
                    continue;


@@ -192,8 +191,7 @@ main (int argc, char **argv)
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);

-                   if (dp)
-                       free(dp);
+                    mh_xfree(dp);

                    continue;
 
                case WIDTHSW:
                    continue;
 
                case WIDTHSW:


@@ -223,7 +221,7 @@ main (int argc, char **argv)
        }
     }
 
        }
     }
 

-    cwd = getcpy (pwd ());
+    cwd = mh_xstrdup(pwd ());

 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
 
     if (!context_find ("path"))
        free (path ("./", TFOLDER));


@@ -271,7 +269,7 @@ main (int argc, char **argv)
        if (mp->numsel > 1)
            adios (NULL, "only one message at a time!");
 
        if (mp->numsel > 1)
            adios (NULL, "only one message at a time!");
 

-       if ((in = open (form = getcpy (m_name (mp->lowsel)), O_RDONLY)) == NOTOK)
+       if ((in = open (form = mh_xstrdup(m_name (mp->lowsel)), O_RDONLY)) == NOTOK)

            adios (form, "unable to open message");
     } else {
        struct comp *cptr;
            adios (form, "unable to open message");
     } else {
        struct comp *cptr;


@@ -337,7 +335,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;) {
            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: 
                done (1);
            switch (i = smatch (*argp, isdf ? aqrunl : aqrul)) {
                case NOSW: 


@@ -359,7 +358,7 @@ try_it_again:
                        i = YESW;
                    break;
                default: 
                        i = YESW;
                    break;
                default: 

-                   advise (NULL, "say what?");
+                   inform("say what?");

                    break;
            }
        }
                    break;
            }
        }


@@ -381,7 +380,10 @@ try_it_again:
        dat[3] = outputlinelen;
        dat[4] = 0;
        fmt_scan(fmt, scanl, i, dat, NULL);
        dat[3] = outputlinelen;
        dat[4] = 0;
        fmt_scan(fmt, scanl, i, dat, NULL);

-       write(out, charstring_buffer (scanl), charstring_bytes (scanl));
+       if (write(out, charstring_buffer (scanl),
+                 charstring_bytes (scanl)) < 0) {
+           advise (drft, "write");
+       }

        charstring_free(scanl);
     } else {
        cpydata (in, out, form, drft);
        charstring_free(scanl);
     } else {
        cpydata (in, out, form, drft);


@@ -394,7 +396,7 @@ edit_it:
 
     if (nwhat)
        done (0);
 
     if (nwhat)
        done (0);

-    what_now (ed, nedit, use, drft, NULL, 0, NULLMP, NULL, 0, cwd, 0);
+    what_now (ed, nedit, use, drft, NULL, 0, NULL, NULL, 0, cwd, 0);

     done (1);
     return 1;
 }
     done (1);
     return 1;
 }