Readability of the news file

Headings in the news file now refer to changes in the current version,
as opposed to changes since the last version.

.gitignore

@@ -17,3 +17,7 @@ compile
 depcomp
 install-sh
 missing
+src/mboxgrep.exe
+configure~
+.gitignore
+.vscode/*

AUTHORS

@@ -1,5 +0,0 @@
--*- text -*-
-
-mboxgrep is written and maintained by Daniel Spiljar.
-
-$Id: AUTHORS,v 1.3 2005-11-16 01:37:18 dspiljar Exp $

AUTHORS.md

@@ -0,0 +1 @@
+mboxgrep is written and maintained by Daniel Spiljar with contributors.

Makefile.am

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

NEWS.md

@@ -1,17 +1,21 @@
 # Changes of mboxgrep
 
-## Changes since 0.7.11
+## Changes in 0.7.12a
+
+- Fix Automake macros to include the license file and others.
+
+## Changes in 0.7.12
 
 - 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
+## Changes in 0.7.11
 
 - 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
+## Changes in 0.7.10
 
 - development has been restarted after a longer hiatus
 - moved the source tree to git
@@ -20,7 +24,7 @@
 - fixed multiple compilation errors and warnings on Linux and FreeBSD
 - started implementing a debug mode
 
-## Changes since 0.7.8
+## Changes in 0.7.9
 
 - implemented support for mbox folders compressed with bzip2 algorithm
 - improved detection of PCRE library; this also fixes a compilation bug
@@ -29,7 +33,7 @@
   folder and temporary directory were on different filesystems;
   thanks to James P. Dugal <jpd AT louisiana.edu> for providing a patch
 
-## Changes since 0.7.7
+## Changes in 0.7.8
 
 - fixed crashes on MH folders, as well as a potential problem with mbox
   and maildir folders with the same cause
@@ -38,46 +42,46 @@
 - mboxgrep can now read gzip compressed mbox folders from standard input
   (which is a side effect of a code cleanup!)
 
-## Changes since 0.7.6a
+## Changes in 0.7.7
 
 - mboxgrep can now read mbox folders from standard input
 
-## Changes since 0.7.6
+## Changes in 0.7.6a
 
 - fixed a bug which prevented mboxgrep from being compiled
 
-## Changes since 0.7.5
+## Changes in 0.7.6
 
 - fixed a bug which caused mboxgrep to coredump on recursive search of 
   maildirs
 - code cleanups
 
-## Changes since 0.7.4
+## Changes in 0.7.5
 
 - recursive search through directories has been reimplemented
 
-## Changes since 0.7.3
+## Changes in 0.7.4
 
 - mboxgrep can now ignore messages with identical bodies
 
-## Changes since 0.7.2
+## Changes in 0.7.3
 
 - 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 since 0.7.1
+## Changes in 0.7.2
 
 - 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 since 0.7.0
+## Changes in 0.7.1
 
 - bugfixes
 
-## Changes since 0.5.3
+## Changes in 0.7.0
 
 - NOTE: there was no stable version between 0.5.x and 0.7.x
 - mboxgrep is almost completely rewritten
@@ -87,7 +91,7 @@
   command)
 - added support for compressed mbox folders
 
-## Changes since 0.5.2
+## Changes in 0.5.3
 
 - implemented ability to write found messages to another folder (instead
   of standard output)
@@ -95,7 +99,7 @@
   "NEWS")
 - wrote a manual in Texinfo format
 
-## Changes since 0.5.1
+## Changes in 0.5.2
 
 - implemented message counting (`-c, --count`)
 - fixed manual page installation target in src/Makefile.in -- manual page 
@@ -108,17 +112,17 @@
 - implemented recursive search through directories (`-r, --recursive`)
 - config.h[.in] is now wrapped (`#ifndef CONFIG_H` and stuff)
 
-## Changes since 0.5.0
+## Changes in 0.5.1
 
 - added support for qmail-style maildir folders
 
-## Changes since 0.4.0
+## Changes in 0.5.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 since 0.2.0
+## Changes in 0.4.0
 
 - added support for MH mailboxes
 - added scope selection switches `-B` (or `--body`) and `-H` (or `--headers`)
@@ -129,12 +133,12 @@
 - the feature of reading from standard input is gone
 - added `-v` (or `--version`) switch
 
-## Changes since 0.1.1
+## Changes in 0.2.0
 
 - mboxgrep now puts a shared lock on a mailbox before reading it
 - various code cleanups
 
-## Changes since 0.1.0
+## Changes in 0.1.1
 
 - fixed install target in Makefile (`install` is now used instead of `cp`)
 - added support for mailboxes generated by Gnus

TODO.md

@@ -15,6 +15,7 @@
 - [x] reading messages from standard input
 - [x] run-time selection of file locking method
 - [x] add a debug function
+- [ ] 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
 
@@ -28,6 +29,7 @@
 - [ ] 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
 

configure.ac

@@ -18,7 +18,7 @@
 # Process this file with autoconf to produce a configure script.
 
 # Yawn.
-AC_INIT([mboxgrep], [0.7.12], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
+AC_INIT([mboxgrep], [0.7.12a], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
 #AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([foreign])
 AC_LANG([C])
@@ -93,7 +93,5 @@ 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

doc/mboxgrep.1

@@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "20 May 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.12 .
+.BR 0.7.12a .
 .PP
 .B mboxgrep
 scans a
@@ -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=FOLDER"
-Suppress normal output and write messages to destination folder FOLDER instead.
+.IP "-o, --output=MAILBOX"
+Suppress normal output and write messages to destination MAILBOX instead.
 .IP "-p, --pipe=COMMAND"
 Pipe each found message to COMMAND
 .IP "-d, --delete"

doc/mboxgrep.info

@@ -1,4 +1,4 @@
-This is mboxgrep.info, produced by makeinfo version 6.7 from
+This is mboxgrep.info, produced by makeinfo version 6.8 from
 mboxgrep.texi.
 
 INFO-DIR-SECTION Mail
@@ -9,7 +9,7 @@ END-INFO-DIR-ENTRY
 
 File: mboxgrep.info,  Node: Top,  Up: (dir)
 
-This file documents 'mboxgrep' (version 0.7.12), a mailbox scanning
+This file documents 'mboxgrep' (version 0.7.12a), a mailbox scanning
 utility.
 
    Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
@@ -151,10 +151,10 @@ options below change such behavior.
 '-nd'
      Ignore duplicate messages.
 
-'--output=FOLDER'
-'-o FOLDER'
-     Suppress normal output and write messages to destination folder
-     FOLDER instead.
+'--output=MAILBOX'
+'-o MAILBOX'
+     Suppress normal output and write messages to destination MAILBOX
+     instead.
 
      Note that 'mboxgrep' assumes the output folder is of the same
      format as the input folder.  Currently there is no possibility to
@@ -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 selection4342
+Node: Mailbox type selection4583
+Node: Examples4904
+Node: Bugs5728
+Node: To Vicky6146
 
 End Tag Table
 

doc/mboxgrep.texi

@@ -5,8 +5,8 @@
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.12
-@set UPDATED 20 May 2023
+@set VERSION 0.7.12a
+@set UPDATED 21 May 2023
 
 @dircategory Mail
 @direntry
@@ -171,10 +171,9 @@ Use with extreme caution.
 @itemx -nd
 Ignore duplicate messages.
 
-@item --output=FOLDER
-@itemx -o FOLDER
-Suppress normal output and write messages to destination folder FOLDER
-instead. 
+@item --output=MAILBOX
+@itemx -o MAILBOX
+Suppress normal output and write messages to destination MAILBOX 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.

src/mboxgrep.h

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