X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/18f7f9774c77d7b02268dbac58238964fc26c5a5..b3d4a4452c332fc3550db3fbdf9e02027b41e985:/sbr/folder_delmsgs.c?ds=sidebyside

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 94aa29ce..f9d7f591 100644
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -1,14 +1,15 @@
-
-/*
- * folder_delmsgs.c -- "remove" SELECTED messages from a folder
+/* folder_delmsgs.c -- "remove" SELECTED messages from a 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/utils.h>
+#include "h/mh.h"
+#include "arglist.h"
+#include "error.h"
+#include "h/utils.h"
+#include "m_mktemp.h"
 
 /*
  * 1) If we are using an external rmmproc, then exec it.
@@ -61,7 +62,7 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
 	    if (is_selected (mp, msgnum) &&
 		!(vec[vecp++] = strdup (m_name (msgnum))))
-		adios (NULL, "strdup failed");
+		die("strdup failed");
 	}
 	vec[vecp] = NULL;
 
@@ -76,11 +77,11 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 	    execvp (prog, vec);
 	    fprintf (stderr, "unable to exec ");
 	    perror (rmmproc);
-	    _exit (-1);
+	    _exit(1);
 
 	default:
 	    arglist_free(prog, vec);
-	    return (pidwait (pid, -1));
+	    return pidwait(pid, -1);
 	}
     }
 
@@ -133,7 +134,7 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
 
     /* Sanity check */
     if (mp->numsel != 0)
-	adios (NULL, "oops, mp->numsel should be 0");
+	die("oops, mp->numsel should be 0");
 
     /* Mark that the sequence information has changed */
     mp->msgflags |= SEQMOD;