getpass.c: Move interface to own file.

[nmh] / uip / refile.c

diff --git a/uip/refile.c b/uip/refile.c
index 84ef6f0bb234629d19ad786d3ab0e35a1cb76c6c..eb63c9a518fff0ec70469390f38fff76055ea750 100644 (file)
--- a/uip/refile.c
+++ b/uip/refile.c
@@ -6,10 +6,29 @@
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
-#include "../sbr/m_maildir.h"
-#include "../sbr/m_mktemp.h"
+#include "h/mh.h"
+#include "sbr/m_draft.h"
+#include "sbr/m_convert.h"
+#include "sbr/getfolder.h"
+#include "sbr/folder_read.h"
+#include "sbr/folder_free.h"
+#include "sbr/folder_delmsgs.h"
+#include "sbr/folder_addmsg.h"
+#include "sbr/context_save.h"
+#include "sbr/context_replace.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/seq_getnum.h"
+#include "sbr/seq_add.h"
+#include "sbr/arglist.h"
+#include "sbr/error.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+#include "sbr/m_mktemp.h"
 #include <fcntl.h>
 
 #define REFILE_SWITCHES \
@@ -57,8 +76,12 @@ static void copy_seqs (struct msgs *, int, struct msgs *, int);
 int
 main (int argc, char **argv)
 {
-    int linkf = 0, preserve = 0, retainseqs = 0, filep = 0;
-    int foldp = 0, isdf = 0, unlink_msgs = 0;
+    bool linkf = false;
+    bool preserve = false;
+    bool retainseqs = false;
+    int filep = 0;
+    int foldp = 0, isdf = 0;
+    bool unlink_msgs = false;
     int i, msgnum;
     char *cp, *folder = NULL, buf[BUFSIZ];
     char **argp, **arguments;
@@ -68,7 +91,7 @@ main (int argc, char **argv)
     struct msgs_array msgs = { 0, 0, NULL };
     struct msgs *mp;
 
-    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;
@@ -83,7 +106,7 @@ main (int argc, char **argv)
                ambigsw (cp, switches);
                done (1);
            case UNKWNSW:
-               adios (NULL, "-%s unknown\n", cp);
+               die("-%s unknown\n", cp);
 
            case HELPSW:
                snprintf (buf, sizeof(buf), "%s [msgs] [switches] +folder ...",
@@ -95,58 +118,58 @@ main (int argc, char **argv)
                done (0);
 
            case LINKSW:
-               linkf++;
+               linkf = true;
                continue;
            case NLINKSW:
-               linkf = 0;
+               linkf = false;
                continue;
 
            case PRESSW:
-               preserve++;
+               preserve = true;
                continue;
            case NPRESSW:
-               preserve = 0;
+               preserve = false;
                continue;
 
            case RETAINSEQSSW:
-               retainseqs = 1;
+               retainseqs = true;
                continue;
            case NRETAINSEQSSW:
-               retainseqs = 0;
+               retainseqs = false;
                continue;
 
            case UNLINKSW:
-               unlink_msgs++;
+               unlink_msgs = true;
                continue;
            case NUNLINKSW:
-               unlink_msgs = 0;
+               unlink_msgs = false;
                continue;
 
            case SRCSW:
                if (folder)
-                   adios (NULL, "only one source folder at a time!");
+                   die("only one source folder at a time!");
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                folder = path (*cp == '+' || *cp == '@' ? cp + 1 : cp,
                               *cp != '@' ? TFOLDER : TSUBCWF);
                continue;
            case DRAFTSW:
                if (filep > NFOLDERS)
-                   adios (NULL, "only %d files allowed!", NFOLDERS);
+                   die("only %d files allowed!", NFOLDERS);
                isdf = 0;
-               files[filep++] = getcpy (m_draft (NULL, NULL, 1, &isdf));
+               files[filep++] = mh_xstrdup(m_draft(NULL, NULL, 1, &isdf));
                continue;
            case FILESW:
                if (filep > NFOLDERS)
-                   adios (NULL, "only %d files allowed!", NFOLDERS);
+                   die("only %d files allowed!", NFOLDERS);
                if (!(cp = *argp++) || *cp == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                files[filep++] = path (cp, TFILE);
                continue;
 
            case RPROCSW:
                if (!(rmmproc = *argp++) || *rmmproc == '-')
-                   adios (NULL, "missing argument to %s", argp[-2]);
+                   die("missing argument to %s", argp[-2]);
                continue;
            case NRPRCSW:
                rmmproc = NULL;
@@ -155,7 +178,7 @@ main (int argc, char **argv)
        }
        if (*cp == '+' || *cp == '@') {
            if (foldp > NFOLDERS)
-               adios (NULL, "only %d folders allowed!", NFOLDERS);
+               die("only %d folders allowed!", NFOLDERS);
            folders[foldp++].f_name =
                pluspath (cp);
        } else
@@ -165,14 +188,14 @@ main (int argc, char **argv)
     if (!context_find ("path"))
        free (path ("./", TFOLDER));
     if (foldp == 0)
-       adios (NULL, "no folder specified");
+       die("no folder specified");
 
     /*
      * We are refiling a file to the folders
      */
     if (filep > 0) {
        if (folder || msgs.size)
-           adios (NULL, "use -file or some messages, not both");
+           die("use -file or some messages, not both");
        opnfolds (NULL, folders, foldp);
        for (i = 0; i < filep; i++)
            if (m_file (0, files[i], 0, folders, foldp, preserve, 0))
@@ -194,11 +217,11 @@ main (int argc, char **argv)
 
     /* read source 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)
-       adios (NULL, "no messages in %s", folder);
+       die("no messages in %s", folder);
 
     /* parse the message range/sequence/name and set SELECTED */
     for (msgnum = 0; msgnum < msgs.size; msgnum++)
@@ -295,7 +318,7 @@ opnfolds (struct msgs *src_folder, struct st_fold *folders, int nfolders)
            if (chdir (nmaildir) == NOTOK)
                adios (nmaildir, "unable to change directory to");
            if (!(mp = folder_read (fp->f_name, 1)))
-               adios (NULL, "unable to read folder %s", fp->f_name);
+               die("unable to read folder %s", fp->f_name);
            mp->curmsg = 0;
 
            fp->f_mp = mp;