17 changed files with 204 additions and 244 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +0,0 @@
-*.info binary
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,8 @@ config.h.in
 config.log
 config.status
 src/*.o
-src/*.exe
+src/*.c~
+src/*.h~
 src/mboxgrep
 src/.deps/
 src/stamp-h1
@ -16,6 +17,3 @@ compile
 depcomp
 install-sh
 missing
-.gitignore
-.vscode/*
-*~
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+-*- text -*-
+
+mboxgrep is written and maintained by Daniel Spiljar.
+
+$Id: AUTHORS,v 1.3 2005-11-16 01:37:18 dspiljar Exp $
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -1 +0,0 @@
-mboxgrep is written and maintained by Daniel Spiljar with contributors.
--- a/Makefile.am
+++ b/Makefile.am
@ -1,2 +1,2 @@
 SUBDIRS = doc src
-EXTRA_DIST = COPYING.md INSTALL.md NEWS.md README.md TODO.md AUTHORS.md
+dist_data_DATA = contrib
--- a/NEWS.md
+++ b/NEWS.md
@ -1,28 +1,17 @@
 # Changes of mboxgrep

-## Changes in 0.7.13
-
- Improve the readability of this file.
- Failure to lock a file (mbox) is now a fatal error.
- Fix Autoconf on Windows.
- Code refactoring, mostly of mbox-related functions.
-
-## Changes in 0.7.12a
-
- Fix Automake macros to include the license file and others.
-
-## Changes in 0.7.12
+## Changes since 0.7.11

 - Port to the pcre2 library (pcre1 is no longer supported).
 - Check command-line options for conflicting matchers and actions.
 - Various minor code cleanups.

-## Changes in 0.7.11
+## Changes since 0.7.10

 - GNU Automake is now utilized instead of manually written Makefile.in files.
 - Code indentation has been corrected and documented (GNU indent is used for this purpose).

-## Changes in 0.7.10
+## Changes since 0.7.9

 - development has been restarted after a longer hiatus
 - moved the source tree to git
@ -31,7 +20,7 @@
 - fixed multiple compilation errors and warnings on Linux and FreeBSD
 - started implementing a debug mode

-## Changes in 0.7.9
+## Changes since 0.7.8

 - implemented support for mbox folders compressed with bzip2 algorithm
 - improved detection of PCRE library; this also fixes a compilation bug
@ -40,7 +29,7 @@
  folder and temporary directory were on different filesystems;
  thanks to James P. Dugal <jpd AT louisiana.edu> for providing a patch

-## Changes in 0.7.8
+## Changes since 0.7.7

 - fixed crashes on MH folders, as well as a potential problem with mbox
  and maildir folders with the same cause
@ -49,46 +38,46 @@
 - mboxgrep can now read gzip compressed mbox folders from standard input
  (which is a side effect of a code cleanup!)

-## Changes in 0.7.7
+## Changes since 0.7.6a

 - mboxgrep can now read mbox folders from standard input

-## Changes in 0.7.6a
+## Changes since 0.7.6

 - fixed a bug which prevented mboxgrep from being compiled

-## Changes in 0.7.6
+## Changes since 0.7.5

 - fixed a bug which caused mboxgrep to coredump on recursive search of 
  maildirs
 - code cleanups

-## Changes in 0.7.5
+## Changes since 0.7.4

 - recursive search through directories has been reimplemented

-## Changes in 0.7.4
+## Changes since 0.7.3

 - mboxgrep can now ignore messages with identical bodies

-## Changes in 0.7.3
+## Changes since 0.7.2

 - file locking method can be selected at runtime
 - mboxgrep used to coredump on messages with empty headers; the problem is 
  now hopefully fixed
 - mboxgrep now compiles on FreeBSD

-## Changes in 0.7.2
+## Changes since 0.7.1

 - file locking with `flock()` instead of `fcntl()` is now supported
 - mboxgrep should now compile on systems which don't have `getopt_long()`
 - other minor bugfixes

-## Changes in 0.7.1
+## Changes since 0.7.0

 - bugfixes

-## Changes in 0.7.0
+## Changes since 0.5.3

 - NOTE: there was no stable version between 0.5.x and 0.7.x
 - mboxgrep is almost completely rewritten
@ -98,7 +87,7 @@
  command)
 - added support for compressed mbox folders

-## Changes in 0.5.3
+## Changes since 0.5.2

 - implemented ability to write found messages to another folder (instead
  of standard output)
@ -106,7 +95,7 @@
  "NEWS")
 - wrote a manual in Texinfo format

-## Changes in 0.5.2
+## Changes since 0.5.1

 - implemented message counting (`-c, --count`)
 - fixed manual page installation target in src/Makefile.in -- manual page 
@ -119,17 +108,17 @@
 - implemented recursive search through directories (`-r, --recursive`)
 - config.h[.in] is now wrapped (`#ifndef CONFIG_H` and stuff)

-## Changes in 0.5.1
+## Changes since 0.5.0

 - added support for qmail-style maildir folders

-## Changes in 0.5.0
+## Changes since 0.4.0

 - the source of `getopt_long()` is now included, so long options are also available
  on platforms that don't use GNU libc
 - file locking is now performed on mbox folders only

-## Changes in 0.4.0
+## Changes since 0.2.0

 - added support for MH mailboxes
 - added scope selection switches `-B` (or `--body`) and `-H` (or `--headers`)
@ -140,12 +129,12 @@
 - the feature of reading from standard input is gone
 - added `-v` (or `--version`) switch

-## Changes in 0.2.0
+## Changes since 0.1.1

 - mboxgrep now puts a shared lock on a mailbox before reading it
 - various code cleanups

-## Changes in 0.1.1
+## Changes since 0.1.0

 - fixed install target in Makefile (`install` is now used instead of `cp`)
 - added support for mailboxes generated by Gnus
--- a/TODO.md
+++ b/TODO.md
@ -4,38 +4,36 @@

 - [x] use cryptographic hashes for detecting duplicate messages
 - [x] add checking for conflicting command-line options
+- [ ] support for deletion of messages after being matched and displayed
 - [x] ignore .overview when grepping Gnus folders
 - [x] inverted matching
 - [x] recursive search through directories
 - [x] writing selected messages to a new folder
 - [x] deleting selected messages
+- [ ] basic time and date matching
+- [ ] more advanced time and date matching, with strings such as "yesterday"
 - [x] reading messages from standard input
 - [x] run-time selection of file locking method
 - [x] add a debug function
- [ ] support for deletion of messages after being matched and displayed
- [ ] basic time and date matching
- [ ] more advanced time and date matching, with strings such as "yesterday"
- [ ] Remove the option to recursively traverse directories and instruct the users to run mboxgrep in conjuction with find(1) instead.

 ## File formats, encodings and standards

 - [x] migrate to pcre2, as pcre is obsolete
- [x] support for compressed mbox folders
- [x] support for bzip2 compression
 - [ ] use a more modern hash function than MD5
 - [ ] MIME support
 - [ ] support for GnuPG
+- [x] support for compressed mbox folders
+- [x] support for bzip2 compression
 - [ ] support for XZ-format compression
 - [ ] support for mail folder conversion
 - [ ] improve error detection when a directory is not a Maildir or MH folder
 - [ ] document criteria for folder format detection
- [ ] Maildir: check if an atomic rename() fails. This could be caused if "new" and "cur" subdirectories are not on the same filesystem, for example.

 ## Miscellaneous

 - [x] write Texinfo documentation
- [x] provide possibility to use flock() instead of fcntl()
 - [ ] configuration files
 - [ ] make use of lockfile library
 - [ ] make use of Solaris' maillock library
+- [x] provide possibility to use flock() instead of fcntl()
 - [ ] provide national language support with gettext()
--- a/configure.ac
+++ b/configure.ac
@ -1,5 +1,5 @@
 #  mboxgrep - scan mailbox for messages matching a regular expression
-#  Copyright (C) 2000 - 2003, 2023 - 2024  Daniel Spiljar
+#  Copyright (C) 2000 - 2003, 2023  Daniel Spiljar
 #
 #  Mboxgrep is free software; you can redistribute it and/or modify it 
 #  under the terms of the GNU General Public License as published by
@ -18,16 +18,18 @@
 # Process this file with autoconf to produce a configure script.

 # Yawn.
-AC_INIT([mboxgrep],[0.7.13],[dspiljar@datatipp.se],[mboxgrep],[https://www.mboxgrep.org/])
+AC_INIT([mboxgrep], [0.7.12], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
 #AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([foreign])
 AC_LANG([C])
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADER([src/config.h])

 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL

+# Checks for standard (sp?) header files
+AC_HEADER_STDC
 AC_HEADER_DIRENT

 # Checks for libraries.
@ -91,5 +93,7 @@ AC_CHECK_FUNCS([strptime])
 AC_CHECK_FUNCS(ftw)
 AC_CHECK_FUNCS(fts_open)

-AC_CONFIG_FILES([Makefile doc/Makefile src/Makefile])
+AC_CONFIG_FILES([Makefile
+                 doc/Makefile
+                 src/Makefile])
 AC_OUTPUT
--- a/doc/mboxgrep.1
+++ b/doc/mboxgrep.1
@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "27 September 2024"
+.TH MBOXGREP 1 "20 May 2023"
 .SH NAME
 mboxgrep \- displays email messages matching a pattern
 .SH SYNOPSIS
@ -10,7 +10,7 @@ mboxgrep \- displays email messages matching a pattern
 This manual page refers to
 .B mboxgrep
 version
-.BR 0.7.13 .
+.BR 0.7.12 .
 .PP
 .B mboxgrep
 scans a
@ -18,7 +18,7 @@ scans a
 and displays messages matching
 .I PATTERN.
 .PP
-If a mailbox name is omitted, or a single dash (-) is given instead,
+If a mailbox name is ommited, or a single dash (-) is given instead,
 it reads from standard input.
 It can read mbox folders or output from another
 .B mboxgrep
@ -72,8 +72,8 @@ Do not lock files.  This option is meaningful only if a mbox folder (see below)
 is scanned.
 .IP "-c, --count"
 Suppress normal output and print a count of matching messages.
-.IP "-o, --output=MAILBOX"
-Suppress normal output and write messages to destination MAILBOX instead.
+.IP "-o, --output=FOLDER"
+Suppress normal output and write messages to destination folder FOLDER instead.
 .IP "-p, --pipe=COMMAND"
 Pipe each found message to COMMAND
 .IP "-d, --delete"
@ -97,26 +97,10 @@ Search $MAIL for messages from Dirty Harry:
 mboxgrep '^From:.*callahan@sanfranciscopolice\\.org' $MAIL
 .TP
 \(bu
-Re-mail to George messages that mention his name:
-.PP
-mboxgrep --pipe="/usr/lib/sendmail george" --ignore-case george ~/Mail/*
-.TP
-\(bu
 Display all messages contained in folder ~/Mail/incoming, except those
 that appear to originate from AOL:
 .PP
 mboxgrep -v 'Received:.*aol\\.com' ~/Mail/incoming
-.TP
-\(bu
-Do a case-insensitive scan of ~/Mail/incoming for messages with subject
-``Weekly News'' and write them to folder ~/Mail/archive:
-.PP
-mboxgrep -o ~/Mail/archive -H -i '^Subject: Weekly News' ~/Mail/incoming
-.TP
-\(bu
-Count all messages stored in folder spam, ignoring duplicates:
-.PP
-mboxgrep -nd -c . spam
 .SH BUGS
 Report them to address below.
 .SH SEE ALSO
@ -124,8 +108,7 @@ grep(1),
 regex(7),
 perlre(1),
 mbox(5),
-RFC 2822,
-RFC 4155
+RFC 2822
 .SH DEDICATION
 Mboxgrep is dedicated in loving memory of Vicky, my cat who died of
 tumor on Sep 12, 2002.  
@ -133,11 +116,7 @@ tumor on Sep 12, 2002.
 You haven't been long with us, but you gave us a lot of joy and all your
 big heart that stopped ticking too early.  I will never forget you.  Sleep
 well, little friend.
-.SH HOMEPAGE
-https://www.mboxgrep.org/
-.SH GIT
-https://git.datatipp.se/dspiljar/mboxgrep
-.PP
-https://github.com/dspiljar/mboxgrep
+.SH URL
+http://www.mboxgrep.org/
 .SH AUTHOR
-Daniel Spiljar <dspiljar@datatipp.se>
+Daniel Spiljar <dspiljar AT datatipp.se>
--- a/doc/mboxgrep.info
+++ b/doc/mboxgrep.info
--- a/doc/mboxgrep.texi
+++ b/doc/mboxgrep.texi
@ -5,8 +5,8 @@
@setchapternewpage odd

@set EDITION 0.7
-@set VERSION 0.7.13
-@set UPDATED 23 September 2024
+@set VERSION 0.7.12
+@set UPDATED 20 May 2023

@dircategory Mail
@direntry
@ -19,7 +19,7 @@
 This file documents @code{mboxgrep} (version @value{VERSION}), a
 mailbox scanning utility.

-Copyright (C) 2000 - 2003, 2024 Daniel Spiljar
+Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
@end ifinfo

@menu
@ -171,9 +171,10 @@ Use with extreme caution.
@itemx -nd
 Ignore duplicate messages.

-@item --output=MAILBOX
-@itemx -o MAILBOX
-Suppress normal output and write messages to destination MAILBOX instead.
+@item --output=FOLDER
+@itemx -o FOLDER
+Suppress normal output and write messages to destination folder FOLDER
+instead. 

 Note that @code{mboxgrep} assumes the output folder is of the same format 
 as the input folder.  Currently there is no possibility to convert folders.
--- a/src/info.c
+++ b/src/info.c
@ -1,6 +1,6 @@
 /*
  mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  Daniel Spiljar
+  Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar

  Mboxgrep is free software; you can redistribute it and/or modify it 
  under the terms of the GNU General Public License as published by
@ -47,7 +47,7 @@ void
 version (void)
 {
  fprintf (stdout, "%s %s\n\n"
-           "Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  Daniel Spiljar\n"
+           "Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar\n"
           "This program is free software; you can redistribute it and/or "
           "modify\nit under the terms of the GNU General Public License "
           "as published by\nthe Free Software Foundation; either version "
--- a/src/main.c
+++ b/src/main.c
@ -1,6 +1,6 @@
 /*
  mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2004, 2006, 2023 - 2024  Daniel Spiljar
+  Copyright (C) 2000 - 2004, 2006, 2023  Daniel Spiljar

  Mboxgrep is free software; you can redistribute it and/or modify it 
  under the terms of the GNU General Public License as published by
@ -117,7 +117,7 @@ main (int argc, char **argv)
      if (config.action == ACTION_DELETE)
        {
          tmpmbox_create (argv[optind]);
-          runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, w);
+          runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w");
        }

      config.boxname = xstrdup (argv[optind]);
--- a/src/mbox.c
+++ b/src/mbox.c
@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000 - 2004, 2006, 2023 - 2024  Daniel Spiljar
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, 2023  Daniel Spiljar

   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@ -50,47 +50,166 @@
 #endif /* HAVE_LIBDMALLOC */

 mbox_t *
-mbox_open (const char *path, const mbox_mode_t mbox_mode)
+mbox_open (const char *path, const char *mode)
 {
  mbox_t *mp;
  static int fd;
 #ifndef HAVE_FLOCK
  struct flock lck;
 #endif /* HAVE_FLOCK */
+  char buffer[BUFSIZ];

  mp = (mbox_t *) xmalloc (sizeof (mbox_t));
-  mp->postmark_cache = NULL;
+  mp->postmark_cache = (char *) xmalloc (BUFSIZ * sizeof (char));

  if (0 == strcmp ("-", path))
    mp->fp = stdin;
  else
    {
-      if (mbox_mode == w)
+      if (mode[0] == 'r')
+        fd = m_open (path, O_RDONLY, 0);
+      else if (mode[0] == 'w')
        fd = m_open (path, (O_WRONLY | O_CREAT | O_APPEND),
                     (S_IWUSR | S_IRUSR));
      else
-        fd = m_open (path, O_RDONLY, 0);
+        {
+          fprintf (stderr, "%s: mbox.c: Unknown mode %c.  You shouldn't "
+                   "get this error...", APPNAME, mode[0]);
+          exit (2);
+        }

      if (fd == -1)
        {
+          if (config.merr)
+            {
+              fprintf (stderr, "%s: %s: ", APPNAME, path);
+              perror (NULL);
+            }
          errno = 0;
          return NULL;
        }

      if (config.lock > LOCK_NONE)
-        mbox_lock (fd, path, mbox_mode);
-
-      mp->fp = mbox_fdopen (fd, path, mbox_mode);
-    }
-
-  if (mbox_mode == r)
        {
-      mp->postmark_cache = mbox_check_postmark (mp, path);
+#ifdef HAVE_FLOCK
+          int op;

-      if (! mp->postmark_cache)
+          if (mode[0] == 'r')
+            op = LOCK_SH;
+          else
+            op = LOCK_EX;
+          if (-1 == flock (fd, op))
+#else
+          memset (&lck, 0, sizeof (struct flock));
+          lck.l_whence = SEEK_SET;
+          if (mode[0] == 'r')
+            lck.l_type = F_RDLCK;
+          else
+            lck.l_type = F_WRLCK;
+
+          if (-1 == fcntl (fd, F_SETLK, &lck))
+#endif /* HAVE_FLOCK */
+            {
+              if (config.merr)
+                {
+                  fprintf (stderr, "%s: %s: ", APPNAME, path);
+                  perror (NULL);
+                }
+              errno = 0;
+              close (fd);
              return NULL;
            }
+        }

+      if (mode[0] == 'r')
+        {
+          if (config.format == FORMAT_MBOX)
+            mp->fp = (FILE *) m_fdopen (fd, "r");
+#ifdef HAVE_LIBZ
+          else if (config.format == FORMAT_ZMBOX)
+            mp->fp = (gzFile *) m_gzdopen (fd, "rb");
+#endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+          else if (config.format == FORMAT_BZ2MBOX)
+            mp->fp = (BZFILE *) BZ2_bzdopen (fd, "rb");
+#endif /* HAVE_LIBBZ2 */
+        }
+      else if (mode[0] == 'w')
+        {
+          if (config.format == FORMAT_MBOX)
+            mp->fp = (FILE *) m_fdopen (fd, "w");
+#ifdef HAVE_LIBZ
+          else if (config.format == FORMAT_ZMBOX)
+            mp->fp = (gzFile *) m_gzdopen (fd, "wb");
+#endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+          else if (config.format == FORMAT_BZ2MBOX)
+            mp->fp = (BZFILE *) BZ2_bzdopen (fd, "wb");
+#endif /* HAVE_LIBBZ2 */
+        }
+
+      if (mp->fp == NULL)
+        {
+          if (config.merr)
+            {
+              fprintf (stderr, "%s: %s: ", APPNAME, path);
+              perror (NULL);
+            }
+          errno = 0;
+          close (fd);
+          return NULL;
+        }
+    }
+
+  if (mode[0] == 'r')
+    {
+      if (config.format == FORMAT_MBOX)
+        fgets (buffer, BUFSIZ, mp->fp);
+#ifdef HAVE_LIBZ
+      else if (config.format == FORMAT_ZMBOX)
+        gzgets (mp->fp, buffer, BUFSIZ);
+#endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+      else if (config.format == FORMAT_BZ2MBOX)
+        {
+          char c[1] = "\0";
+          int n = 0;
+
+          while (c[0] != '\n' && n < BUFSIZ)
+            {
+              BZ2_bzread (mp->fp, c, 1);
+              buffer[n] = c[0];
+              n++;
+            }
+          buffer[n] = '\0';
+        }
+#endif /* HAVE_LIBBZ2 */
+
+      if (0 != strncmp ("From ", buffer, 5))
+        {
+          if (config.merr)
+            {
+              if (0 == strcmp ("-", path))
+                fprintf (stderr, "%s: (standard input): Not a mbox folder\n",
+                         APPNAME);
+              else
+                fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME,
+                         path);
+            }
+          if (config.format == FORMAT_MBOX)
+            fclose (mp->fp);
+#ifdef HAVE_LIBZ
+          else if (config.format == FORMAT_ZMBOX)
+            gzclose (mp->fp);
+#endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+          else if (config.format == FORMAT_BZ2MBOX)
+            BZ2_bzclose (mp->fp);
+#endif /* HAVE_LIBBZ2 */
+          return NULL;
+        }
+      strcpy (mp->postmark_cache, buffer);
+    }
  return mp;
 }

@ -312,127 +431,3 @@ tmpfile_create (void)
    }
  return fd;
 }
-
-void
-mbox_lock (int fd, const char *path, const mbox_mode_t mbox_mode)
-{
-#ifdef HAVE_FLOCK
-  int op;
-
-  if (mbox_mode == r)
-    op = LOCK_SH;
-  else
-    op = LOCK_EX;
-  if (-1 == flock (fd, op))
-#else
-  memset (&lck, 0, sizeof (struct flock));
-  lck.l_whence = SEEK_SET;
-  if (mode[0] == 'r')
-    lck.l_type = F_RDLCK;
-  else
-    lck.l_type = F_WRLCK;
-
-  if (-1 == fcntl (fd, F_SETLK, &lck))
-#endif /* HAVE_FLOCK */
-    {
-      if (config.merr)
-        {
-          fprintf (stderr, "%s: %s: ", APPNAME, path);
-          perror (NULL);
-          exit (2);
-        }
-    }
-}
-
-void *
-mbox_fdopen (int fd, const char *path, const mbox_mode_t mbox_mode)
-{
-  void *f;
-  char *file_mode;
-
-  if (mbox_mode == w)
-    file_mode = xstrdup("wb");
-  else
-    file_mode = xstrdup("rb");
-
-  if (config.format == FORMAT_MBOX)
-    f = (FILE *) m_fdopen (fd, file_mode);
-#ifdef HAVE_LIBZ
-  else if (config.format == FORMAT_ZMBOX)
-    f = (gzFile *) m_gzdopen (fd, file_mode);
-#endif /* HAVE_LIBZ */
-#ifdef HAVE_LIBBZ2
-  else if (config.format == FORMAT_BZ2MBOX)
-    f = (BZFILE *) BZ2_bzdopen (fd, file_mode);
-#endif /* HAVE_LIBBZ2 */
-
-  if (f == NULL)
-    {
-      if (config.merr)
-        {
-          fprintf (stderr, "%s: %s: ", APPNAME, path);
-          perror (NULL);
-        }
-      errno = 0;
-      close (fd);
-      return NULL;
-    }
-
-  return f;
-}
-
-char *
-mbox_check_postmark(mbox_t *mp, const char *path)
-{
-  char *buffer;
-
-  buffer = (char *) xmalloc (BUFSIZ * sizeof (char));
-  memset (buffer, 0, BUFSIZ);
-
-  if (config.format == FORMAT_MBOX)
-    fgets (buffer, BUFSIZ, mp->fp);
-#ifdef HAVE_LIBZ
-  else if (config.format == FORMAT_ZMBOX)
-    gzgets (mp->fp, buffer, BUFSIZ);
-#endif /* HAVE_LIBZ */
-#ifdef HAVE_LIBBZ2
-  else if (config.format == FORMAT_BZ2MBOX)
-    {
-      char c[1] = "\0";
-      int n = 0;
-
-      while (c[0] != '\n' && n < BUFSIZ)
-        {
-          BZ2_bzread (mp->fp, c, 1);
-          buffer[n] = c[0];
-          n++;
-        }
-      buffer[n] = '\0';
-    }
-#endif /* HAVE_LIBBZ2 */
-
-  if (0 != strncmp ("From ", buffer, 5))
-    {
-      if ((config.merr) && (buffer[0] != '\0'))
-        {
-          if (0 == strcmp ("-", path))
-            fprintf (stderr, "%s: (standard input): Not an mbox folder\n",
-                     APPNAME);
-          else
-            fprintf (stderr, "%s: %s: Not an mbox folder\n", APPNAME,
-                     path);
-        }
-      if (config.format == FORMAT_MBOX)
-        fclose (mp->fp);
-#ifdef HAVE_LIBZ
-      else if (config.format == FORMAT_ZMBOX)
-        gzclose (mp->fp);
-#endif /* HAVE_LIBZ */
-#ifdef HAVE_LIBBZ2
-      else if (config.format == FORMAT_BZ2MBOX)
-        BZ2_bzclose (mp->fp);
-#endif /* HAVE_LIBBZ2 */
-      return NULL;
-    }
-  return buffer;
-}
--- a/src/mbox.h
+++ b/src/mbox.h
@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000 - 2004, 2023 - 2024 Daniel Spiljar
+   Copyright (C) 2000 - 2004, 2023  Daniel Spiljar
   
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@ -19,7 +19,9 @@

 #ifndef MBOX_H
 #  define MBOX_H 1
+
 #  include <config.h>
+
 #  include "message.h"

 typedef struct
@ -29,14 +31,8 @@ typedef struct
  char *postmark_cache;
 } mbox_t;

-typedef enum
-{
-  r,
-  w,
-} mbox_mode_t;

-
-mbox_t *mbox_open (const char *path, const mbox_mode_t mbox_mode);
+mbox_t *mbox_open (const char *path, const char *mode);
 void tmpmbox_create (const char *path);
 void tmpfile_name (const char *path);
 void tmpfile_mod_own (const int fd, const char *path);
@ -44,8 +40,5 @@ int tmpfile_create (void);
 void mbox_close (mbox_t * mbp);
 message_t *mbox_read_message (mbox_t * mp);
 void mbox_write_message (message_t * m, mbox_t * mbox);
-void mbox_lock (int fd, const char *path, const mbox_mode_t mbox_mode);
-void *mbox_fdopen (int fd, const char *path, const mbox_mode_t mbox_mode);
-char *mbox_check_postmark(mbox_t *mp, const char *path);

 #endif /* MBOX_H */
--- a/src/mboxgrep.h
+++ b/src/mboxgrep.h
@ -1,6 +1,6 @@
 /*
  mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2003, 2006, 2023 - 2024 Daniel Spiljar
+  Copyright (C) 2000 - 2003, 2006, 2023  Daniel Spiljar

  Mboxgrep is free software; you can redistribute it and/or modify it 
  under the terms of the GNU General Public License as published by
@ -21,8 +21,8 @@
 #define MBOXGREP_H

 #define APPNAME "mboxgrep"
-#define VERSION "0.7.13"
-#define BUGREPORT_ADDR "dspiljar@datatipp.se"
+#define VERSION "0.7.12"
+#define BUGREPORT_ADDR "dspiljar AT datatipp.se"

 #define HOST_NAME_SIZE 256

--- a/src/scan.c
+++ b/src/scan.c
@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000 - 2004, 2006, 2023 - 2024  Daniel Spiljar
+   Copyright (C) 2000 - 2004, 2006, 2023  Daniel Spiljar
   
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@ -107,7 +107,7 @@ scan_mailbox (char path[])
  if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
      || (config.format == FORMAT_BZ2MBOX))
    {
-      mbox = (mbox_t *) mbox_open (path, r);
+      mbox = (mbox_t *) mbox_open (path, "r");
      if (mbox == NULL)
        return;
    }
@ -179,7 +179,7 @@ scan_mailbox (char path[])
              else if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
                       || (config.format == FORMAT_BZ2MBOX))
                {
-                  out = mbox_open (config.outboxname, w);
+                  out = mbox_open (config.outboxname, "w");
                  /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
                  mbox_write_message (msg, out);
                  mbox_close (out);
				`@ -1 +0,0 @@`
				`mboxgrep is written and maintained by Daniel Spiljar with contributors.`