repl.c, replsbr.c: Move shared data into header file.

[nmh] / uip / new.c

diff --git a/uip/new.c b/uip/new.c
index 88d66ba1bd06a69ac0252cabd7de7c1fb6c2c629..d6f524a2651890ee88beb0cb828dc0305c8444d0 100644 (file)
--- a/uip/new.c
+++ b/uip/new.c
@@ -13,6 +13,7 @@
 
 #include <h/mh.h>
 #include <h/crawl_folders.h>
 
 #include <h/mh.h>
 #include <h/crawl_folders.h>

+#include "h/done.h"

 #include <h/utils.h>
 #include "sbr/lock_file.h"
 #include "sbr/m_maildir.h"
 #include <h/utils.h>
 #include "sbr/lock_file.h"
 #include "sbr/m_maildir.h"


@@ -175,14 +176,14 @@ get_msgnums(char *folder, char *sequences[])
                 continue;
 
             case BODY:
                 continue;
 
             case BODY:

-                adios (NULL, "no blank lines are permitted in %s", seqfile);
+                die("no blank lines are permitted in %s", seqfile);

                 break;
 
             case FILEEOF:
                 break;
 
             default:
                 break;
 
             case FILEEOF:
                 break;
 
             default:

-                adios (NULL, "%s is poorly formatted", seqfile);
+                die("%s is poorly formatted", seqfile);

         }
         break;  /* break from for loop */
     }
         }
         break;  /* break from for loop */
     }


@@ -273,7 +274,7 @@ check_folders(struct node **first, struct node **last,
     } else {
        fp = fopen(folders, "r");
        if (fp  == NULL) {
     } else {
        fp = fopen(folders, "r");
        if (fp  == NULL) {

-           adios(NULL, "failed to read %s", folders);
+           die("failed to read %s", folders);

        }
        while (vfgets(fp, &line) == OK) {
            len = strlen(line) - 1;
        }
        while (vfgets(fp, &line) == OK) {
            len = strlen(line) - 1;


@@ -370,10 +371,9 @@ doit(char *cur, char *folders, char *sequences[])
                 /* Found current folder in fprev mode; if we have a
                  * previous node in the list, return it; else return
                  * the last node. */
                 /* Found current folder in fprev mode; if we have a
                  * previous node in the list, return it; else return
                  * the last node. */

-                if (prev == NULL) {
-                    return last;
-                }
-                return prev;
+                if (prev)
+                    return prev;
+                return last;

             }
         } else if (run_mode == RM_UNSEEN) {
             int status;
             }
         } else if (run_mode == RM_UNSEEN) {
             int status;


@@ -444,7 +444,7 @@ main(int argc, char **argv)
     char *unseen;
     struct node *folder;
 
     char *unseen;
     struct node *folder;
 

-    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;


@@ -459,7 +459,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 (help, sizeof(help), "%s [switches] [sequences]",
 
            case HELPSW:
                snprintf (help, sizeof(help), "%s [switches] [sequences]",


@@ -472,11 +472,11 @@ main(int argc, char **argv)
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')
 
            case FOLDERSSW:
                if (!(folders = *argp++) || *folders == '-')

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

                continue;
            case MODESW:
                if (!(invo_name = *argp++) || *invo_name == '-')
                continue;
            case MODESW:
                if (!(invo_name = *argp++) || *invo_name == '-')

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

                invo_name = r1bindex(invo_name, '/');
                continue;
            }
                invo_name = r1bindex(invo_name, '/');
                continue;
            }


@@ -508,7 +508,7 @@ main(int argc, char **argv)
        /* no sequence arguments; use unseen */
        unseen = context_find(usequence);
        if (unseen == NULL || unseen[0] == '\0') {
        /* no sequence arguments; use unseen */
        unseen = context_find(usequence);
        if (unseen == NULL || unseen[0] == '\0') {

-           adios(NULL, "must specify sequences or set %s", usequence);
+           die("must specify sequences or set %s", usequence);

        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
            svector_push_back (sequences, *ap);
        }
        for (ap = brkstring(unseen, " ", "\n"); *ap; ap++) {
            svector_push_back (sequences, *ap);