showfile.c: Move interface to own file.

[nmh] / uip / dropsbr.c

diff --git a/uip/dropsbr.c b/uip/dropsbr.c
index 3bd5c9beeefc905c2430f1e0efd45a6bdd269592..733e6e6e4701681d4bdb5873b8e78e85cc2d0da5 100644 (file)
--- a/uip/dropsbr.c
+++ b/uip/dropsbr.c
@@ -1,31 +1,20 @@
-
-/*
- * dropsbr.c -- create/read/manipulate mail drops
+/* dropsbr.c -- create/read/manipulate mail drops

  *
  * 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.
  */
 
  *
  * 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/nmh.h>
-#include <h/utils.h>
-
-#include <h/mh.h>
-#include <h/dropsbr.h>
-#include <h/mts.h>
-#include <h/tws.h>
-
-#ifdef HAVE_ERRNO_H
-# include <errno.h>
-#endif
-
-#ifdef NTOHLSWAP
-# include <netinet/in.h>
-#else
-# undef ntohl
-# define ntohl(n) (n)
-#endif
-
+#include "h/nmh.h"
+#include "h/mh.h"
+#include "sbr/strindex.h"
+#include "sbr/error.h"
+#include "h/utils.h"
+#include "h/dropsbr.h"
+#include "h/mts.h"
+#include "h/tws.h"
+#include "sbr/lock_file.h"
+#include "sbr/m_mktemp.h"

 #include <fcntl.h>
 
 /*
 #include <fcntl.h>
 
 /*


@@ -33,7 +22,6 @@
  */
 static int mbx_chk_mbox (int);
 static int mbx_chk_mmdf (int);
  */
 static int mbx_chk_mbox (int);
 static int mbx_chk_mmdf (int);

-static int map_open (char *, int);

 
 
 /*
 
 
 /*


@@ -44,36 +32,24 @@ static int map_open (char *, int);
 int
 mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode)
 {
 int
 mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode)
 {

-    int j, count, fd;
+    int j, count, fd = NOTOK;

     struct stat st;
 
     j = 0;
 
     /* attempt to open and lock file */
     for (count = 4; count > 0; count--) {
     struct stat st;
 
     j = 0;
 
     /* attempt to open and lock file */
     for (count = 4; count > 0; count--) {

-       if ((fd = lkopen (file, O_RDWR | O_CREAT | O_NONBLOCK, mode)) == NOTOK) {
-           switch (errno) {
-#if defined(FCNTL_LOCKING) || defined(LOCKF_LOCKING)
-               case EACCES:
-               case EAGAIN:
-#endif
-
-#ifdef FLOCK_LOCKING
-               case EWOULDBLOCK:
-#endif
-               case ETXTBSY: 
-                   j = errno;
-                   sleep (5);
-                   break;
-
-               default: 
-                   /* just return error */
-                   return NOTOK;
-           }
-       }
+        int failed_to_lock = 0;
+
+       if ((fd = lkopenspool (file, O_RDWR | O_CREAT | O_NONBLOCK,
+            mode, &failed_to_lock)) != NOTOK)
+            break;

 
 

-       /* good file descriptor */
-       break;
+        if (!failed_to_lock)
+            return NOTOK;
+
+        j = errno;
+        sleep (5);

     }
 
     errno = j;
     }
 
     errno = j;


@@ -93,9 +69,13 @@ mbx_open (char *file, int mbx_style, uid_t uid, gid_t gid, mode_t mode)
         * The stat failed.  So we make sure file
         * has right ownership/modes
         */
         * The stat failed.  So we make sure file
         * has right ownership/modes
         */

-       chown (file, uid, gid);
-       chmod (file, mode);
-    } else if (st.st_size > (off_t) 0) {
+       if (chown (file, uid, gid) < 0) {
+           advise (file, "chown");
+       }
+       if (chmod (file, mode) < 0) {
+           advise (file, "chmod");
+       }
+    } else if (st.st_size > 0) {

        int status;
 
        /* check the maildrop */
        int status;
 
        /* check the maildrop */


@@ -129,7 +109,7 @@ static int
 mbx_chk_mbox (int fd)
 {
     /* just seek to the end */
 mbx_chk_mbox (int fd)
 {
     /* just seek to the end */

-    if (lseek (fd, (off_t) 0, SEEK_END) == (off_t) NOTOK)
+    if (lseek(fd, 0, SEEK_END) == (off_t) NOTOK)

        return NOTOK;
 
     return OK;
        return NOTOK;
 
     return OK;


@@ -143,133 +123,22 @@ mbx_chk_mbox (int fd)
 static int
 mbx_chk_mmdf (int fd)
 {
 static int
 mbx_chk_mmdf (int fd)
 {

-    size_t count;
+    ssize_t count;

     char ldelim[BUFSIZ];
 
     char ldelim[BUFSIZ];
 

-    count = strlen (mmdlm2);
+    count = LEN(MMDF_DELIM);

 
 

-    /* casting -count to off_t, seem to break FreeBSD 2.2.6 */
-    if (lseek (fd, (long) (-count), SEEK_END) == (off_t) NOTOK)
+    if (lseek (fd, -count, SEEK_END) == (off_t) NOTOK)

        return NOTOK;
     if (read (fd, ldelim, count) != count)
        return NOTOK;
 
     ldelim[count] = 0;
 
        return NOTOK;
     if (read (fd, ldelim, count) != count)
        return NOTOK;
 
     ldelim[count] = 0;
 

-    if (strcmp (ldelim, mmdlm2)
+    if (strcmp (ldelim, MMDF_DELIM)

            && write (fd, "\n", 1) != 1
            && write (fd, "\n", 1) != 1

-           && write (fd, mmdlm2, count) != count)
-       return NOTOK;
-
-    return OK;
-}
-
-
-int
-mbx_read (FILE *fp, long pos, struct drop **drops, int noisy)
-{
-    register int len, size;
-    register long ld1, ld2;
-    register char *bp;
-    char buffer[BUFSIZ];
-    register struct drop *cp, *dp, *ep, *pp;
-
-    pp = (struct drop *) calloc ((size_t) (len = MAXFOLDER), sizeof(*dp));
-    if (pp == NULL) {
-       if (noisy)
-           admonish (NULL, "unable to allocate drop storage");
-       return NOTOK;
-    }
-
-    ld1 = (long) strlen (mmdlm1);
-    ld2 = (long) strlen (mmdlm2);
-
-    fseek (fp, pos, SEEK_SET);
-    for (ep = (dp = pp) + len - 1; fgets (buffer, sizeof(buffer), fp);) {
-       size = 0;
-       if (strcmp (buffer, mmdlm1) == 0)
-           pos += ld1, dp->d_start = (long) pos;
-       else {
-           dp->d_start = (long)pos , pos += (long) strlen (buffer);
-           for (bp = buffer; *bp; bp++, size++)
-               if (*bp == '\n')
-                   size++;
-       }
-
-       while (fgets (buffer, sizeof(buffer), fp) != NULL)
-           if (strcmp (buffer, mmdlm2) == 0)
-               break;
-           else {
-               pos += (long) strlen (buffer);
-               for (bp = buffer; *bp; bp++, size++)
-                   if (*bp == '\n')
-                       size++;
-           }
-
-       if (dp->d_start != (long) pos) {
-           dp->d_id = 0;
-           dp->d_size = (long) size;
-           dp->d_stop = pos;
-           dp++;
-       }
-       pos += ld2;
-
-       if (dp >= ep) {
-           register int    curlen = dp - pp;
-
-           cp = (struct drop *) mh_xrealloc ((char *) pp,
-                                   (size_t) (len += MAXFOLDER) * sizeof(*pp));
-           dp = cp + curlen, ep = (pp = cp) + len - 1;
-       }
-    }
-
-    if (dp == pp)
-       free ((char *) pp);
-    else
-       *drops = pp;
-    return (dp - pp);
-}
-
-
-int
-mbx_write(char *mailbox, int md, FILE *fp, int id, long last,
-           long pos, off_t stop, int mapping, int noisy)
-{
-    register int i, j, size;
-    off_t start;
-    long off;
-    register char *cp;
-    char buffer[BUFSIZ];
-
-    off = (long) lseek (md, (off_t) 0, SEEK_CUR);
-    j = strlen (mmdlm1);
-    if (write (md, mmdlm1, j) != j)
+           && write (fd, MMDF_DELIM, count) != count)

        return NOTOK;
        return NOTOK;

-    start = lseek (md, (off_t) 0, SEEK_CUR);
-    size = 0;
-
-    fseek (fp, pos, SEEK_SET);
-    while (fgets (buffer, sizeof(buffer), fp) && (pos < stop)) {
-       i = strlen (buffer);
-       for (j = 0; (j = stringdex (mmdlm1, buffer)) >= 0; buffer[j]++)
-           continue;
-       for (j = 0; (j = stringdex (mmdlm2, buffer)) >= 0; buffer[j]++)
-           continue;
-       if (write (md, buffer, i) != i)
-           return NOTOK;
-       pos += (long) i;
-       if (mapping)
-           for (cp = buffer; i-- > 0; size++)
-               if (*cp++ == '\n')
-                   size++;
-    }
-
-    stop = lseek (md, (off_t) 0, SEEK_CUR);
-    j = strlen (mmdlm2);
-    if (write (md, mmdlm2, j) != j)
-       return NOTOK;
-    if (mapping)
-       map_write (mailbox, md, id, last, start, stop, off, size, noisy);

 
     return OK;
 }
 
     return OK;
 }


@@ -281,24 +150,20 @@ mbx_write(char *mailbox, int md, FILE *fp, int id, long last,
 
 int
 mbx_copy (char *mailbox, int mbx_style, int md, int fd,
 
 int
 mbx_copy (char *mailbox, int mbx_style, int md, int fd,

-          int mapping, char *text, int noisy)
+          char *text)

 {
     int i, j, size;
 {
     int i, j, size;

-    off_t start, stop;
-    long pos;
-    char *cp, buffer[BUFSIZ];
+    char *cp, buffer[BUFSIZ + 1];   /* Space for NUL. */

     FILE *fp;
 
     FILE *fp;
 

-    pos = (long) lseek (md, (off_t) 0, SEEK_CUR);

     size = 0;
 
     switch (mbx_style) {
        case MMDF_FORMAT: 
        default: 
     size = 0;
 
     switch (mbx_style) {
        case MMDF_FORMAT: 
        default: 

-           j = strlen (mmdlm1);
-           if (write (md, mmdlm1, j) != j)
+           j = LEN(MMDF_DELIM);
+           if (write (md, MMDF_DELIM, j) != j)

                return NOTOK;
                return NOTOK;

-           start = lseek (md, (off_t) 0, SEEK_CUR);

 
            if (text) {
                i = strlen (text);
 
            if (text) {
                i = strlen (text);


@@ -309,31 +174,22 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                        size++;
            }
                    
                        size++;
            }
                    

-           while ((i = read (fd, buffer, sizeof(buffer))) > 0) {
-               for (j = 0;
-                       (j = stringdex (mmdlm1, buffer)) >= 0;
-                       buffer[j]++)
+           while ((i = read (fd, buffer, sizeof buffer - 1)) > 0) {
+                buffer[i] = '\0';   /* Terminate for stringdex(). */
+
+               for ( ; (j = stringdex (MMDF_DELIM, buffer)) >= 0; buffer[j]++)

                    continue;
                    continue;

-               for (j = 0;
-                       (j = stringdex (mmdlm2, buffer)) >= 0;
-                       buffer[j]++)
+               for ( ; (j = stringdex (MMDF_DELIM, buffer)) >= 0; buffer[j]++)

                    continue;
                if (write (md, buffer, i) != i)
                    return NOTOK;
                    continue;
                if (write (md, buffer, i) != i)
                    return NOTOK;

-               if (mapping)
-                   for (cp = buffer; i-- > 0; size++)
-                       if (*cp++ == '\n')
-                           size++;

            }
 
            }
 

-           stop = lseek (md, (off_t) 0, SEEK_CUR);
-           j = strlen (mmdlm2);
-           if (write (md, mmdlm2, j) != j)
+           j = LEN(MMDF_DELIM);
+           if (write (md, MMDF_DELIM, j) != j)

                return NOTOK;
                return NOTOK;

-           if (mapping)
-               map_write (mailbox, md, 0, (long) 0, start, stop, pos, size, noisy);

 
 

-           return (i != NOTOK ? OK : NOTOK);
+            return i == NOTOK ? NOTOK : OK;

 
        case MBOX_FORMAT:
            if ((j = dup (fd)) == NOTOK)
 
        case MBOX_FORMAT:
            if ((j = dup (fd)) == NOTOK)


@@ -342,7 +198,6 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                close (j);
                return NOTOK;
            }
                close (j);
                return NOTOK;
            }

-           start = lseek (md, (off_t) 0, SEEK_CUR);

 
            /* If text is given, we add it to top of message */
            if (text) {
 
            /* If text is given, we add it to top of message */
            if (text) {


@@ -364,8 +219,8 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                     * Change the "Return-Path:" field (if in first line)
                     * back to "From ".
                     */
                     * Change the "Return-Path:" field (if in first line)
                     * back to "From ".
                     */

-                   if (!strncmp (buffer, "Return-Path:", 12)) {
-                       char tmpbuffer[BUFSIZ];
+                    if (has_prefix(buffer, "Return-Path:")) {
+                       char tmpbuffer[sizeof buffer];

                        char *tp, *ep, *fp;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        char *tp, *ep, *fp;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));


@@ -375,23 +230,23 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                        tp = dctime(dlocaltimenow());
                        snprintf (buffer, sizeof(buffer), "From %.*s  %s",
                                (int)(fp - ep), ep, tp);
                        tp = dctime(dlocaltimenow());
                        snprintf (buffer, sizeof(buffer), "From %.*s  %s",
                                (int)(fp - ep), ep, tp);

-                   } else if (!strncmp (buffer, "X-Envelope-From:", 16)) {
+                   } else if (has_prefix(buffer, "X-Envelope-From:")) {

                        /*
                         * Change the "X-Envelope-From:" field
                         * (if first line) back to "From ".
                         */
                        /*
                         * Change the "X-Envelope-From:" field
                         * (if first line) back to "From ".
                         */

-                       char tmpbuffer[BUFSIZ];
+                       char tmpbuffer[sizeof buffer];

                        char *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        ep = tmpbuffer + 17;
                        snprintf (buffer, sizeof(buffer), "From %s", ep);
                        char *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        ep = tmpbuffer + 17;
                        snprintf (buffer, sizeof(buffer), "From %s", ep);

-                   } else if (strncmp (buffer, "From ", 5)) {
+                   } else if (!has_prefix(buffer, "From ")) {

                        /*
                         * If there is already a "From " line,
                         * then leave it alone.  Else we add one.
                         */
                        /*
                         * If there is already a "From " line,
                         * then leave it alone.  Else we add one.
                         */

-                       char tmpbuffer[BUFSIZ];
+                       char tmpbuffer[sizeof buffer];

                        char *tp, *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));
                        char *tp, *ep;
 
                        strncpy(tmpbuffer, buffer, sizeof(tmpbuffer));


@@ -405,8 +260,10 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                 * If this is not first line, and begins with
                 * "From ", then prepend line with ">".
                 */
                 * If this is not first line, and begins with
                 * "From ", then prepend line with ">".
                 */

-               if (j != 0 && strncmp (buffer, "From ", 5) == 0) {
-                   write (md, ">", 1);
+               if (j != 0 && has_prefix(buffer, "From ")) {
+                   if (write (md, ">", 1) < 0) {
+                       advise (mailbox, "write");
+                   }

                    size++;
                }
                i = strlen (buffer);
                    size++;
                }
                i = strlen (buffer);


@@ -414,52 +271,20 @@ mbx_copy (char *mailbox, int mbx_style, int md, int fd,
                    fclose (fp);
                    return NOTOK;
                }
                    fclose (fp);
                    return NOTOK;
                }

-               if (mapping)
-                   for (cp = buffer; i-- > 0; size++)
-                       if (*cp++ == '\n')
-                           size++;

            }
            if (write (md, "\n", 1) != 1) {
                fclose (fp);
                return NOTOK;
            }
            }
            if (write (md, "\n", 1) != 1) {
                fclose (fp);
                return NOTOK;
            }

-           if (mapping)
-               size += 2;

 
            fclose (fp);
 
            fclose (fp);

-           lseek (fd, (off_t) 0, SEEK_END);
-           stop = lseek (md, (off_t) 0, SEEK_CUR);
-           if (mapping)
-               map_write (mailbox, md, 0, (long) 0, start, stop, pos, size, noisy);
+           lseek(fd, 0, SEEK_END);

 
            return OK;
     }
 }
 
 
 
            return OK;
     }
 }
 
 

-int
-mbx_size (int md, off_t start, off_t stop)
-{
-    register int i, fd;
-    register long pos;
-    register FILE *fp;
-
-    if ((fd = dup (md)) == NOTOK || (fp = fdopen (fd, "r")) == NULL) {
-       if (fd != NOTOK)
-           close (fd);
-       return NOTOK;
-    }
-
-    fseek (fp, start, SEEK_SET);
-    for (i = 0, pos = stop - start; pos-- > 0; i++)
-       if (fgetc (fp) == '\n')
-           i++;
-
-    fclose (fp);
-    return i;
-}
-
-

 /*
  * Close and unlock file/maildrop.
  */
 /*
  * Close and unlock file/maildrop.
  */


@@ -467,250 +292,7 @@ mbx_size (int md, off_t start, off_t stop)
 int
 mbx_close (char *mailbox, int md)
 {
 int
 mbx_close (char *mailbox, int md)
 {

-    lkclose (md, mailbox);
-    return OK;
-}
-
-
-/*
- * This function is performed implicitly by getbbent.c:
- *     bb->bb_map = map_name (bb->bb_file);
- */
-
-char *
-map_name (char *file)
-{
-    register char *cp, *dp;
-    static char buffer[BUFSIZ];
-
-    if ((dp = strchr(cp = r1bindex (file, '/'), '.')) == NULL)
-       dp = cp + strlen (cp);
-    if (cp == file)
-       snprintf (buffer, sizeof(buffer), ".%.*s%s", (int)(dp - cp), cp, ".map");
-    else
-       snprintf (buffer, sizeof(buffer), "%.*s.%.*s%s",
-               (int)(cp - file), file, (int)(dp - cp), cp, ".map");
-
-    return buffer;
-}
-
-
-int
-map_read (char *file, long pos, struct drop **drops, int noisy)
-{
-    register int i, md, msgp;
-    register char *cp;
-    struct drop d;
-    register struct drop *mp, *dp;
-
-    if ((md = open (cp = map_name (file), O_RDONLY)) == NOTOK
-           || map_chk (cp, md, mp = &d, pos, noisy)) {
-       if (md != NOTOK)
-           close (md);
-       return 0;
-    }
-
-    msgp = mp->d_id;
-    dp = (struct drop *) calloc ((size_t) (msgp + 1), sizeof(*dp));
-    if (dp == NULL) {
-       close (md);
-       return 0;
-    }
-
-    memcpy((char *) dp, (char *) mp, sizeof(*dp));
-
-    lseek (md, (off_t) sizeof(*mp), SEEK_SET);
-    if ((i = read (md, (char *) (dp + 1), msgp * sizeof(*dp))) < sizeof(*dp)) {
-       i = 0;
-       free ((char *) dp);
-    } else {
-#ifdef NTOHLSWAP
-       register struct drop *tdp;
-       int j;
-
-       for (j = 0, tdp = dp; j < i / sizeof(*dp); j++, tdp++) {
-           tdp->d_id = ntohl(tdp->d_id);
-           tdp->d_size = ntohl(tdp->d_size);
-           tdp->d_start = ntohl(tdp->d_start);
-           tdp->d_stop = ntohl(tdp->d_stop);
-       }
-#endif
-       *drops = dp;
-    }
-
-    close (md);
-
-    return (i / sizeof(*dp));
-}
-
-
-int
-map_write (char *mailbox, int md, int id, long last, off_t start,
-           off_t stop, long pos, int size, int noisy)
-{
-    register int i;
-    int clear, fd, td;
-    char *file;
-    register struct drop *dp;
-    struct drop d1, d2, *rp;
-    register FILE *fp;
-    struct stat st;
-
-    if ((fd = map_open (file = map_name (mailbox), md)) == NOTOK)
-       return NOTOK;
-
-    if ((fstat (fd, &st) == OK) && (st.st_size > 0))
-       clear = 0;
-    else
-       clear = 1;
-
-    if (!clear && map_chk (file, fd, &d1, pos, noisy)) {
-       unlink (file);
-       mbx_close (file, fd);
-       if ((fd = map_open (file, md)) == NOTOK)
-           return NOTOK;
-       clear++;
-    }
-
-    if (clear) {
-       if ((td = dup (md)) == NOTOK || (fp = fdopen (td, "r")) == NULL) {
-           if (noisy)
-               admonish (file, "unable to %s", td != NOTOK ? "fdopen" : "dup");
-           if (td != NOTOK)
-               close (td);
-           mbx_close (file, fd);
-           return NOTOK;
-       }
-
-       switch (i = mbx_read (fp, 0, &rp, noisy)) {
-           case NOTOK:
-               fclose (fp);
-               mbx_close (file, fd);
-               return NOTOK;
-
-           case OK:
-               fclose (fp);
-               break;
-
-           default:
-               d1.d_id = 0;
-               for (dp = rp; i-- >0; dp++) {
-                   if (dp->d_start == start)
-                       dp->d_id = id;
-                   lseek (fd, (off_t) (++d1.d_id * sizeof(*dp)), SEEK_SET);
-                   if (write (fd, (char *) dp, sizeof(*dp)) != sizeof(*dp)) {
-                       if (noisy)
-                           admonish (file, "write error");
-                       mbx_close (file, fd);
-                       fclose (fp);
-                       return NOTOK;
-                   }
-               }
-               free ((char *) rp);
-               fclose (fp);
-               break;
-       }
-    }
-    else {
-       if (last == 0)
-           last = d1.d_start;
-       dp = &d2;
-       dp->d_id = id;
-       dp->d_size = (long) (size ? size : mbx_size (fd, start, stop));
-       dp->d_start = start;
-       dp->d_stop = stop;
-       lseek (fd, (off_t) (++d1.d_id * sizeof(*dp)), SEEK_SET);
-       if (write (fd, (char *) dp, sizeof(*dp)) != sizeof(*dp)) {
-           if (noisy)
-               admonish (file, "write error");
-           mbx_close (file, fd);
-           return NOTOK;
-       }
-    }
-
-    dp = &d1;
-    dp->d_size = DRVRSN;
-    dp->d_start = (long) last;
-    dp->d_stop = lseek (md, (off_t) 0, SEEK_CUR);
-
-    lseek (fd, (off_t) 0, SEEK_SET);
-    if (write (fd, (char *) dp, sizeof(*dp)) != sizeof(*dp)) {
-       if (noisy)
-           admonish (file, "write error");
-       mbx_close (file, fd);
-       return NOTOK;
-    }
-
-    mbx_close (file, fd);
-
-    return OK;
-}
-
-
-static int
-map_open (char *file, int md)
-{
-    mode_t mode;
-    struct stat st;
-
-    mode = fstat (md, &st) != NOTOK ? (mode_t) (st.st_mode & 0777) : m_gmprot ();
-    return mbx_open (file, OTHER_FORMAT, st.st_uid, st.st_gid, mode);
-}
-
-
-int
-map_chk (char *file, int fd, struct drop *dp, long pos, int noisy)
-{
-    long count;
-    struct drop d, tmpd;
-    register struct drop *dl;
-
-    if (read (fd, (char *) &tmpd, sizeof(*dp)) != sizeof(*dp)) {
-#ifdef notdef
-       admonish (NULL, "%s: missing or partial index", file);
-#endif /* notdef */
-       return NOTOK;
-    }
-#ifndef        NTOHLSWAP
-    *dp = tmpd;                /* if ntohl(n)=(n), can use struct assign */
-#else
-    dp->d_id    = ntohl(tmpd.d_id);
-    dp->d_size  = ntohl(tmpd.d_size);
-    dp->d_start = ntohl(tmpd.d_start);
-    dp->d_stop  = ntohl(tmpd.d_stop);
-#endif
-    
-    if (dp->d_size != DRVRSN) {
-       if (noisy)
-           admonish (NULL, "%s: version mismatch (%d != %d)", file,
-                               dp->d_size, DRVRSN);
-       return NOTOK;
-    }
-
-    if (dp->d_stop != pos) {
-       if (noisy && pos != (long) 0)
-           admonish (NULL,
-                   "%s: pointer mismatch or incomplete index (%ld!=%ld)", 
-                   file, dp->d_stop, (long) pos);
-       return NOTOK;
-    }
-
-    if ((long) ((dp->d_id + 1) * sizeof(*dp)) != (long) lseek (fd, (off_t) 0, SEEK_END)) {
-       if (noisy)
-           admonish (NULL, "%s: corrupt index(1)", file);
-       return NOTOK;
-    }
-
-    dl = &d;
-    count = (long) strlen (mmdlm2);
-    lseek (fd, (off_t) (dp->d_id * sizeof(*dp)), SEEK_SET);
-    if (read (fd, (char *) dl, sizeof(*dl)) != sizeof(*dl)
-           || (ntohl(dl->d_stop) != dp->d_stop
-               && ntohl(dl->d_stop) + count != dp->d_stop)) {
-       if (noisy)
-           admonish (NULL, "%s: corrupt index(2)", file);
-       return NOTOK;
-    }
-
-    return OK;
+    if (lkclosespool (md, mailbox) == 0)
+        return OK;
+    return NOTOK;

 }
 }