Update the TODO list and bump the version to 0.7.12.

.gitignore

@@ -1,5 +1,6 @@
 Makefile
 config.h
+config.h.in
 config.log
 config.status
 src/*.o

INSTALL.md

@@ -5,11 +5,15 @@
 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:
 
 ```
@@ -18,5 +22,5 @@ To see the list of flags accepted by the configure script, run:
 
 Optionally, `mboxgrep` can be linked with the following libraries:
 
-- PCRE, to enable support for regular expressions compatible with Perl 5;
+- PCRE2, to enable support for regular expressions compatible with Perl 5;
 - zlib and bzlib, to enable support for compressed mbox folders.

NEWS.md

@@ -1,5 +1,11 @@
 # Changes of mboxgrep
 
+## 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.

README.md

@@ -1,7 +1,7 @@
 # mboxgrep - selects e-mail messages matching a pattern
 
 `mboxgrep` is a `grep(1)`-like tool which scans mailboxes and selects
-e-mail messages matching pattern.
+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

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

configure.ac

@@ -18,7 +18,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Yawn.
-AC_INIT([mboxgrep], [0.7.11], [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])

doc/mboxgrep.1

@@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "24 Mar 2023"
+.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.11 .
+.BR 0.7.12 .
 .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.11), a mailbox scanning
+This file documents 'mboxgrep' (version 0.7.12), a mailbox scanning
 utility.
 
    Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar

doc/mboxgrep.texi

@@ -5,8 +5,8 @@
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.11
+@set VERSION 0.7.12
-@set UPDATED 24 Mar 2023
+@set UPDATED 20 May 2023
 
 @dircategory Mail
 @direntry

src/config.h.in

@@ -1,76 +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 `pcre2' library (-lpcre2). */
-#undef HAVE_LIBPCRE2
-
-/* 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
-
-/* Name of package */
-#undef PACKAGE
-
-/* 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 home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION

src/mboxgrep.h

@@ -21,7 +21,7 @@
 #define MBOXGREP_H
 
 #define APPNAME "mboxgrep"
-#define VERSION "0.7.11"
+#define VERSION "0.7.12"
 #define BUGREPORT_ADDR "dspiljar AT datatipp.se"
 
 #define HOST_NAME_SIZE 256