seq_nameok(): Distinguish three identical error messages.

[nmh] / sbr / folder_addmsg.c

diff --git a/sbr/folder_addmsg.c b/sbr/folder_addmsg.c
index 806cf929e796641dcbc9dff2b3eaf4dcf941b5b3..a18f1ce74d4659d13bb3f4f5471f28ca04bc2f16 100644 (file)
--- a/sbr/folder_addmsg.c
+++ b/sbr/folder_addmsg.c
@@ -1,13 +1,18 @@
-
-/*
- * folder_addmsg.c -- Link message into folder
+/* folder_addmsg.c -- Link message into folder
  *
  * 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/mh.h"
+#include "m_name.h"
+#include "cpydata.h"
+#include "m_atoi.h"
+#include "ext_hook.h"
+#include "folder_realloc.h"
+#include "folder_addmsg.h"
+#include "error.h"
 #include <fcntl.h>
 
 /*
@@ -52,13 +57,13 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
          */
        if (msgnum > mp->hghoff) {
            if (!(mp = folder_realloc (mp, mp->lowoff, msgnum + 100))) {
-               advise (NULL, "unable to allocate folder storage");
+               inform("unable to allocate folder storage");
                return -1;
             }
             *mpp = mp;
        } else if (msgnum < mp->lowoff) {
            if (!(mp = folder_realloc (mp, msgnum, mp->hghoff))) {
-               advise (NULL, "unable to allocate folder storage");
+               inform("unable to allocate folder storage");
                return -1;
             }
             *mpp = mp;
@@ -165,7 +170,7 @@ folder_addmsg (struct msgs **mpp, char *msgfile, int selected,
          */
         if (linkerr == EXDEV  ||  linkerr == EPERM) {
             if (stat (newmsg, &st1) == 0) {
-                advise (NULL, "message %s:%s already exists", mp->foldpath, newmsg);
+                inform("message %s:%s already exists", mp->foldpath, newmsg);
                 return -1;
             }