Remove an obsolete macro.

Omit the contrib subdirectory from the distribution tarball.

.gitattributes

@@ -0,0 +1 @@
+*.info binary

.gitignore

@@ -4,8 +4,7 @@ config.h.in
 config.log
 config.status
 src/*.o
-src/*.c~
+src/*.exe
-src/*.h~
 src/mboxgrep
 src/.deps/
 src/stamp-h1
@@ -17,7 +16,6 @@ compile
 depcomp
 install-sh
 missing
-src/mboxgrep.exe
-configure~
 .gitignore
 .vscode/*
+*~

Makefile.am

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

TODO.md

@@ -4,27 +4,27 @@
 
 - [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
@@ -34,8 +34,8 @@
 ## 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()

configure.ac

@@ -22,14 +22,12 @@ AC_INIT([mboxgrep], [0.7.13], [dspiljar@datatipp.se], [mboxgrep], [https://www.m
 #AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([foreign])
 AC_LANG([C])
-AC_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([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.

doc/mboxgrep.1

@@ -1,4 +1,4 @@
-.TH MBOXGREP 1 "23 September 2024"
+.TH MBOXGREP 1 "27 September 2024"
 .SH NAME
 mboxgrep \- displays email messages matching a pattern
 .SH SYNOPSIS
@@ -18,7 +18,7 @@ scans a
 and displays messages matching
 .I PATTERN.
 .PP
-If a mailbox name is ommited, or a single dash (-) is given instead,
+If a mailbox name is omitted, or a single dash (-) is given instead,
 it reads from standard input.
 It can read mbox folders or output from another
 .B mboxgrep

src/info.c

@@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar
+  Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  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  Daniel Spiljar\n"
+           "Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  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 "