Bump the version to 0.7.12a.

Fix Automake macros to include the license file and other files and
directories in the distribution tarball.

.gitignore

@@ -1,8 +1,19 @@
 Makefile
 config.h
+config.h.in
 config.log
 config.status
 src/*.o
 src/*.c~
 src/*.h~
 src/mboxgrep
+src/.deps/
+src/stamp-h1
+aclocal.m4
+autom4te.cache/
+Makefile.in
+configure
+compile
+depcomp
+install-sh
+missing

INSTALL.md

@@ -0,0 +1,26 @@
+# Compilation and installation of mboxgrep
+
+`mboxgrep` should compile on a modern Unix-like operating system, such as GNU/Linux or FreeBSD.
+
+Autoconf and Automake are used, and the most basic compilation procedure consists of:
+
+```
+autoreconf --install
+./configure
+make
+make install # root rights probably needed here, prefix with sudo in such case
+```
+
+(Invocation of `autoreconf` is only required if the source tree has been cloned from the
+git repository.)
+
+To see the list of flags accepted by the configure script, run:
+
+```
+./configure --help
+```
+
+Optionally, `mboxgrep` can be linked with the following libraries:
+
+- PCRE2, to enable support for regular expressions compatible with Perl 5;
+- zlib and bzlib, to enable support for compressed mbox folders.

Makefile.am

@@ -0,0 +1,2 @@
+SUBDIRS = doc src
+EXTRA_DIST = contrib COPYING.md INSTALL.md NEWS.md README.md TODO.md

Makefile.in

@@ -1,37 +0,0 @@
-#  mboxgrep - scan mailbox for messages matching a regular expression
-#  Copyright (C) 2000, 01  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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  Mboxgrep is distributed in the hope that it will be useful, but 
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with mboxgrep; if not, write to the Free Software Foundation, 
-#  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# $Id: Makefile.in,v 1.1 2001-10-26 13:07:28 dspiljar Exp $
-
-SHELL           =       /bin/sh
-
-all: 
-	cd src; $(MAKE) 
-
-clean:
-	cd src; $(MAKE) clean
-
-distclean:
-	rm -f *~ Makefile config.status config.log config.cache
-	cd src; $(MAKE) distclean
-	cd doc; $(MAKE) distclean
-
-install:
-	cd src; $(MAKE) install
-	cd doc; $(MAKE) install
-
-.NOEXPORT:

NEWS.md

@@ -1,5 +1,20 @@
 # Changes of mboxgrep
 
+## Changes since 0.7.12
+
+- Fix Automake macros to include the license file and others.
+
+## 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 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 since 0.7.9
 
 - development has been restarted after a longer hiatus

README.md

@@ -1,4 +1,7 @@
-mboxgrep - displays e-mail messages matching a pattern
+# mboxgrep - selects e-mail messages matching a pattern
+
+`mboxgrep` is a `grep(1)`-like tool which scans mailboxes and selects
+e-mail messages matching a pattern.
 
 Full description of mboxgrep is contained in the documentation,
 which is provided both in manpage and texinfo format, to satisfy
@@ -11,8 +14,8 @@ are welcome.
 If you intend to bundle mboxgrep with an operating system (such as a
 GNU/Linux distrubution, for example), please drop me a line about it.
 
-For build instructions, read the file "INSTALL", and run
+For build instructions, read the file `INSTALL.md`, and run
 `./configure --help`.
 
-This project aims to follow the GNU coding style (https://www.gnu.org/prep/standards/html_node/Formatting.html),
-at least loosely. The code should be indented with indent -gnu -nut -ppi2.
+This project aims to follow the [GNU coding style](https://www.gnu.org/prep/standards/html_node/Formatting.html),
+at least loosely. The code should be indented with `indent -gnu -nut -ppi2`.

TODO.md

@@ -3,7 +3,7 @@
 ## Behavior
 
 - [x] use cryptographic hashes for detecting duplicate messages
-- [ ] add checking for conflicting command-line options
+- [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
@@ -18,13 +18,14 @@
 
 ## File formats, encodings and standards
 
+- [x] migrate to pcre2, as pcre is obsolete
+- [ ] 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
-- [ ] use a more modern hash function than MD5
 - [ ] improve error detection when a directory is not a Maildir or MH folder
 - [ ] document criteria for folder format detection
 

configure.ac

@@ -1,5 +1,5 @@
 #  mboxgrep - scan mailbox for messages matching a regular expression
-#  Copyright (C) 2000, 2001, 2002, 2003  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
@@ -15,13 +15,13 @@
 #  along with mboxgrep; if not, write to the Free Software Foundation, 
 #  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-# $Id: configure.ac,v 1.13 2003-08-10 22:45:45 dspiljar Exp $
-
 # Process this file with autoconf to produce a configure script.
 
 # Yawn.
-AC_INIT
-AC_LANG(C)
+AC_INIT([mboxgrep], [0.7.12a], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
+#AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign])
+AC_LANG([C])
 AC_CONFIG_HEADER([src/config.h])
 
 # Checks for programs.
@@ -34,34 +34,35 @@ AC_HEADER_DIRENT
 
 # Checks for libraries.
 
-# Check for PCRE library
-AC_ARG_WITH(pcre, [  --without-pcre          Compile without Perl regexp support],,
+# Check for PCRE2 library
+AC_ARG_WITH(pcre2, [  --without-pcre2          Compile without Perl regexp support],,
 [
-	AC_PATH_PROG(PCRE_CONFIG, pcre-config)
+	AC_PATH_PROG(PCRE2_CONFIG, pcre2-config)
 
-	if test "$PCRE_CONFIG"; then
-	   CFLAGS="$CFLAGS `$PCRE_CONFIG --cflags`"
-	   LIBS="$LIBS `$PCRE_CONFIG --libs`"
+	if test "$PCRE2_CONFIG"; then
+	   CFLAGS="$CFLAGS `$PCRE2_CONFIG --cflags`"
+	   LIBS="$LIBS `$PCRE2_CONFIG --libs32`"
 
 	   AC_LINK_IFELSE(
 	   [
-#include <pcre.h>
+#define PCRE2_CODE_UNIT_WIDTH 32
+#include <pcre2.h>
 
 int main ()
 {
   return 0;
 }
 	   ],
-	   AC_DEFINE(HAVE_LIBPCRE),
+	   AC_DEFINE(HAVE_LIBPCRE2),
 	   [
-		AC_MSG_NOTICE(found pcre-config but could not compile test program.)
-		AC_MSG_FAILURE(is PCRE properly installed?)
+		AC_MSG_NOTICE(found pcre2-config but could not compile test program.)
+		AC_MSG_FAILURE(is PCRE2 properly installed?)
 	   ]
 )
 	else
-	   AC_MSG_NOTICE(pcre-config not found)
-	   AC_MSG_NOTICE(trying to find PCRE anyway)
-	   AC_CHECK_LIB(pcre, main)
+	   AC_MSG_NOTICE(pcre2-config not found)
+	   AC_MSG_NOTICE(trying to find PCRE2 anyway)
+	   AC_CHECK_LIB(pcre2, main)
 	fi
 ]
 )

doc/Makefile.am

@@ -0,0 +1,2 @@
+dist_man_MANS = mboxgrep.1
+info_TEXINFOS = mboxgrep.texi

doc/Makefile.in

@@ -1,41 +0,0 @@
-#  mboxgrep - search mailbox for messages matching a regular expression
-#  Copyright (C) 2000, 01  Daniel Spiljar
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# $Id: Makefile.in,v 1.1 2001-10-26 13:07:55 dspiljar Exp $
-
-MANPAGE		=	mboxgrep.1
-INSTALL		=	@INSTALL@
-prefix		=	@prefix@
-mandir		=	@mandir@
-infodir		=	@infodir@
-SHELL 		= 	/bin/sh
-
-.PHONY: all
-all:
-
-.PHONY: distclean
-distclean:
-	rm -f *~ Makefile
-
-.PHONY: install
-install: mboxgrep.1
-	$(INSTALL) -d $(mandir)/man1
-	$(INSTALL) -m 0644 $(MANPAGE) $(mandir)/man1
-	$(INSTALL) -d $(infodir)
-	$(INSTALL) -m 0644 mboxgrep.info $(infodir)
-
-.NOEXPORT:

doc/mboxgrep.1

@@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "17 Feb 2023"
+.TH MBOXGREP 1 "21 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.10 .
+.BR 0.7.12a .
 .PP
 .B mboxgrep
 scans a

doc/mboxgrep.info

@@ -9,7 +9,7 @@ END-INFO-DIR-ENTRY
 
 File: mboxgrep.info,  Node: Top,  Up: (dir)
 
-This file documents 'mboxgrep' (version 0.7.10), a mailbox scanning
+This file documents 'mboxgrep' (version 0.7.12a), a mailbox scanning
 utility.
 
    Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
@@ -250,17 +250,17 @@ Sleep well, little friend.
 
 Tag Table:
 Node: Top197
-Node: Introduction596
-Node: Invoking1465
-Node: Miscellaneous1827
-Node: File locking2112
-Node: Regexp selection2749
-Node: Output control3301
-Node: Search scope selection4345
-Node: Mailbox type selection4586
-Node: Examples4907
-Node: Bugs5731
-Node: To Vicky6149
+Node: Introduction597
+Node: Invoking1466
+Node: Miscellaneous1828
+Node: File locking2113
+Node: Regexp selection2750
+Node: Output control3302
+Node: Search scope selection4346
+Node: Mailbox type selection4587
+Node: Examples4908
+Node: Bugs5732
+Node: To Vicky6150
 
 End Tag Table
 

doc/mboxgrep.texi

@@ -5,8 +5,8 @@
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.10
-@set UPDATED 17 Feb 2023
+@set VERSION 0.7.12a
+@set UPDATED 21 May 2023
 
 @dircategory Mail
 @direntry

install-sh

@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	true
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=mkdir
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		true
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		true
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		true
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='	
-'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		true
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		true
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0

src/Makefile.am

@@ -0,0 +1,6 @@
+bin_PROGRAMS = mboxgrep
+mboxgrep_SOURCES = info.c info.h maildir.c maildir.h main.c mbox.c mbox.h \
+									 mboxgrep.h md5.c md5.h message.h misc.c misc.h mh.c mh.h \
+									 getopt.c getopt1.c getopt.h re.c re.h scan.c scan.h wrap.c wrap.h
+
+mboxgrep_LDADD = $(LIBOBJS)

src/Makefile.in

@@ -1,57 +0,0 @@
-#  mboxgrep - scan mailbox for messages matching a regular expression
-#  Copyright (C) 2000, 2001, 2002, 2003, 2006  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
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  Mboxgrep is distributed in the hope that it will be useful, but 
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with mboxgrep; if not, write to the Free Software Foundation, 
-#  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-# $Id: Makefile.in,v 1.12 2006-07-07 04:38:53 dspiljar Exp $
-
-srcdir		=	@srcdir@
-
-CC		= 	@CC@
-OBJS		=	info.o main.o mh.o scan.o maildir.o mbox.o misc.o \
-			wrap.o getopt.o getopt1.o md5.o re.o
-SRCS		= 	info.c main.c mh.c scan.c maildir.c mbox.c misc.c \
-			wrap.c getopt.c getopt1.c md5.c re.c
-TARGET		=	mboxgrep
-CFLAGS		=	@CFLAGS@
-LIBS		=	@LIBS@
-INSTALL		=	@INSTALL@
-prefix		=	@prefix@
-SHELL 		= 	/bin/sh
-INCLUDES	=	-I. -I$(srcdir)
-
-.SUFFIXES:
-.SUFFIXES: .c .o
-
-.c.o: 
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
-
-$(TARGET): $(OBJS)
-	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
-
-.PHONY: clean
-clean:
-	rm -f $(TARGET) $(OBJS) core
-
-.PHONY: distclean
-distclean:
-	rm -f *~ Makefile config.h
-
-.PHONY: install
-install: mboxgrep
-	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
-
-.NOEXPORT:

src/config.h.in

@@ -1,67 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the `fcntl' function. */
-#undef HAVE_FCNTL
-
-/* Define to 1 if you have the `flock' function. */
-#undef HAVE_FLOCK
-
-/* Define to 1 if you have the `fts_open' function. */
-#undef HAVE_FTS_OPEN
-
-/* Define to 1 if you have the `ftw' function. */
-#undef HAVE_FTW
-
-/* Define to 1 if you have the `bz2' library (-lbz2). */
-#undef HAVE_LIBBZ2
-
-/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
-#undef HAVE_LIBDMALLOC
-
-/* Define to 1 if you have the `garfield' library (-lgarfield). */
-#undef HAVE_LIBGARFIELD
-
-/* Define to 1 if you have the `pcre' library (-lpcre). */
-#undef HAVE_LIBPCRE
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
-/* Define to 1 if you have the `regcomp' function. */
-#undef HAVE_REGCOMP
-
-/* Define to 1 if you have the `strptime' function. */
-#undef HAVE_STRPTIME
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS

src/info.c

@@ -22,19 +22,22 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "mboxgrep.h"
 
 
 void
-print_wrap (char *str, int len, int *n)
+print_wrap (char *str)
 {
-  *n += len;
+  static int n = 0;
+
+  n += strlen (str);
   fprintf (stdout, "%s", str);
-  if (*n >= 50)
+  if (n >= 50)
     {
       fprintf (stdout, "\n");
-      *n = 0;
+      n = 0;
     }
   else
     fprintf (stdout, " ");
@@ -43,8 +46,6 @@ print_wrap (char *str, int len, int *n)
 void
 version (void)
 {
-  int n = 0;
-
   fprintf (stdout, "%s %s\n\n"
            "Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar\n"
            "This program is free software; you can redistribute it and/or "
@@ -54,51 +55,51 @@ version (void)
            APPNAME, VERSION);
   fprintf (stdout, "Compilation options:\n");
 #ifdef HAVE_DIRENT_H
-  print_wrap ("HAVE_DIRENT_H", 13, &n);
+  print_wrap ("HAVE_DIRENT_H");
 #endif /* HAVE_DIRENT_H */
 #ifdef HAVE_FCNTL
-  print_wrap ("HAVE_FCNTL", 10, &n);
+  print_wrap ("HAVE_FCNTL");
 #endif /* HAVE_FCNTL */
 #ifdef HAVE_FLOCK
-  print_wrap ("HAVE_FLOCK", 10, &n);
+  print_wrap ("HAVE_FLOCK");
 #endif /* HAVE_FLOCK */
 #ifdef HAVE_FTS_OPEN
-  print_wrap ("HAVE_FTS_OPEN", 13, &n);
+  print_wrap ("HAVE_FTS_OPEN");
 #else
 #  ifdef HAVE_FTW
-  print_wrap ("HAVE_FTW", 8, &n);
+  print_wrap ("HAVE_FTW");
 #  endif
        /* HAVE_FTW */
 #endif /* HAVE_FTS_OPEN */
 /*
   fprintf (stdout, "HAVE_LIBLOCKFILE ");
 */
-#ifdef HAVE_LIBPCRE
-  print_wrap ("HAVE_LIBPCRE", 12, &n);
-#endif /* HAVE_LIBPCRE */
+#ifdef HAVE_LIBPCRE2
+  print_wrap ("HAVE_LIBPCRE2");
+#endif /* HAVE_LIBPCRE2 */
 #ifdef HAVE_LIBZ
-  print_wrap ("HAVE_LIBZ", 9, &n);
+  print_wrap ("HAVE_LIBZ");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-  print_wrap ("HAVE_LIBBZ2", 11, &n);
+  print_wrap ("HAVE_LIBBZ2");
 #endif /* HAVE_LIBBZ2 */
 #ifdef HAVE_NDIR_H
-  print_wrap ("HAVE_NDIR_H", 11, &n);
+  print_wrap ("HAVE_NDIR_H");
 #endif /* HAVE_NDIR_H */
 #ifdef HAVE_SYS_DIR_H
-  print_wrap ("HAVE_SYS_DIR_H", 14, &n);
+  print_wrap ("HAVE_SYS_DIR_H");
 #endif /* HAVE_SYS_DIR_H */
 #ifdef HAVE_SYS_NDIR_H
-  print_wrap ("HAVE_SYS_NDIR_H", 15, &n);
+  print_wrap ("HAVE_SYS_NDIR_H");
 #endif /* HAVE_SYS_NDIR_H */
 #ifdef HAVE_STRPTIME
-  print_wrap ("HAVE_STRPTIME", 15, &n);
+  print_wrap ("HAVE_STRPTIME");
 #endif /* HAVE_STRPTIME */
 #ifdef HAVE_REGCOMP
-  print_wrap ("HAVE_REGCOMP", 15, &n);
+  print_wrap ("HAVE_REGCOMP");
 #endif /* HAVE_REGCOMP */
 #ifdef HAVE_LIBDMALLOC
-  print_wrap ("HAVE_LIBDMALLOC", 15, &n);
+  print_wrap ("HAVE_LIBDMALLOC");
 #endif /* HAVE_LIBDMALLOC */
   fprintf (stdout, "\n");
 
@@ -127,10 +128,10 @@ help (void)
            "Matching criteria:\n\n"
            "  -E,  --extended-regexp\tPATTERN is an extended regular expression\n"
            "  -G,  --basic-regexp\t\tPATTERN is a basic regular expression\n");
-#ifdef HAVE_LIBPCRE
+#ifdef HAVE_LIBPCRE2
   fprintf (stdout,
            "  -P,  --perl-regexp\t\tPATTERN is a Perl regular expression\n");
-#endif /* HAVE_LIBPCRE */
+#endif /* HAVE_LIBPCRE2 */
   fprintf (stdout,
            "  -e,  --regexp=PATTERN\t\tUse PATTERN as a regular expression\n"
            "  -i,  --ignore-case\t\tIgnore case distinctions\n"

src/info.h

@@ -20,7 +20,7 @@
 #ifndef INFO_H
 #  define INFO_H
 
-void print_wrap (char *str, int len, int *n);
+void print_wrap (char *str);
 void version (void);
 void help (void);
 void usage (void);

src/main.c

@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
-#include <unistd.h>
 #ifdef HAVE_LIBZ
 #  include <zlib.h>
 #endif /* HAVE_LIBZ */
@@ -81,21 +80,11 @@ main (int argc, char **argv)
     {0, 0, 0, 0}
   };
 
-  set_default_options ();
+  init_options ();
 
-  get_runtime_options (&argc, argv, long_options);
+  get_options (&argc, argv, long_options);
 
-  if ((config.body == 0) && (config.headers == 0))
-    {
-      config.body = 1;
-      config.headers = 1;
-    }
-
-  if (config.format == MAILDIR && config.action == WRITE)
-    {
-      gethostname (config.hostname, HOST_NAME_SIZE);
-      config.pid = (int) getpid ();
-    }
+  check_options ();
 
   runtime.cs = (checksum_t *) xmalloc (sizeof (checksum_t));
   runtime.cs->md5 = (char **) xcalloc (1, sizeof (char **));
@@ -110,11 +99,11 @@ main (int argc, char **argv)
 
   if (config.haveregex)
     {
-#ifdef HAVE_LIBPCRE
-      if (config.perl)
+#ifdef HAVE_LIBPCRE2
+      if (config.regextype == REGEX_PERL)
         pcre_init ();
       else
-#endif /* HAVE_LIBPCRE */
+#endif /* HAVE_LIBPCRE2 */
         regex_init ();
     }
   else
@@ -125,7 +114,7 @@ main (int argc, char **argv)
 
   while (optind < argc)
     {
-      if (config.action == DELETE)
+      if (config.action == ACTION_DELETE)
         {
           tmpmbox_create (argv[optind]);
           runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w");
@@ -140,7 +129,7 @@ main (int argc, char **argv)
 
       havemailbox = 1;
 
-      if (config.action == COUNT)
+      if (config.action == ACTION_COUNT)
         {
           if (singlefile)
             fprintf (stdout, "%i\n", runtime.count);
@@ -152,19 +141,20 @@ main (int argc, char **argv)
                 fprintf (stdout, "%s:%i\n", argv[optind], runtime.count);
             }
         }
-      if (config.action == DELETE)
+      if (config.action == ACTION_DELETE)
         {
           mbox_close (runtime.tmp_mbox);
           rename (config.tmpfilename, argv[optind]);
         }
+
       ++optind;
     }
 
   if (!havemailbox)
     {
-      config.format = MBOX;
+      config.format = FORMAT_MBOX;
       scan_mailbox ("-");
-      if (config.action == COUNT)
+      if (config.action == ACTION_COUNT)
         fprintf (stdout, "%i\n", runtime.count);
     }
 

src/mbox.c

@@ -1,6 +1,6 @@
 /*
    mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006  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
@@ -89,7 +89,7 @@ mbox_open (const char *path, const char *mode)
           return NULL;
         }
 
-      if (config.lock)
+      if (config.lock > LOCK_NONE)
         {
 #ifdef HAVE_FLOCK
           int op;
@@ -123,27 +123,27 @@ mbox_open (const char *path, const char *mode)
 
       if (mode[0] == 'r')
         {
-          if (config.format == MBOX)
+          if (config.format == FORMAT_MBOX)
             mp->fp = (FILE *) m_fdopen (fd, "r");
 #ifdef HAVE_LIBZ
-          else if (config.format == ZMBOX)
+          else if (config.format == FORMAT_ZMBOX)
             mp->fp = (gzFile *) m_gzdopen (fd, "rb");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-          else if (config.format == BZ2MBOX)
+          else if (config.format == FORMAT_BZ2MBOX)
             mp->fp = (BZFILE *) BZ2_bzdopen (fd, "rb");
 #endif /* HAVE_LIBBZ2 */
         }
       else if (mode[0] == 'w')
         {
-          if (config.format == MBOX)
+          if (config.format == FORMAT_MBOX)
             mp->fp = (FILE *) m_fdopen (fd, "w");
 #ifdef HAVE_LIBZ
-          else if (config.format == ZMBOX)
+          else if (config.format == FORMAT_ZMBOX)
             mp->fp = (gzFile *) m_gzdopen (fd, "wb");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-          else if (config.format == BZ2MBOX)
+          else if (config.format == FORMAT_BZ2MBOX)
             mp->fp = (BZFILE *) BZ2_bzdopen (fd, "wb");
 #endif /* HAVE_LIBBZ2 */
         }
@@ -163,14 +163,14 @@ mbox_open (const char *path, const char *mode)
 
   if (mode[0] == 'r')
     {
-      if (config.format == MBOX)
+      if (config.format == FORMAT_MBOX)
         fgets (buffer, BUFSIZ, mp->fp);
 #ifdef HAVE_LIBZ
-      else if (config.format == ZMBOX)
+      else if (config.format == FORMAT_ZMBOX)
         gzgets (mp->fp, buffer, BUFSIZ);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-      else if (config.format == BZ2MBOX)
+      else if (config.format == FORMAT_BZ2MBOX)
         {
           char c[1] = "\0";
           int n = 0;
@@ -196,14 +196,14 @@ mbox_open (const char *path, const char *mode)
                 fprintf (stderr, "%s: %s: Not a mbox folder\n", APPNAME,
                          path);
             }
-          if (config.format == MBOX)
+          if (config.format == FORMAT_MBOX)
             fclose (mp->fp);
 #ifdef HAVE_LIBZ
-          else if (config.format == ZMBOX)
+          else if (config.format == FORMAT_ZMBOX)
             gzclose (mp->fp);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-          else if (config.format == BZ2MBOX)
+          else if (config.format == FORMAT_BZ2MBOX)
             BZ2_bzclose (mp->fp);
 #endif /* HAVE_LIBBZ2 */
           return NULL;
@@ -216,14 +216,14 @@ mbox_open (const char *path, const char *mode)
 void
 mbox_close (mbox_t * mp)
 {
-  if (config.format == MBOX)
+  if (config.format == FORMAT_MBOX)
     fclose (mp->fp);
 #ifdef HAVE_LIBZ
-  else if (config.format == ZMBOX)
+  else if (config.format == FORMAT_ZMBOX)
     gzclose (mp->fp);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-  else if (config.format == BZ2MBOX)
+  else if (config.format == FORMAT_BZ2MBOX)
     BZ2_bzclose (mp->fp);
 #endif /* HAVE_LIBBZ2 */
 
@@ -249,7 +249,7 @@ mbox_read_message (mbox_t * mp)
 
   for (;;)
     {
-      if (config.format == MBOX)
+      if (config.format == FORMAT_MBOX)
         {
           if (fgets (buffer, BUFSIZ, mp->fp) == NULL)
             {
@@ -261,7 +261,7 @@ mbox_read_message (mbox_t * mp)
         }
 
 #ifdef HAVE_LIBZ
-      else if (config.format == ZMBOX)
+      else if (config.format == FORMAT_ZMBOX)
         {
           if (gzgets (mp->fp, buffer, BUFSIZ) == NULL)
             {
@@ -274,7 +274,7 @@ mbox_read_message (mbox_t * mp)
 #endif /* HAVE_LIBZ */
 
 #ifdef HAVE_LIBBZ2
-      else if (config.format == BZ2MBOX)
+      else if (config.format == FORMAT_BZ2MBOX)
         {
           char c[1] = "\0";
           int n = 0;
@@ -370,10 +370,10 @@ tmpfile_name (const char *path)
 void
 mbox_write_message (message_t * msg, mbox_t * mbox)
 {
-  if (config.format == MBOX)
+  if (config.format == FORMAT_MBOX)
     fprintf (mbox->fp, "%s\n%s", msg->headers, msg->body);
 #ifdef HAVE_LIBZ
-  else if (config.format == ZMBOX)
+  else if (config.format == FORMAT_ZMBOX)
     {
       gzwrite_loop (mbox->fp, msg->headers);
       gzwrite (mbox->fp, "\n", 1);
@@ -381,7 +381,7 @@ mbox_write_message (message_t * msg, mbox_t * mbox)
     }
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-  else if (config.format == BZ2MBOX)
+  else if (config.format == FORMAT_BZ2MBOX)
     {
       bzwrite_loop (mbox->fp, msg->headers);
       BZ2_bzwrite (mbox->fp, "\n", 1);

src/mboxgrep.h

@@ -15,14 +15,13 @@
   You should have received a copy of the GNU General Public License
   along with mboxgrep; if not, write to the Free Software Foundation, 
   Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
 */
 
 #ifndef MBOXGREP_H
 #define MBOXGREP_H
 
 #define APPNAME "mboxgrep"
-#define VERSION "0.7.10"
+#define VERSION "0.7.12a"
 #define BUGREPORT_ADDR "dspiljar AT datatipp.se"
 
 #define HOST_NAME_SIZE 256
@@ -47,34 +46,46 @@
 
 typedef enum
   {
-    MBOX,
-    ZMBOX,
-    MH,
-    NNML,
-    NNMH,
-    MAILDIR,
-    BZ2MBOX
+    FORMAT_UNDEF,
+    FORMAT_MBOX,
+    FORMAT_ZMBOX,
+    FORMAT_MH,
+    FORMAT_NNML,
+    FORMAT_NNMH,
+    FORMAT_MAILDIR,
+    FORMAT_BZ2MBOX
   }
 format_t;
 
 typedef enum
   {
-    NONE,
-    FCNTL,
-    FLOCK
+    LOCK_UNDEF,
+    LOCK_NONE,
+    LOCK_FCNTL,
+    LOCK_FLOCK
   }
 lockmethod_t;
 
 typedef enum
   {
-    DISPLAY,
-    WRITE,
-    COUNT,
-    DELETE,
-    PIPE
+    ACTION_UNDEF,
+    ACTION_DISPLAY,
+    ACTION_WRITE,
+    ACTION_COUNT,
+    ACTION_DELETE,
+    ACTION_PIPE
   }
 action_t;
 
+typedef enum
+  {
+    REGEX_UNDEF,
+    REGEX_BASIC,
+    REGEX_EXTENDED,
+    REGEX_PERL
+  }
+regextype_t;
+
 typedef struct
 {
   FILE *fp;
@@ -94,9 +105,6 @@ checksum_t;
 
 typedef struct
 {
-  int extended;
-  int perl;
-  
   int body;
   int headers;
   int dedup;
@@ -112,12 +120,13 @@ typedef struct
   char hostname[HOST_NAME_SIZE];
   char *boxname, *outboxname, *pipecmd, *tmpfilename, *regex_s;
 
-  void *pcre_pattern, *pcre_hints, *posix_pattern;
+  void *pcre_pattern, *posix_pattern, *match_data;
   int res1, res2;
 
   action_t action;
   format_t format;
   lockmethod_t lock;
+  regextype_t regextype;
 }
 option_t;
 

src/mh.c

@@ -1,6 +1,6 @@
 /* -*- C -*- 
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000, 2001, 2002, 2003, 2006  Daniel Spiljar
+  Copyright (C) 2000, 2001, 2002, 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
@@ -129,7 +129,7 @@ mh_read_message (DIR * dp)
 
       fgets (buffer, BUFSIZ, fp);
 
-/*       if (config.format == NNML || config.format == NNMH) */
+/*       if (config.format == FORMAT_NNML || config.format == FORMAT_NNMH) */
 /* 	{ */
 /* 	  if (0 != strncmp ("X-From-Line: ", buffer, 13)) */
 /* 	    { */

src/misc.c

@@ -18,7 +18,7 @@
 */
 
 #define _XOPEN_SOURCE           /* Pull in strptime(3) from time.h */
-#define _BSD_SOURCE             /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
+#define _DEFAULT_SOURCE         /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
                                  * from string.h. */
 
 #include <config.h>
@@ -28,62 +28,76 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <time.h>
+#include <unistd.h>
 
 #include "mboxgrep.h"
+#include "misc.h"
 #include "wrap.h"
 #include "getopt.h"
 #include "info.h"
 #include "message.h"
 
-format_t
-folder_format (const char *name)
+/* Determine the folder format passed to -m. */
+
+void
+set_folder_format (const char *name)
 {
-  format_t f;
+  if (config.format > 0)
+    {
+      if (config.merr)
+        fprintf (stderr, "%s: multiple mailbox types specified\n", APPNAME);
+      exit (2);
+    }
 
   if (0 == strncasecmp (name, "mbox", 4))
-    f = MBOX;
+    config.format = FORMAT_MBOX;
   else if (0 == strncasecmp (name, "zmbox", 5))
-    f = ZMBOX;
+    config.format = FORMAT_ZMBOX;
   else if (0 == strncasecmp (name, "gzmbox", 6))
-    f = ZMBOX;
+    config.format = FORMAT_ZMBOX;
   else if (0 == strncasecmp (name, "bzmbox", 5))
-    f = BZ2MBOX;
+    config.format = FORMAT_BZ2MBOX;
   else if (0 == strncasecmp (name, "bz2mbox", 5))
-    f = BZ2MBOX;
+    config.format = FORMAT_BZ2MBOX;
   else if (0 == strncasecmp (name, "mh", 2))
-    f = MH;
+    config.format = FORMAT_MH;
   else if (0 == strncasecmp (name, "nnml", 4))
-    f = NNML;
+    config.format = FORMAT_NNML;
   else if (0 == strncasecmp (name, "nnmh", 4))
-    f = NNMH;
+    config.format = FORMAT_NNMH;
   else if (0 == strncasecmp (name, "maildir", 7))
-    f = MAILDIR;
+    config.format = FORMAT_MAILDIR;
   else
     {
       if (config.merr)
         fprintf (stderr, "%s: %s: unknown folder type\n", APPNAME, name);
       exit (2);
     }
-
-  return f;
 }
 
-lockmethod_t
-lock_method (const char *name)
+/* Determine the file locking method passed to -l. */
+
+void
+set_lock_method (const char *name)
 {
-  lockmethod_t l;
+  if (config.lock > 0)
+    {
+      if (config.merr)
+        fprintf (stderr, "%s: conflicting file locking options specified\n", APPNAME);
+      exit (2);
+    }
 
   if (0 == strncasecmp (name, "none", 4))
-    l = NONE;
+    config.lock = LOCK_NONE;
   else if (0 == strncasecmp (name, "off", 3))
-    l = NONE;
+    config.lock = LOCK_NONE;
 #ifdef HAVE_FCNTL
   else if (0 == strncasecmp (name, "fcntl", 5))
-    l = FCNTL;
+    config.lock = LOCK_FCNTL;
 #endif /* HAVE_FCNTL */
 #ifdef HAVE_FLOCK
   else if (0 == strncasecmp (name, "flock", 5))
-    l = FLOCK;
+    config.lock = LOCK_FLOCK;
 #endif /* HAVE_FLOCK */
   else
     {
@@ -91,10 +105,10 @@ lock_method (const char *name)
         fprintf (stderr, "mboxgrep: %s: unknown file locking method\n", name);
       exit (2);
     }
-
-  return l;
 }
 
+/* Dead code */
+
 /*
 time_t parse_date(char *datestr)
 {
@@ -170,26 +184,29 @@ postmark_print (message_t * msg)
     fprintf (stdout, "From nobody  %s\n", date_str);
 }
 
+/* Initialize the option_t struct. */
+
 void
-set_default_options (void)
+init_options (void)
 {
-  config.perl = 0;
-  config.extended = 1;
+  config.regextype = REGEX_UNDEF;
   config.invert = 0;
   config.headers = 0;
   config.body = 0;
-  config.action = DISPLAY;
+  config.action = ACTION_UNDEF;
   config.dedup = 0;
   config.recursive = 0;
   config.ignorecase = 0;
-  config.format = MBOX;         /* default mailbox format */
-  config.lock = FCNTL;          /* default file locking method */
+  config.format = FORMAT_UNDEF;
+  config.lock = LOCK_UNDEF;     /* default file locking method */
   config.merr = 1;              /* report errors by default */
   config.debug = 0;
 }
 
+/* Parse command-line arguments and assign values to option_t. */
+
 void
-get_runtime_options (int *argc, char **argv, struct option *long_options)
+get_options (int *argc, char **argv, struct option *long_options)
 {
   int option_index = 0, c;
 
@@ -206,35 +223,26 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
         case '?':
           usage ();
         case 'c':
-          config.action = COUNT;
+          set_option_action (ACTION_COUNT, NULL);
           break;
         case 'd':
-          config.action = DELETE;
+          set_option_action (ACTION_DELETE, NULL);
           break;
         case 'e':
           config.regex_s = xstrdup (optarg);
           config.haveregex = 1;
           break;
         case 'o':
-          config.outboxname = xstrdup (optarg);
-          config.action = WRITE;
+          set_option_action (ACTION_WRITE, optarg);
           break;
         case 'E':
-          config.extended = 1;
+          set_option_regextype (REGEX_EXTENDED);
           break;
         case 'G':
-          config.extended = 0;
+          set_option_regextype (REGEX_BASIC);
           break;
         case 'P':
-#ifdef HAVE_LIBPCRE
-          config.extended = 0;
-          config.perl = 1;
-#else
-          fprintf (stderr,
-                   "%s: Support for Perl regular expressions not "
-                   "compiled in\n", APPNAME);
-          exit (2);
-#endif /* HAVE_LIBPCRE */
+          set_option_regextype (REGEX_PERL);
           break;
         case 'h':
           help ();
@@ -243,14 +251,13 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
           config.ignorecase = 1;
           break;
         case 'm':
-          config.format = folder_format (optarg);
+          set_folder_format (optarg);
           break;
         case 'l':
-          config.lock = lock_method (optarg);
+          set_lock_method (optarg);
           break;
         case 'p':
-          config.action = PIPE;
-          config.pipecmd = xstrdup (optarg);
+          set_option_action (ACTION_PIPE, optarg);
           break;
         case 'V':
           version ();
@@ -289,7 +296,7 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
                 config.dedup = 1;
                 break;
               case 'l':
-                config.lock = 0;
+                set_lock_method ("none");
                 break;
               default:
                 fprintf (stderr, "%s: invalid option -- n%c\n",
@@ -300,3 +307,80 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
         }                       /* switch */
     }                           /* while */
 }
+
+/* Check the state of command-line options after parsing them.
+ * Raise error on conflicting options and set uninitialized ones to default values.
+ */
+
+void
+check_options (void)
+{
+  gethostname (config.hostname, HOST_NAME_SIZE);
+  config.pid = (int) getpid ();
+
+  if (config.action == ACTION_UNDEF)
+    {
+      config.action = ACTION_DISPLAY;
+    }
+
+  if (config.format == FORMAT_UNDEF)
+    {
+      config.format = FORMAT_MBOX;  /* default mailbox format */
+    }
+
+  if (config.regextype == REGEX_UNDEF)
+    {
+      config.regextype = REGEX_EXTENDED;  /* default regex type */
+    }
+
+  if ((config.body == 0) && (config.headers == 0))
+    {
+      config.body = 1;
+      config.headers = 1;
+    }
+}
+
+void
+set_option_action (action_t action, char *path)
+{
+  if (config.action > 0)
+    {
+      if (config.merr)
+        fprintf (stderr, "%s: conflicting actions specified\n", APPNAME);
+      exit (2);
+    }
+
+  config.action = action;
+
+  if (action == ACTION_WRITE)
+    {
+      config.outboxname = xstrdup (path);
+    }
+
+  if (action == ACTION_PIPE)
+    {
+      config.pipecmd = xstrdup (optarg);
+    }
+}
+
+void
+set_option_regextype (regextype_t regextype)
+{
+  if (config.regextype > 0)
+    {
+      if (config.merr)
+        fprintf (stderr, "%s: conflicting matchers specified\n", APPNAME);
+      exit (2);
+    }
+
+#ifndef HAVE_LIBPCRE2
+  if (regextype == REGEX_PERL);
+    {
+      fprintf (stderr,
+              "%s: Support for Perl regular expressions not compiled in\n",
+              APPNAME);
+      exit (2);
+    }
+#endif /* HAVE_LIBPCRE2 */
+  config.regextype = regextype;
+}

src/misc.h

@@ -25,14 +25,17 @@
 #  include "message.h"
 /* #include <time.h> */
 
-format_t folder_format (const char *name);
-lockmethod_t lock_method (const char *name);
+void set_folder_format (const char *name);
+void set_lock_method (const char *name);
 /* time_t parse_date(char *datestr); */
 char *parse_return_path (char *rpath);
 void *allocate_message (void);
 void postmark_print (message_t * msg);
-void set_default_options (void);
-void get_runtime_options (int *argc, char **argv,
+void init_options (void);
+void get_options (int *argc, char **argv,
                           struct option *long_options);
+void check_options (void);
+void set_option_action (action_t action, char *path);
+void set_option_regextype (regextype_t regextype);
 
 #endif /* MISC_H */

src/re.c

@@ -21,52 +21,58 @@
 #include <stdio.h>
 #include <string.h>
 #include <regex.h>
-#ifdef HAVE_LIBPCRE
-#  include <pcre.h>
-#endif /* HAVE_LIBPCRE */
+#ifdef HAVE_LIBPCRE2
+#  define PCRE2_CODE_UNIT_WIDTH 32
+#  include <pcre2.h>
+#endif /* HAVE_LIBPCRE2 */
 #include "mboxgrep.h"
 #include "message.h"
 #include "wrap.h"               /* xcalloc() et cetera */
 
-#ifdef HAVE_LIBPCRE
+#ifdef HAVE_LIBPCRE2
 void
 pcre_init (void)
 {
-  int errptr;
-  const char *error;
+  int errornumber;
+  PCRE2_SIZE erroroffset;
 
   config.pcre_pattern =
-    (pcre *) pcre_compile (config.regex_s,
-                           (config.ignorecase ? PCRE_CASELESS : 0),
-                           &error, &errptr, NULL);
+    (pcre2_code *) pcre2_compile ((PCRE2_SPTR) config.regex_s, (PCRE2_SIZE) strlen (config.regex_s),
+                                  (config.ignorecase ? PCRE2_CASELESS : 0),
+                                  &errornumber, &erroroffset, NULL);
   if (config.pcre_pattern == NULL)
     {
       if (config.merr)
-        fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, error);
+        {
+          PCRE2_UCHAR buffer[256];
+
+          pcre2_get_error_message (errornumber, buffer, sizeof(buffer));
+          fprintf (stderr, "%s: PCRE2 compilation failed at offset %d: %s\n",
+              APPNAME, (int) erroroffset, (char *) buffer);
+        }
       exit (2);
     }
+
+  config.match_data =
+    (pcre2_match_data* ) pcre2_match_data_create_from_pattern (config.pcre_pattern, NULL);
 }
 
 void
 pcre_match (message_t * msg)
 {
-  int of[BUFSIZ];
-
   if (config.headers)
     config.res1 =
-      pcre_exec ((pcre *) config.pcre_pattern,
-                 (pcre_extra *) config.pcre_hints,
-                 msg->headers, (int) strlen (msg->headers), 0, 0, of, BUFSIZ);
+      pcre2_match ((pcre2_code *) config.pcre_pattern,
+                   (PCRE2_SPTR) msg->headers, (int) strlen (msg->headers), 0, 0, config.match_data, NULL);
   if (config.body)
     config.res2 =
-      pcre_exec ((pcre *) config.pcre_pattern,
-                 (pcre_extra *) config.pcre_hints,
-                 msg->body, (int) strlen (msg->body), 0, 0, of, BUFSIZ);
+      pcre2_match ((pcre2_code *) config.pcre_pattern,
+                   (PCRE2_SPTR) msg->body, (int) strlen (msg->body), 0, 0, config.match_data, NULL);
 
   config.res1 = config.res1 ^ 1;
   config.res2 = config.res2 ^ 1;
 }
-#endif /* HAVE_LIBPCRE */
+#endif /* HAVE_LIBPCRE2 */
 
 void
 regex_init (void)
@@ -77,7 +83,7 @@ regex_init (void)
 
   if (config.ignorecase)
     flag1 = REG_ICASE;
-  if (config.extended)
+  if (config.regextype == REGEX_EXTENDED)
     flag2 = REG_EXTENDED;
 
   config.posix_pattern = (regex_t *) xmalloc (sizeof (regex_t));

src/re.h

@@ -19,9 +19,9 @@
 
 #include "mboxgrep.h"
 
-#ifdef HAVE_LIBPCRE
+#ifdef HAVE_LIBPCRE2
 void pcre_init (void);
 void pcre_match (message_t * msg);
-#endif /* HAVE_LIBPCRE */
+#endif /* HAVE_LIBPCRE2 */
 void regex_init (void);
 void regex_match (message_t * msg);

src/scan.c

@@ -83,7 +83,7 @@ scan_mailbox (char path[])
   int delete = 0;
   int isdup = 0;
 
-  if (config.format == MAILDIR && config.action == WRITE)
+  if (config.format == FORMAT_MAILDIR && config.action == ACTION_WRITE)
     {
       foo = opendir (config.outboxname);        /* do NOT change this to m_opendir! */
       if (foo == NULL && errno == ENOENT)
@@ -101,24 +101,24 @@ scan_mailbox (char path[])
     }
 
   runtime.count = 0;
-  if (config.action == DELETE)
+  if (config.action == ACTION_DELETE)
     delete = 1;
 
-  if ((config.format == MBOX) || (config.format == ZMBOX)
-      || (config.format == BZ2MBOX))
+  if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
+      || (config.format == FORMAT_BZ2MBOX))
     {
       mbox = (mbox_t *) mbox_open (path, "r");
       if (mbox == NULL)
         return;
     }
-  else if ((config.format == MH) || (config.format == NNMH)
-           || (config.format == NNML))
+  else if ((config.format == FORMAT_MH) || (config.format == FORMAT_NNMH)
+           || (config.format == FORMAT_NNML))
     {
       boxd = mh_open (path);
       if (boxd == NULL)
         return;
     }
-  else if (config.format == MAILDIR)
+  else if (config.format == FORMAT_MAILDIR)
     {
       maildird = maildir_open (path);
 
@@ -131,13 +131,13 @@ scan_mailbox (char path[])
       config.res1 = 1;
       config.res2 = 1;
 
-      if ((config.format == MBOX) || (config.format == ZMBOX)
-          || (config.format == BZ2MBOX))
+      if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
+          || (config.format == FORMAT_BZ2MBOX))
         msg = (message_t *) mbox_read_message (mbox);
-      else if ((config.format == MH) || (config.format == NNMH)
-               || (config.format == NNML))
+      else if ((config.format == FORMAT_MH) || (config.format == FORMAT_NNMH)
+               || (config.format == FORMAT_NNML))
         msg = (message_t *) mh_read_message (boxd);
-      else if (config.format == MAILDIR)
+      else if (config.format == FORMAT_MAILDIR)
         msg = (message_t *) maildir_read_message (maildird);
 
       if (msg == NULL)
@@ -146,11 +146,11 @@ scan_mailbox (char path[])
       if (msg->from == NULL)
         msg->from = (char *) xstrdup ("nobody");
 
-#ifdef HAVE_LIBPCRE
-      if (config.perl)
+#ifdef HAVE_LIBPCRE2
+      if (config.regextype == REGEX_PERL)
         pcre_match (msg);
       else
-#endif /* HAVE_LIBPCRE */
+#endif /* HAVE_LIBPCRE2 */
         regex_match (msg);
 
       if (config.dedup)
@@ -160,24 +160,24 @@ scan_mailbox (char path[])
           ((config.invert ^ delete)) &&
           ((config.dedup && !isdup) || !config.dedup))
         {
-          if (config.action == DISPLAY)
+          if (config.action == ACTION_DISPLAY)
             {
-              if (config.format != MBOX && config.format != ZMBOX
-                  && config.format != BZ2MBOX
+              if (config.format != FORMAT_MBOX && config.format != FORMAT_ZMBOX
+                  && config.format != FORMAT_BZ2MBOX
                   && 0 != strncmp ("From ", msg->headers, 5))
                 postmark_print (msg);
 
               fprintf (stdout, "%s\n%s", msg->headers, msg->body);
             }
-          else if (config.action == WRITE)
+          else if (config.action == ACTION_WRITE)
             {
-              if (config.format == MAILDIR)
+              if (config.format == FORMAT_MAILDIR)
                 maildir_write_message (msg, config.outboxname);
-              else if (config.format == MH || config.format == NNMH
-                       || config.format == NNML)
+              else if (config.format == FORMAT_MH || config.format == FORMAT_NNMH
+                       || config.format == FORMAT_NNML)
                 mh_write_message (msg, config.outboxname);
-              else if ((config.format == MBOX) || (config.format == ZMBOX)
-                       || (config.format == BZ2MBOX))
+              else if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
+                       || (config.format == FORMAT_BZ2MBOX))
                 {
                   out = mbox_open (config.outboxname, "w");
                   /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
@@ -185,7 +185,7 @@ scan_mailbox (char path[])
                   mbox_close (out);
                 }
             }
-          else if (config.action == PIPE)
+          else if (config.action == ACTION_PIPE)
             {
               outf = popen (config.pipecmd, "w");
               if (outf == NULL)
@@ -200,19 +200,19 @@ scan_mailbox (char path[])
               fprintf (outf, "%s\n%s", msg->headers, msg->body);
               pclose (outf);
             }
-          else if (config.action == COUNT)
+          else if (config.action == ACTION_COUNT)
             runtime.count++;
-          else if (config.action == DELETE &&
-                   ((config.format == MBOX) || (config.format == ZMBOX)
-                    || (config.format == BZ2MBOX)))
+          else if (config.action == ACTION_DELETE &&
+                   ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
+                    || (config.format == FORMAT_BZ2MBOX)))
             mbox_write_message (msg, runtime.tmp_mbox);
         }
 
       else
         if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert)
-             && delete) && ((config.format == MH) || (config.format == NNMH)
-                            || (config.format == NNML)
-                            || (config.format == MAILDIR)))
+             && delete) && ((config.format == FORMAT_MH) || (config.format == FORMAT_NNMH)
+                            || (config.format == FORMAT_NNML)
+                            || (config.format == FORMAT_MAILDIR)))
         m_unlink (msg->filename);
 
       free (msg->body);
@@ -220,11 +220,11 @@ scan_mailbox (char path[])
       free (msg);
     }                           /* for */
 
-  if ((config.format == MBOX) || (config.format == ZMBOX)
-      || (config.format == BZ2MBOX))
+  if ((config.format == FORMAT_MBOX) || (config.format == FORMAT_ZMBOX)
+      || (config.format == FORMAT_BZ2MBOX))
     mbox_close (mbox);
-  else if ((config.format == MH) || (config.format == NNMH)
-           || (config.format == NNML))
+  else if ((config.format == FORMAT_MH) || (config.format == FORMAT_NNMH)
+           || (config.format == FORMAT_NNML))
     mh_close (boxd);
 }