Removed a few #ifndef JLR/#endif pairs because they're not needed.

[mmh] / sbr / folder_delmsgs.c

diff --git a/sbr/folder_delmsgs.c b/sbr/folder_delmsgs.c
index 4567f6d..c1416a6 100644 (file)
--- a/sbr/folder_delmsgs.c
+++ b/sbr/folder_delmsgs.c
@@ -2,8 +2,6 @@
 /*
  * folder_delmsgs.c -- "remove" SELECTED messages from a folder
  *
- * $Id$
- *
  * 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.
@@ -42,9 +40,6 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
        /* Mark that the sequence information has changed */
        mp->msgflags |= SEQMOD;
 
-       if (mp->numsel > MAXARGS - 2)
-           adios (NULL, "more than %d messages for %s exec", MAXARGS - 2,
-                  rmmproc);
        vec = (char **) calloc ((size_t) (mp->numsel + 2), sizeof(*vec));
        if (vec == NULL)
            adios (NULL, "unable to allocate exec vector");
@@ -93,7 +88,7 @@ folder_delmsgs (struct msgs *mp, int unlink_msgs, int nohook)
             */
 
            if (!nohook) {
-                   (void)snprintf(msgpath, sizeof (msgpath), "%s/%d", getcwd(msgpath, sizeof (msgpath)), msgnum);
+                   (void)snprintf(msgpath, sizeof (msgpath), "%s/%d", mp->foldpath, msgnum);
                    (void)ext_hook("del-hook", msgpath, (char *)0);
                }