man: Use `.B' instead of `.BR' when only one argument.

[nmh] / uip / comp.c

diff --git a/uip/comp.c b/uip/comp.c
index 13d73c1bc27c2b201f83e2188c5cd0045004f467..00aa1c2c7c3ba5daa8cf7061d19632676301b2f3 100644 (file)
--- a/uip/comp.c
+++ b/uip/comp.c
@@ -1,15 +1,39 @@
-
-/*
- * 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
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/utils.h>
-#include <h/fmt_scan.h>
+#include "h/mh.h"
+#include "sbr/fmt_new.h"
+#include "whatnowproc.h"
+#include "sbr/m_name.h"
+#include "sbr/m_gmprot.h"
+#include "sbr/getarguments.h"
+#include "sbr/read_switch_multiword.h"
+#include "sbr/seq_setprev.h"
+#include "sbr/seq_save.h"
+#include "sbr/showfile.h"
+#include "sbr/smatch.h"
+#include "sbr/refile.h"
+#include "sbr/cpydata.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/fdcompare.h"
+#include "sbr/folder_read.h"
+#include "sbr/context_save.h"
+#include "sbr/context_find.h"
+#include "sbr/ambigsw.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/fmt_scan.h"
+#include "h/done.h"
+#include "sbr/m_maildir.h"

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


@@ -31,7 +55,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,


@@ -70,7 +94,10 @@ static struct swit aqrul[] = {
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

-    int use = NOUSE, nedit = 0, nwhat = 0, build = 0;
+    int use = NOUSE;
+    bool nedit = false;
+    bool nwhat = false;
+    bool build = false;

     int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
     int outputlinelen = OUTPUTLINELEN;
     char *cp, *cwd, *maildir, *dfolder = NULL;
     int i, in = NOTOK, isdf = 0, out, dat[5], format_len = 0;
     int outputlinelen = OUTPUTLINELEN;
     char *cp, *cwd, *maildir, *dfolder = NULL;


@@ -83,7 +110,7 @@ main (int argc, char **argv)
     struct format *fmt;
     struct stat st;
 
     struct format *fmt;
     struct stat st;
 

-    if (nmh_init(argv[0], 1)) { return 1; }
+    if (nmh_init(argv[0], true, true)) { return 1; }

 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;
 
     arguments = getarguments (invo_name, argc, argv, 1);
     argp = arguments;


@@ -95,7 +122,7 @@ main (int argc, char **argv)
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 
                    ambigsw (cp, switches);
                    done (1);
                case UNKWNSW: 

-                   adios (NULL, "-%s unknown", cp);
+                   die("-%s unknown", cp);

 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",
 
                case HELPSW: 
                    snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]",


@@ -108,29 +135,29 @@ main (int argc, char **argv)
 
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')
 
                case EDITRSW: 
                    if (!(ed = *argp++) || *ed == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   nedit = 0;
+                       die("missing argument to %s", argp[-2]);
+                   nedit = false;

                    continue;
                case NEDITSW: 
                    continue;
                case NEDITSW: 

-                   nedit++;
+                   nedit = true;

                    continue;
 
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')
                    continue;
 
                case WHATSW: 
                    if (!(whatnowproc = *argp++) || *whatnowproc == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
-                   nwhat = 0;
+                       die("missing argument to %s", argp[-2]);
+                   nwhat = false;

                    continue;
 
                case BILDSW:
                    continue;
 
                case BILDSW:

-                   build++;
-                   /* fall through */
+                   build = true;
+                   /* FALLTHRU */

                case NWHATSW: 
                case NWHATSW: 

-                   nwhat++;
+                   nwhat = true;

                    continue;
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')
                    continue;
 
                case FORMSW: 
                    if (!(form = *argp++) || *form == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
 
                case USESW: 
                    continue;
 
                case USESW: 


@@ -142,25 +169,25 @@ main (int argc, char **argv)
 
                case FILESW:    /* compatibility */
                    if (file)
 
                case FILESW:    /* compatibility */
                    if (file)

-                       adios (NULL, "only one file at a time!");
+                       die("only one file at a time!");

                    if (!(file = *argp++) || *file == '-')
                    if (!(file = *argp++) || *file == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    isdf = NOTOK;
                    continue;
 
                case DFOLDSW: 
                    if (dfolder)
                    isdf = NOTOK;
                    continue;
 
                case DFOLDSW: 
                    if (dfolder)

-                       adios (NULL, "only one draft folder at a time!");
+                       die("only one draft folder at a time!");

                    if (!(cp = *argp++) || *cp == '-')
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                            *cp != '@' ? TFOLDER : TSUBCWF);
                    continue;
                case DMSGSW: 
                    if (file)
                    dfolder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                            *cp != '@' ? TFOLDER : TSUBCWF);
                    continue;
                case DMSGSW: 
                    if (file)

-                       adios (NULL, "only one draft message at a time!");
+                       die("only one draft message at a time!");

                    if (!(file = *argp++) || *file == '-')
                    if (!(file = *argp++) || *file == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    continue;
                case NDFLDSW: 
                    dfolder = NULL;
                    continue;
                case NDFLDSW: 
                    dfolder = NULL;


@@ -169,61 +196,58 @@ main (int argc, char **argv)
 
                case TOSW:
                    if (!(cp = *argp++) || *cp == '-')
 
                case TOSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    to = addlist(to, cp);
                    continue;
 
                case CCSW:
                    if (!(cp = *argp++) || *cp == '-')
                    to = addlist(to, cp);
                    continue;
 
                case CCSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    cc = addlist(cc, cp);
                    continue;
 
                case FROMSW:
                    if (!(cp = *argp++) || *cp == '-')
                    cc = addlist(cc, cp);
                    continue;
 
                case FROMSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    from = addlist(from, cp);
                    continue;
 
                case FCCSW:
                    if (!(cp = *argp++) || *cp == '-')
                    from = addlist(from, cp);
                    continue;
 
                case FCCSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    dp = NULL;
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);
                    dp = NULL;
                    if (*cp == '@')
                        cp = dp = path(cp + 1, TSUBCWF);
                    fcc = addlist(fcc, cp);

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

                    continue;
 
                case WIDTHSW:
                    if (!(cp = *argp++) || *cp == '-')
                    continue;
 
                case WIDTHSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    if ((outputlinelen = atoi(cp)) < 10)
                    if ((outputlinelen = atoi(cp)) < 10)

-                       adios (NULL, "impossible width %d", outputlinelen);
+                       die("impossible width %d", outputlinelen);

                    continue;
 
                case SUBJECTSW:
                    if (!(cp = *argp++) || *cp == '-')
                    continue;
 
                case SUBJECTSW:
                    if (!(cp = *argp++) || *cp == '-')

-                       adios (NULL, "missing argument to %s", argp[-2]);
+                       die("missing argument to %s", argp[-2]);

                    subject = cp;
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)
                    subject = cp;
                    continue;
            }
        }
        if (*cp == '+' || *cp == '@') {
            if (folder)

-               adios (NULL, "only one folder at a time!");
-           else
-               folder = pluspath (cp);
+               die("only one folder at a time!");
+            folder = pluspath (cp);

        } else {
            if (msg)
        } else {
            if (msg)

-               adios (NULL, "only one message at a time!");
-           else
-               msg = cp;
+               die("only one message at a time!");
+            msg = cp;

        }
     }
 
        }
     }
 

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

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


@@ -237,7 +261,7 @@ main (int argc, char **argv)
        msg = NULL;
     }
     if (form && (folder || msg))
        msg = NULL;
     }
     if (form && (folder || msg))

-           adios (NULL, "can't mix forms and folders/msgs");
+           die("can't mix forms and folders/msgs");

 
     cp = NULL;
 
 
     cp = NULL;
 


@@ -256,11 +280,11 @@ main (int argc, char **argv)
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))
 
        /* read folder and create message structure */
        if (!(mp = folder_read (folder, 1)))

-           adios (NULL, "unable to read folder %s", folder);
+           die("unable to read folder %s", folder);

 
        /* check for empty folder */
        if (mp->nummsg == 0)
 
        /* check for empty folder */
        if (mp->nummsg == 0)

-           adios (NULL, "no messages in %s", folder);
+           die("no messages in %s", folder);

 
        /* parse the message range/sequence/name and set SELECTED */
        if (!m_convert (mp, msg))
 
        /* parse the message range/sequence/name and set SELECTED */
        if (!m_convert (mp, msg))


@@ -269,9 +293,9 @@ main (int argc, char **argv)
        seq_save (mp);
 
        if (mp->numsel > 1)
        seq_save (mp);
 
        if (mp->numsel > 1)

-           adios (NULL, "only one message at a time!");
+           die("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 +361,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 +384,7 @@ try_it_again:
                        i = YESW;
                    break;
                default: 
                        i = YESW;
                    break;
                default: 

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

                    break;
            }
        }
                    break;
            }
        }


@@ -397,7 +422,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;
 }