Version bump to 0.7.11.

C source files (with the exception of third-party files, i.e. getopt and
md5) have been indented with GNU indent.

The indentation "standard" has been documented in the readme file.

.gitignore

@@ -0,0 +1,12 @@
+Makefile
+config.h
+config.log
+config.status
+src/*.o
+src/*.c~
+src/*.h~
+src/mboxgrep
+src/.deps/
+src/stamp-h1
+aclocal.m4
+autom4te.cache/

ChangeLog

@@ -1,384 +0,0 @@
-Mon Oct 23 01:29:07 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mboxgrep.h, src/main.c, src/mbox.c, src/mbox.h, src/scan.c:
-	temporary mbox file (used for deleting messages) is now created
-	by tmpmbox_create(), tmpp global pointer is killed;  portions of
-	code in scan.c are replaced by single call of mbox_write_message();
-	scan.c no longer includes zlib.h and bzlib.h
-
-Thu Oct 19 03:50:38 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mboxgrep.h, src/main.c, src/maildir.c, src/scan.c:
-	got rid off tmpp and maildir_count global variables (code
-	cleanup)
-
-Thu Oct 19 03:38:24 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mboxgrep.h, src/main.c, src/scan.c:
-	introduction of the global runtime_t structure; mailbox counter,
-	MD5 hash and other global variables are now part of it (code
-	cleanup)
-
-Fri Jul  7 06:10:51 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mboxgrep.h, src/re.c, src/re.h, src/scan.c:
-	portions of scan_mailbox() have been moved to new functions,
-	pcre_match() and regex_match() (code cleanup)
-
-Thu Jul  6 13:54:23 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/main.c, src/mboxgrep.h, src/re.c, src/re.h, src/scan.c:
-	main() has been partially uncluttered by moving portions of the
-	code to functions pcre_init() and regex_init()
-
-Thu Jul  6 12:49:59 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/main.c, src/mboxgrep.h, src/misc.c, src/misc.h:
-	variables regex_s and haveregex are now part of the option_t
-	structure (code cleanup)
-
-Thu Jul  6 10:26:57 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/main.c, src/misc.c, src/misc.h:
-	parts of main() have been moved to set_default_options() and
-	get_runtime_options() (code cleanup)
-
-Sat Jul  1 13:06:37 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mbox.c, src/mbox.h:
-	file mode and ownership-altering code has been moved to a separate
-	function, tmpfile_mod_own (code cleanup)
-
-Tue Jun 27 18:48:00 CEST 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mbox.c, src/mbox.h:
-	portions of the code from tmpfile_open moved to a new function,
-	tmpfile_name (code cleanup)
-
-Mon Feb 20 18:09:59 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/maildir.c, src/mh.c:
-	removed some unused variables (have_return_path)
-
-Mon Jan 30 01:35:30 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mboxgrep.h, src/maildir.c, src/mh.c, src/mbox.c, src/scan.c, src/main.c:
-	boxname, outboxname, pipecmd and tmpfilename are now a part of
-	the config_t structure and no longer global variables
-
-Sat Jan 21 08:18:29 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/scan.c, src/misc.c, src/misc.h:
-	created postmark_print() to unclutter scan_mailbox()
-
-Fri Jan 20 05:36:44 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/misc.c, src/misc.h, src/mbox.c, src/maildir.c, src/mh.c:
-	some repetitive code moved to malloc_message()
-
-Fri Jan 20 05:13:06 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/mbox.c:
-	cleanup of mbox_write_message(); use of gzwrite_loop() and
-	bzwrite_loop()
-
-Fri Jan 20 03:57:28 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/scan.c, src/wrap.h, src/wrap.c:
-	wrote gzwrite_loop() and bzwrite_loop() to remove some repetitive
-	code from scan.c
-
-Fri Jan 20 02:11:50 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/scan.c:
-	md5_check_message(): array b and cast in strncmp are no longer
-	unsigned
-
-Wed Jan 18 01:48:56 CET 2006  Daniel Spiljar <dspiljar@panix.com>
-
-	* src/info.c, src/mboxgrep.h:
-	updated copyright information, changed author's email address
-	to the one at Panix
-
-Mon Apr 12 19:30:52 CEST 2004  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/info.c:
-	updated copyright information
-
-Sun Apr 11 23:45:08 CEST 2004  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/mbox.h, src/mbox.c, src/scan.c, src/main.c:
-	mbox_write_message(); further fixes of message deletion code
-
-Thu Sep 18 00:10:13 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/scan.c:
-	fixed deleting messages from mbox folders compressed with
-	bzip2
-
-Thu Sep 18 00:08:36 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/main.c, src/mbox.c:
-	moved James P. Dugal's ownership-preserving code from main() 
-	to tmpfile_open()
-
-Sat Aug 30 23:13:01 CEST 2003  Vid Strpic  <vms@bofhlet.net>
-
-	* src/info.c:
-	If bzip2 support is compiled in, `--help' command should list
-	`bz2mbox' as a valid option to `--mailbox-format='.
-
-Sun Aug 24 21:49:52 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* doc/mboxgrep.1, doc/mboxgrep.texi:
-	small updates
-
-Sat Aug 23 20:56:39 CEST 2003  James P. Dugal  <jpd@louisiana.edu>
-
-	* src/main.c, src/mbox.h, src/mbox.c
-	If we are to use rename() to move a temp file (resulting from
-	deletions done in a mailbox) back over the original mailbox, we
-	must be sure the temp file is on the same file system.  Also,
-	we should try to preserve the same ownership and permissions.
-
-Mon Aug 11 00:39:14 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* configure.ac:
-	look for pcre-config(1) script; this effectively fixes a
-	compilation bug on recent RedHat Linux systems
-
-Sun Apr 13 21:16:25 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/info.c, src/info.h:
-	print_wrap(); list of compile-time options is now printed wrapped
-
-Mon Apr  7 01:24:20 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/mbox.c, src/wrap.c, src/wrap.h:
-	m_gzdopen()
-
-Sun Apr  6 23:04:19 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/mbox.c, src/mbox.h, src/mboxgrep.h, src/misc.c, src/scan.c:
-	support for bzip2 compressed mailboxes
-
-Fri Apr  4 00:14:01 CEST 2003  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* configure.ac:
-	check for libbz2
-
-Sun Oct 27 23:57:31 CET 2002  Daniel Spiljar  <dspiljar@world.std.com>
-
-	* src/mbox.c:
-	mbox_open() should now complain if called with an unknown argument
-	mode.  Shouldn't normally happen, but...
-
-Sun Aug 25 22:43:38 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/mbox.c, src/mbox.h, src/scan.c:
-	removed the gzmbox* functions in order to avoid code duplication;
-	as a side effect, mboxgrep can now read compressed mbox folders
-	from standard input
-
-Sun Aug 11 01:36:02 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* configure.ac:
-	AC_HEADER_STDC, which fixed another compiler warning
-
-Sat Aug 10 22:03:31 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/mbox.c, src/mh.c, src/scan.c, src/misc.c, src/maildir.c, src/mboxgrep.h:
-	made various code cleanups: got rid of a couple of global variables,
-	fixed compiler warnings and things like that
-
-Sat Aug 10 00:35:21 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mh.h, src/wrap.h, src/mboxgrep.h:
-	removed some unnecessary #defines that have been causing compiler
-	errors
-
-Sun Aug  4 20:11:29 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/scan.c, src/scan.h:
-	code clean up: moved recursive scan code from main()
-	to recursive_scan()
-
-Wed Jul 24 00:20:59 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/maildir.c:
-	same thing with maildir as with MH below
-
-Sat Jul  6 22:51:45 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mh.c:
-	MH module doesn't read files which aren't RFC 2822 messages anymore
-
-Sat Jun 29 01:43:36 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* configure.in, src/maildir.c, src/main.c, src/mbox.c, src/mh.c, src/scan.c:
-	added debugging with dmalloc library
-
-Sat Jun 29 01:39:21 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mbox.c, src/maildir.c:
-	fixed potential problem as with MH folders (below)
-
-Sat Jun 29 01:28:30 CEST 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mh.c, src/scan.c:
-	(hopefully) fixed crashes on MH folders
-
-Sat Feb 23 22:22:12 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mbox.c, src/maildir.c, src/mh.c, src/misc.c:
-	removed useless code that required strptime ()
-
-Sat Feb 23 15:43:05 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/mbox.h, src/mbox.c, src/scan.c:
-	mboxgrep can now read mbox folders from standard input
-
-Fri Feb  8 02:15:36 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c:
-	fixed a bug which prevented mboxgrep from being compiled;
-	this happened because I've put some assignments *before*
-	declarations
-
-Wed Feb  6 23:11:50 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-	
-	* src/maildir.c, src/main.c, src/mbox.c, src/mboxgrep.h, src/mh.c, src/mh.h, src/misc.c, src/scan.c, src/wrap.c
-	code cleanups; many global variables have been replaced with
-	a single option_t structure
-
-Fri Feb  1 00:31:05 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/maildir.c:
-	fixed a bug which occured on recursive search of maildirs
-
-Wed Jan  2 00:32:37 CET 2002  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/misc.c, src/wrap.h:
-	applied a patch (kindly submitted by John R. Daily 
-	<jdaily@progeny.com>), which fixes missing prototypes that might 
-	cause mboxgrep to coredump on IA64 platform
-
-Sat Dec 15 20:12:40 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/scan.c, src/scan.h:
-	recursive search through directories has been reimplemented
-
-Sat Dec  8 22:13:54 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/main.c, src/maildir.c:
-	replaced remaining occurences of malloc() with xmalloc()
-
-Sat Dec  8 21:21:58 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/maildir.c, src/main.c, src/mbox.c, src/mh.c, src/misc.c, src/scan.c, src/wrap.c, src/wrap.h:
-	wrote xstrdup(), an error-checking wrapper around strdup() and 
-	replaced all occurences of strdup() with xstrdup()
-
-Sun Dec  2 18:05:57 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/Makefile.in, src/info.c, src/main.c, src/mboxgrep.h, src/md5.c, src/md5.h, src/scan.c, src/scan.h, doc/mboxgrep.texi:
-	mboxgrep can now ignore duplicate messages, thanks to the MD5 
-	algorithm
-
-	* src/maildir.c, src/main.c, src/scan.c, src/wrap.c, src/wrap.h:
-	wrote xcalloc() and renamed m_realloc() to xrealloc()
-
-Sat Nov 17 22:57:57 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mbox.c, src/mh.c, src/maildir.c
-	message->headers and message->body pointers are now initially malloc'd
-	to size of one character in order to prevent NULL pointers from being 
-	passed to regexec()
-
-Wed Nov  7 22:47:34 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-	
-	* configure.ac, src/mboxgrep.h, src/main.c, src/misc.h, src/misc.c, src/info.c, src/config.h, src/mbox.c:
-	file locking method can now be selected at run time
-
-	* src/info.c, src/maildir.c, src/main.c, src/mbox.h, src/misc.c, src/scan.c, src/Makefile.in
-	changed `#include "config.h"' to `#include <config.h>', and fixed 
-	other bugs with #including
-
-Sat Nov  3 16:08:22 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-	
-	* configure.ac, src/config.h.in, src/info.c, src/mbox.c
-	files can be locked with flock() instead of fcntl(), if
-	enabled at compile time
-
-Sun Oct 28 19:01:44 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/Makefile.in:
-	forgot to mention getopt.c and getopt1.c 
-
-Sun Oct 28 16:06:28 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/mh.c, src/main.c, src/scan.c:
-	#included certain neccessary files
-	
-Sun Oct 28 14:43:21 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/maildir.c, src/maildir.h, src/scan.c:
-	wrote functions maildir_check and maildir_create;
-	if the target maildir doesn't exist, mboxgrep creates one;
-	if it does exist, mboxgrep checks its consistency and refuses to
-	write to it unless `tmp', `new' and `cur' subdirectories exist
-
-Sun Oct 28 13:02:10 CET 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/info.c, doc/mboxgrep.texi, doc/mboxgrep.1
-	the "--regexp" command was implemented in version 0.7.0, but I
-	forgot to document it
-
-Sat Oct 27 21:48:36 CEST 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/scan.c:
-	if the input is a non-mbox folder, a proper postmark line (with 
-	date) is put on top of each message written to stdout
-
-Mon Oct  8 22:53:34 CEST 2001  Daniel Spiljar  <dspiljar@bofhlet.net>
-
-	* src/*:
-	source code now completely rewritten
-
-Sun May 27 00:19:52 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* doc/mboxgrep.1:
-	updated the manual page -- it now refers to RFC 2822, instead
-	of the obsoleted 822
-
-Tue May  1 15:06:03 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* configure.in, doc/Makefile.in, src/Makefile.in, Makefile.in:
-	moved manpage to the `doc' subdirectory; changed files above
-	accordingly
-
-Sun Apr 15 23:00:08 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* src/mboxgrep.h, src/main.c, src/file.c, src/scan.c, src/info.c: 
-	added support for writing messages to another mail folder
-
-Mon Apr  9 21:55:15 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* src/file.c, src/scan.c: all calls of malloc() are now checked 
-	and mboxgrep exits with code 2 if it fails to allocate memory
-
-Sun Apr  8 19:40:33 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* src/mboxgrep.h, src/main.c: wrote mboxgrep_stat()
-
-Sun Apr  8 16:58:36 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* src/mboxgrep.h, src/main.c: wrote mboxgrep_error()
-
-Tue Mar 27 01:26:22 CEST 2001  Daniel Spiljar  <dspiljar@public.srce.hr>
-
-	* configure.in: check for gethostname()
-
-
-
-$Id: ChangeLog,v 1.59 2006-10-22 23:34:47 dspiljar Exp $

INSTALL.md

@@ -0,0 +1,22 @@
+# 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:
+
+```
+./configure
+make
+make install # root rights probably needed here, prefix with sudo in such case
+```
+
+To see the list of flags accepted by the configure script, run:
+
+```
+./configure --help
+```
+
+Optionally, `mboxgrep` can be linked with the following libraries:
+
+- PCRE, 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 @@
+SUBDIRS = doc src

Makefile.in

@@ -1,37 +1,759 @@
-#  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
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
 
-# $Id: Makefile.in,v 1.1 2001-10-26 13:07:28 dspiljar Exp $
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
-SHELL           =       /bin/sh
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-all: 
-	cd src; $(MAKE) 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-clean:
-	cd src; $(MAKE) clean
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = .
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+  distclean-recursive maintainer-clean-recursive
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir distdir-am dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+CSCOPE = cscope
+DIST_SUBDIRS = $(SUBDIRS)
+am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS compile depcomp \
+	install-sh missing
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+# Exists only to be overridden by the user if desired.
+AM_DISTCHECK_DVI_TARGET = dvi
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CONFIG = @PCRE_CONFIG@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+SUBDIRS = doc src
+all: all-recursive
 
-distclean:
-	rm -f *~ Makefile config.status config.log config.cache
-	cd src; $(MAKE) distclean
-	cd doc; $(MAKE) distclean
+.SUFFIXES:
+am--refresh: Makefile
+	@:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
+	esac;
 
-install:
-	cd src; $(MAKE) install
-	cd doc; $(MAKE) install
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	$(SHELL) ./config.status --recheck
 
+$(top_srcdir)/configure:  $(am__configure_deps)
+	$(am__cd) $(srcdir) && $(AUTOCONF)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+$(am__aclocal_m4_deps):
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
+	dot_seen=no; \
+	target=`echo $@ | sed s/-recursive//`; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
+	  echo "Making $$target in $$subdir"; \
+	  if test "$$subdir" = "."; then \
+	    dot_seen=yes; \
+	    local_target="$$target-am"; \
+	  else \
+	    local_target="$$target"; \
+	  fi; \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  || eval $$failcom; \
+	done; \
+	if test "$$dot_seen" = "no"; then \
+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+	fi; test -z "$$fail"
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+	  include_option=--etags-include; \
+	  empty_fix=.; \
+	else \
+	  include_option=--include; \
+	  empty_fix=; \
+	fi; \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    test ! -f $$subdir/TAGS || \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+	  fi; \
+	done; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	$(am__remove_distdir)
+	test -d "$(distdir)" || mkdir "$(distdir)"
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
+		am__remove_distdir=: \
+		am__skip_length_check=: \
+		am__skip_mode_fix=: \
+	        distdir) \
+	      || exit 1; \
+	  fi; \
+	done
+	-test -n "$(am__skip_mode_fix)" \
+	|| find "$(distdir)" -type d ! -perm -755 \
+		-exec chmod u+rwx,go+rx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r "$(distdir)"
+dist-gzip: distdir
+	tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
+	$(am__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-zstd: distdir
+	tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	case '$(DIST_ARCHIVES)' in \
+	*.tar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
+	*.tar.bz2*) \
+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
+	*.tar.xz*) \
+	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+	*.tar.Z*) \
+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+	*.shar.gz*) \
+	  eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
+	*.zip*) \
+	  unzip $(distdir).zip ;;\
+	*.tar.zst*) \
+	  zstd -dc $(distdir).tar.zst | $(am__untar) ;;\
+	esac
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
+	chmod a-w $(distdir)
+	test -d $(distdir)/_build || exit 0; \
+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
+	  && am__cwd=`pwd` \
+	  && $(am__cd) $(distdir)/_build/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
+	        distuninstallcheck \
+	  && chmod -R a-w "$$dc_install_base" \
+	  && ({ \
+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
+	  && rm -rf "$$dc_destdir" \
+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
+	  && rm -rf $(DIST_ARCHIVES) \
+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
+	  && cd "$$am__cwd" \
+	  || exit 1
+	$(am__post_remove_distdir)
+	@(echo "$(distdir) archives ready for distribution: "; \
+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+distuninstallcheck:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { echo "ERROR: files left after uninstall:" ; \
+	        if test -n "$(DESTDIR)"; then \
+	          echo "  (check DESTDIR support)"; \
+	        fi ; \
+	        $(distuninstallcheck_listfiles) ; \
+	        exit 1; } >&2
+distcleancheck: distclean
+	@if test '$(srcdir)' = . ; then \
+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+	  exit 1 ; \
+	fi
+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
+	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+html-am:
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-recursive
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-recursive
+
+install-html-am:
+
+install-info: install-info-recursive
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-recursive
+
+install-pdf-am:
+
+install-ps: install-ps-recursive
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+	-rm -rf $(top_srcdir)/autom4te.cache
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
+	dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
+	dist-zstd distcheck distclean distclean-generic distclean-tags \
+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags tags-am uninstall uninstall-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

NEWS

@@ -1,110 +0,0 @@
-Changes of mboxgrep
-===================
-
-Changes since 0.7.9
-- fixed compile bug on FreeBSD and other systems
-- fixed deleting messages mbox folders compressed with bzip2
-
-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
-  on recent RedHat Linux systems
-- fixed a problem with message deletion, which used to occur if an mbox
-  folder and temporary directory were on different filesystems;
-  thanks to James P. Dugal <jpd@louisiana.edu> for providing a patch
-
-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
-- debugging with dmalloc library
-- MH and maildir functions no longer read files which aren't RFC 2822 messages
-- 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
-- mboxgrep can now read mbox folders from standard input
-
-Changes since 0.7.6
-- fixed a bug which prevented mboxgrep from being compiled
-
-Changes since 0.7.5
-- fixed a bug which caused mboxgrep to coredump on recursive search of 
-  maildirs
-- code cleanups
-
-Changes since 0.7.4
-- recursive search through directories has been reimplemented
-
-Changes since 0.7.3
-- mboxgrep can now ignore messages with identical bodies
-
-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 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 since 0.7.0
-- bugfixes
-
-Changes since 0.5.3
-- NOTE: there was no stable version between 0.5.x and 0.7.x
-- mboxgrep is almost completely rewritten
-- implemented message deleting feature (--delete)
-- implemented piping messages to a command (--pipe) (using this option, 
-  each selected message is piped to a separate instance of the specified
-  command)
-- added support for compressed mbox folders
-
-Changes since 0.5.2
-- implemented ability to write found messages to another folder (instead
-  of stdout)
-- started writing *real* changelog (while this file has been renamed to
-  "NEWS")
-- wrote a manual in Texinfo format
-
-Changes since 0.5.1
-- implemented message counting (-c, --count)
-- fixed manual page installation target in src/Makefile.in -- manual page 
-  is now installed in $(manpath)/man1/ rather than in $(prefix)/man/man1/ 
-- added `--without-sense-of-humor' switch to the configure script, which
-  disables checking whether Garfield still hates Mondays
-- short version of `--version' switch is now `-V' instead of `-v', 
-  because `-v' will be used for inverted matching
-- implemented inverted matching (-v, --invert-match)
-- implemented recursive search through directories (-r, --recursive)
-- config.h[.in] is now wrapped (#ifndef CONFIG_H and stuff)
-
-Changes since 0.5.0
-- added support for qmail-style maildir folders
-
-Changes since 0.4.0
-- 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
-- added support for MH mailboxes
-- added scope selection switches `-B' (or `--body') and `-H' (or `--headers')
-- getopt() (or getopt_long(), if available) is now used to parse command line
-  arguments, instead of my own lousy routine
-- configure script now looks for PCRE by default, unless `--with-pcre=no' or
-  `--without-pcre' is specified
-- the feature of reading from standard input is gone
-- added `-v' (or `--version') switch
-
-Changes since 0.1.1
-- mboxgrep now puts a shared lock on a mailbox before reading it
-- various code cleanups
-
-Changes since 0.1.0
-- fixed install target in Makefile (`install' is now used instead of `cp')
-- added support for mailboxes generated by Gnus
-
-
-$Id: NEWS,v 1.23 2004-04-11 21:48:53 dspiljar Exp $

NEWS.md

@@ -0,0 +1,134 @@
+# Changes of mboxgrep
+
+## 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
+- moved the source tree to git
+- fixed compile bug on FreeBSD and other systems
+- fixed deleting messages mbox folders compressed with bzip2
+- fixed multiple compilation errors and warnings on Linux and FreeBSD
+- started implementing a debug mode
+
+## 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
+  on recent RedHat Linux systems
+- fixed a problem with message deletion, which used to occur if an mbox
+  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
+
+- fixed crashes on MH folders, as well as a potential problem with mbox
+  and maildir folders with the same cause
+- debugging with the dmalloc library
+- MH and maildir functions no longer read files which aren't RFC 2822 messages
+- 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
+
+- mboxgrep can now read mbox folders from standard input
+
+## Changes since 0.7.6
+
+- fixed a bug which prevented mboxgrep from being compiled
+
+## Changes since 0.7.5
+
+- fixed a bug which caused mboxgrep to coredump on recursive search of 
+  maildirs
+- code cleanups
+
+## Changes since 0.7.4
+
+- recursive search through directories has been reimplemented
+
+## Changes since 0.7.3
+
+- mboxgrep can now ignore messages with identical bodies
+
+## 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 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 since 0.7.0
+
+- bugfixes
+
+## Changes since 0.5.3
+
+- NOTE: there was no stable version between 0.5.x and 0.7.x
+- mboxgrep is almost completely rewritten
+- implemented message deleting feature (`--delete`)
+- implemented piping messages to a command (`--pipe`) (using this option, 
+  each selected message is piped to a separate instance of the specified
+  command)
+- added support for compressed mbox folders
+
+## Changes since 0.5.2
+
+- implemented ability to write found messages to another folder (instead
+  of standard output)
+- started writing a *real* changelog (while this file has been renamed to
+  "NEWS")
+- wrote a manual in Texinfo format
+
+## Changes since 0.5.1
+
+- implemented message counting (`-c, --count`)
+- fixed manual page installation target in src/Makefile.in -- manual page 
+  is now installed in `$(manpath)/man1/` rather than `$(prefix)/man/man1/`
+- added `--without-sense-of-humor` switch to the configure script, which
+  disables checking whether Garfield still hates Mondays
+- short version of `--version` switch is now `-V` instead of `-v`, 
+  because `-v` will be used for inverted matching
+- implemented inverted matching (`-v, --invert-match`)
+- implemented recursive search through directories (`-r, --recursive`)
+- config.h[.in] is now wrapped (`#ifndef CONFIG_H` and stuff)
+
+## Changes since 0.5.0
+
+- added support for qmail-style maildir folders
+
+## 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 since 0.2.0
+
+- added support for MH mailboxes
+- added scope selection switches `-B` (or `--body`) and `-H` (or `--headers`)
+- `getopt()` (or `getopt_long()`, if available) is now used to parse command line
+  arguments, instead of my own lousy routine
+- the configure script now looks for PCRE by default, unless `--with-pcre=no` or
+  `--without-pcre` is specified
+- the feature of reading from standard input is gone
+- added `-v` (or `--version`) switch
+
+## Changes since 0.1.1
+
+- mboxgrep now puts a shared lock on a mailbox before reading it
+- various code cleanups
+
+## Changes since 0.1.0
+
+- fixed install target in Makefile (`install` is now used instead of `cp`)
+- added support for mailboxes generated by Gnus

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 pattern.
 
 Full description of mboxgrep is contained in the documentation,
 which is provided both in manpage and texinfo format, to satisfy
@@ -11,5 +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`.

TODO.md

@@ -1,21 +1,38 @@
+# The TODO list for mboxgrep
+
+## Behavior
+
+- [x] use cryptographic hashes for detecting duplicate messages
+- [ ] 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] implement inverted matching
-- [x] re-implement recursive search through directories
-- [ ] implement literal date matching
+- [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
+
+## File formats, encodings and standards
+
+- [ ] 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
+
+## Miscellaneous
+
 - [x] write Texinfo documentation
-- [x] implement writing selected messages to a new folder
-- [x] implement deleting selected messages
-- [ ] add support for config files
-- [x] add support for reading messages from stdin
-- [x] add support for compressed mbox folders
+- [ ] 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()
-- [x] allow run-time selection of file locking method
-- [ ] make mboxgrep understand MIME
-- [x] enable removing duplicate messages w/ MD5 checksums
-- [ ] add checking for conflicting command-line options
-- [ ] add support for GnuPG
-- [x] add support for bzip2 compression
-- [ ] add support for mail folder conversion

compile

@@ -0,0 +1,348 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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, 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, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN* | MSYS*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/* | msys/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

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.11], [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.

contrib/README

@@ -1,5 +0,0 @@
-This directory is intended to hold third-party contributions.
-
-- mboxgrep.spec is an RPM spec file, kindly contributed by 
-		Vaclav Slavik <v.slavik@volny.cz>
-

contrib/README.md

@@ -0,0 +1,3 @@
+This directory is intended to hold third-party contributions.
+
+- mboxgrep.spec is an RPM spec file, kindly contributed by Vaclav Slavik <v.slavik AT volny.cz>

depcomp

@@ -0,0 +1,791 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1999-2020 Free Software Foundation, Inc.
+
+# 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, 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, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
+
+case $1 in
+  '')
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+  depmode     Dependency tracking mode.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
+  DEPDIR      directory where to store dependencies.
+  depfile     Dependency file to output.
+  tmpdepfile  Temporary file to use when outputting dependencies.
+  libtool     Whether libtool is used (yes/no).
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "depcomp $scriptversion"
+    exit $?
+    ;;
+esac
+
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
+  exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
+# Some modes work just like other modes, but use different flags.  We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write.  Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+  # HP compiler uses -M and no extra arg.
+  gccflag=-M
+  depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff.  Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am.  Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+  for arg
+  do
+    case $arg in
+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+    *)  set fnord "$@" "$arg" ;;
+    esac
+    shift # fnord
+    shift # $arg
+  done
+  "$@"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  ;;
+
+gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
+## There are various ways to get dependency output from gcc.  Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+##   up in a subdir.  Having to rename by hand is ugly.
+##   (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
+## - Using -M directly means running the compiler twice (even worse
+##   than renaming).
+  if test -z "$gccflag"; then
+    gccflag=-MD,
+  fi
+  "$@" -Wp,"$gccflag$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
+  sed -e 's/^[^:]*: / /' \
+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
+## This next piece of magic avoids the "deleted header file" problem.
+## The problem is that when a header file which appears in a .P file
+## is deleted, the dependency causes make to die (because there is
+## typically no way to rebuild the header).  We avoid this by adding
+## dummy dependencies for each header file.  Too bad gcc doesn't do
+## this for us directly.
+## Some versions of gcc put a space before the ':'.  On the theory
+## that the space means something, we add a space to the output as
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
+## Some versions of the HPUX 10.20 sed can't process this invocation
+## correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+sgi)
+  if test "$libtool" = yes; then
+    "$@" "-Wp,-MDupdate,$tmpdepfile"
+  else
+    "$@" -MDupdate "$tmpdepfile"
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+
+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
+    echo "$object : \\" > "$depfile"
+    # Clip off the initial element (the dependent).  Don't try to be
+    # clever and replace this with sed code, as IRIX sed won't handle
+    # lines with more than a fixed number of characters (4096 in
+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
+    # the IRIX cc adds comments like '#:fec' to the end of the
+    # dependency line.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
+    # The second pass generates a dummy entry for each header file.
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile"
+  ;;
+
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+aix)
+  # The C for AIX Compiler uses -M and outputs the dependencies
+  # in a .u file.  In older versions, this file always lives in the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
+  # start of each line; $object doesn't have directory information.
+  # Version 6 uses the directory in both cases.
+  set_dir_from "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$base.u
+    tmpdepfile3=$dir.libs/$base.u
+    "$@" -Wc,-M
+  else
+    tmpdepfile1=$dir$base.u
+    tmpdepfile2=$dir$base.u
+    tmpdepfile3=$dir$base.u
+    "$@" -M
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
+  #    foo.o: sub/foo.c sub/foo.h
+  # and will wrap long lines using '\' :
+  #    foo.o: sub/foo.c ... \
+  #     sub/foo.h ... \
+  #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
+
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  # Each line is of the form `foo.o: dependent.h',
+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Do two passes, one to just change these to
+  # `$object: dependent.h' and one to simply `dependent.h:'.
+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+hp2)
+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
+  # compilers, which have integrated preprocessors.  The correct option
+  # to use with these is +Maked; it writes dependencies to a file named
+  # 'foo.d', which lands next to the object file, wherever that
+  # happens to be.
+  # Much of this is similar to the tru64 case; see comments there.
+  set_dir_from  "$object"
+  set_base_from "$object"
+  if test "$libtool" = yes; then
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir.libs/$base.d
+    "$@" -Wc,+Maked
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    "$@" +Maked
+  fi
+  stat=$?
+  if test $stat -ne 0; then
+     rm -f "$tmpdepfile1" "$tmpdepfile2"
+     exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  if test -f "$tmpdepfile"; then
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
+  else
+    make_dummy_depfile
+  fi
+  rm -f "$tmpdepfile" "$tmpdepfile2"
+  ;;
+
+tru64)
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+#nosideeffect)
+  # This comment above is used by automake to tell side-effect
+  # dependency tracking mechanisms from slower ones.
+
+dashmstdout)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout, regardless of -o.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  test -z "$dashmflag" && dashmflag=-M
+  # Require at least two characters before searching for ':'
+  # in the target name.  This is to cope with DOS-style filenames:
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
+  "$@" $dashmflag |
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
+  rm -f "$depfile"
+  cat < "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+dashXmstdout)
+  # This case only exists to satisfy depend.m4.  It is never actually
+  # run, as this mode is specially recognized in the preamble.
+  exit 1
+  ;;
+
+makedepend)
+  "$@" || exit $?
+  # Remove any Libtool call
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+  # X makedepend
+  shift
+  cleared=no eat=no
+  for arg
+  do
+    case $cleared in
+    no)
+      set ""; shift
+      cleared=yes ;;
+    esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
+    case "$arg" in
+    -D*|-I*)
+      set fnord "$@" "$arg"; shift ;;
+    # Strip any option that makedepend may not understand.  Remove
+    # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
+    -*|$object)
+      ;;
+    *)
+      set fnord "$@" "$arg"; shift ;;
+    esac
+  done
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  touch "$tmpdepfile"
+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
+  rm -f "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile" "$tmpdepfile".bak
+  ;;
+
+cpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  # Remove '-o $object'.
+  IFS=" "
+  for arg
+  do
+    case $arg in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    *)
+      set fnord "$@" "$arg"
+      shift # fnord
+      shift # $arg
+      ;;
+    esac
+  done
+
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvisualcpp)
+  # Important note: in order to support this mode, a compiler *must*
+  # always write the preprocessed file to stdout.
+  "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
+  IFS=" "
+  for arg
+  do
+    case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
+        set fnord "$@"
+        shift
+        shift
+        ;;
+    *)
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
+    esac
+  done
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
+none)
+  exec "$@"
+  ;;
+
+*)
+  echo "Unknown depmode $depmode" 1>&2
+  exit 1
+  ;;
+esac
+
+exit 0
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

doc/Makefile.am

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

doc/Makefile.in

@@ -1,41 +1,760 @@
-#  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
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
 
-# $Id: Makefile.in,v 1.1 2001-10-26 13:07:55 dspiljar Exp $
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
-MANPAGE		=	mboxgrep.1
-INSTALL		=	@INSTALL@
-prefix		=	@prefix@
-mandir		=	@mandir@
-infodir		=	@infodir@
-SHELL 		= 	/bin/sh
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-.PHONY: all
-all:
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
 
-.PHONY: distclean
-distclean:
-	rm -f *~ Makefile
+@SET_MAKE@
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+subdir = doc
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+SOURCES =
+DIST_SOURCES =
+AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+am__v_DVIPS_1 = 
+AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
+am__v_MAKEINFO_1 = 
+AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
+am__v_INFOHTML_1 = 
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
+am__v_TEXI2DVI_1 = 
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
+am__v_TEXI2PDF_1 = 
+AM_V_texinfo = $(am__v_texinfo_@AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 = 
+AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 = 
+INFO_DEPS = $(srcdir)/mboxgrep.info
+am__TEXINFO_TEX_DIR = $(srcdir)
+DVIS = mboxgrep.dvi
+PDFS = mboxgrep.pdf
+PSS = mboxgrep.ps
+HTMLS = mboxgrep.html
+TEXINFOS = mboxgrep.texi
+TEXI2DVI = texi2dvi
+TEXI2PDF = $(TEXI2DVI) --pdf --batch
+MAKEINFOHTML = $(MAKEINFO) --html
+AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
+DVIPS = dvips
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man1_MANS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+am__DIST_COMMON = $(srcdir)/Makefile.in texinfo.tex
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CONFIG = @PCRE_CONFIG@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+man1_MANS = mboxgrep.1
+info_TEXINFOS = mboxgrep.texi
+all: all-am
 
-.PHONY: install
-install: mboxgrep.1
-	$(INSTALL) -d $(mandir)/man1
-	$(INSTALL) -m 0644 $(MANPAGE) $(mandir)/man1
-	$(INSTALL) -d $(infodir)
-	$(INSTALL) -m 0644 mboxgrep.info $(infodir)
+.SUFFIXES:
+.SUFFIXES: .dvi .html .info .pdf .ps .texi
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign doc/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
 
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+.texi.info:
+	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
+	rm -rf $$backupdir && mkdir $$backupdir && \
+	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
+	  for f in $@ $@-[0-9] $@-[0-9][0-9] $(@:.info=).i[0-9] $(@:.info=).i[0-9][0-9]; do \
+	    if test -f $$f; then mv $$f $$backupdir; restore=mv; else :; fi; \
+	  done; \
+	else :; fi && \
+	cd "$$am__cwd"; \
+	if $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $@ $<; \
+	then \
+	  rc=0; \
+	  $(am__cd) $(srcdir); \
+	else \
+	  rc=$$?; \
+	  $(am__cd) $(srcdir) && \
+	  $$restore $$backupdir/* `echo "./$@" | sed 's|[^/]*$$||'`; \
+	fi; \
+	rm -rf $$backupdir; exit $$rc
+
+.texi.dvi:
+	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	$<
+
+.texi.pdf:
+	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
+	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	$<
+
+.texi.html:
+	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	 -o $(@:.html=.htp) $<; \
+	then \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
+	else \
+	  rm -rf $(@:.html=.htp); exit 1; \
+	fi
+$(srcdir)/mboxgrep.info: mboxgrep.texi 
+mboxgrep.dvi: mboxgrep.texi 
+mboxgrep.pdf: mboxgrep.texi 
+mboxgrep.html: mboxgrep.texi 
+.dvi.ps:
+	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) $(AM_V_texinfo) -o $@ $<
+
+uninstall-dvi-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(dvidir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(dvidir)/$$f"; \
+	done
+
+uninstall-html-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(HTMLS)'; test -n "$(htmldir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " rm -rf '$(DESTDIR)$(htmldir)/$$f'"; \
+	  rm -rf "$(DESTDIR)$(htmldir)/$$f"; \
+	done
+
+uninstall-info-am:
+	@$(PRE_UNINSTALL)
+	@if test -d '$(DESTDIR)$(infodir)' && $(am__can_run_installinfo); then \
+	  list='$(INFO_DEPS)'; \
+	  for file in $$list; do \
+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' --remove '$(DESTDIR)$(infodir)/$$relfile'"; \
+	    if install-info --info-dir="$(DESTDIR)$(infodir)" --remove "$(DESTDIR)$(infodir)/$$relfile"; \
+	    then :; else test ! -f "$(DESTDIR)$(infodir)/$$relfile" || exit 1; fi; \
+	  done; \
+	else :; fi
+	@$(NORMAL_UNINSTALL)
+	@list='$(INFO_DEPS)'; \
+	for file in $$list; do \
+	  relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	  relfile_i=`echo "$$relfile" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  (if test -d "$(DESTDIR)$(infodir)" && cd "$(DESTDIR)$(infodir)"; then \
+	     echo " cd '$(DESTDIR)$(infodir)' && rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]"; \
+	     rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9] $$relfile_i[0-9] $$relfile_i[0-9][0-9]; \
+	   else :; fi); \
+	done
+
+uninstall-pdf-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(pdfdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(pdfdir)/$$f"; \
+	done
+
+uninstall-ps-am:
+	@$(NORMAL_UNINSTALL)
+	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(psdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(psdir)/$$f"; \
+	done
+
+dist-info: $(INFO_DEPS)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	list='$(INFO_DEPS)'; \
+	for base in $$list; do \
+	  case $$base in \
+	    $(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
+	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
+	  base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
+	    if test -f $$file; then \
+	      relfile=`expr "$$file" : "$$d/\(.*\)"`; \
+	      test -f "$(distdir)/$$relfile" || \
+		cp -p $$file "$(distdir)/$$relfile"; \
+	    else :; fi; \
+	  done; \
+	done
+
+mostlyclean-aminfo:
+	-rm -rf mboxgrep.t2d mboxgrep.t2p
+
+clean-aminfo:
+	-test -z "mboxgrep.dvi mboxgrep.pdf mboxgrep.ps mboxgrep.html" \
+	|| rm -rf mboxgrep.dvi mboxgrep.pdf mboxgrep.ps mboxgrep.html
+
+maintainer-clean-aminfo:
+	@list='$(INFO_DEPS)'; for i in $$list; do \
+	  i_i=`echo "$$i" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
+	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
+	done
+install-man1: $(man1_MANS)
+	@$(NORMAL_INSTALL)
+	@list1='$(man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
+	done; \
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
+uninstall-man1:
+	@$(NORMAL_UNINSTALL)
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
+tags TAGS:
+
+ctags CTAGS:
+
+cscope cscopelist:
+
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-info
+check-am: all-am
+check: check-am
+all-am: Makefile $(INFO_DEPS) $(MANS)
+installdirs:
+	for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-aminfo clean-generic mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am: $(DVIS)
+
+html: html-am
+
+html-am: $(HTMLS)
+
+info: info-am
+
+info-am: $(INFO_DEPS)
+
+install-data-am: install-info-am install-man
+
+install-dvi: install-dvi-am
+
+install-dvi-am: $(DVIS)
+	@$(NORMAL_INSTALL)
+	@list='$(DVIS)'; test -n "$(dvidir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(dvidir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(dvidir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(dvidir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(dvidir)" || exit $$?; \
+	done
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am: $(HTMLS)
+	@$(NORMAL_INSTALL)
+	@list='$(HTMLS)'; list2=; test -n "$(htmldir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  $(am__strip_dir) \
+	  d2=$$d$$p; \
+	  if test -d "$$d2"; then \
+	    echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \
+	    echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \
+	    $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \
+	  else \
+	    list2="$$list2 $$d2"; \
+	  fi; \
+	done; \
+	test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \
+	done; }
+install-info: install-info-am
+
+install-info-am: $(INFO_DEPS)
+	@$(NORMAL_INSTALL)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(infodir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(infodir)" || exit 1; \
+	fi; \
+	for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	  esac; \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  file_i=`echo "$$file" | sed 's|\.info$$||;s|$$|.i|'`; \
+	  for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9] \
+	               $$d/$$file_i[0-9] $$d/$$file_i[0-9][0-9] ; do \
+	    if test -f $$ifile; then \
+	      echo "$$ifile"; \
+	    else : ; fi; \
+	  done; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done
+	@$(POST_INSTALL)
+	@if $(am__can_run_installinfo); then \
+	  list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \
+	  for file in $$list; do \
+	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
+	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
+	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
+	  done; \
+	else : ; fi
+install-man: install-man1
+
+install-pdf: install-pdf-am
+
+install-pdf-am: $(PDFS)
+	@$(NORMAL_INSTALL)
+	@list='$(PDFS)'; test -n "$(pdfdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pdfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pdfdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pdfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pdfdir)" || exit $$?; done
+install-ps: install-ps-am
+
+install-ps-am: $(PSS)
+	@$(NORMAL_INSTALL)
+	@list='$(PSS)'; test -n "$(psdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(psdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(psdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(psdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(psdir)" || exit $$?; done
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-aminfo \
+	maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-aminfo mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am: $(PDFS)
+
+ps: ps-am
+
+ps-am: $(PSS)
+
+uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
+	uninstall-man uninstall-pdf-am uninstall-ps-am
+
+uninstall-man: uninstall-man1
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-aminfo clean-generic \
+	cscopelist-am ctags-am dist-info distclean distclean-generic \
+	distdir dvi dvi-am html html-am info info-am install \
+	install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-man1 install-pdf install-pdf-am install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-aminfo \
+	maintainer-clean-generic mostlyclean mostlyclean-aminfo \
+	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dvi-am uninstall-html-am \
+	uninstall-info-am uninstall-man uninstall-man1 \
+	uninstall-pdf-am uninstall-ps-am
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

doc/mboxgrep.1

@@ -1,5 +1,4 @@
-.Id $Id: mboxgrep.1,v 1.16 2006-01-18 00:09:58 dspiljar Exp $
-.TH MBOXGREP 1 "26 Jan 2023"
+.TH MBOXGREP 1 "24 Mar 2023"
 .SH NAME
 mboxgrep \- displays email messages matching a pattern
 .SH SYNOPSIS
@@ -11,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.11 .
 .PP
 .B mboxgrep
 scans a
@@ -84,14 +83,18 @@ caution.
 Ignore duplicate messages.
 .IP "-m, --mailbox-format=TYPE"
 Select input and output mailbox TYPE.  TYPE can be either `mbox' (default), 
-`zmbox' (meaning `gzip compressed mbox'), `bz2mbox' (meaning `bzip2
-compressed mbox'), `mh', `nnml', `nnmh' or `maildir'.
+`zmbox' (gzip compressed mbox), `bz2mbox' (bzip2 compressed mbox), `mh', `nnml', 
+`nnmh' or `maildir'.
+.IP "-s, --no-messages"
+Suppress most error messages.
+.IP "--debug"
+Print messages useful for debugging.
 .SH EXAMPLES
 .TP
 \(bu
 Search $MAIL for messages from Dirty Harry:
 .PP
-mboxgrep '^From:.*callahan@homicide\\.SFPD\\.gov' $MAIL
+mboxgrep '^From:.*callahan@sanfranciscopolice\\.org' $MAIL
 .TP
 \(bu
 Display all messages contained in folder ~/Mail/incoming, except those
@@ -100,9 +103,6 @@ that appear to originate from AOL:
 mboxgrep -v 'Received:.*aol\\.com' ~/Mail/incoming
 .SH BUGS
 Report them to address below.
-.SH NOTICE
-Mboxgrep was alomost completely rewritten since version 0.5.3.  Additionally, 
-there was no stable 0.6.x branch between 0.5.3 and 0.7.0.
 .SH SEE ALSO
 grep(1),
 regex(7),

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.11), a mailbox scanning
 utility.
 
    Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
@@ -169,6 +169,9 @@ options below change such behavior.
 '-s'
      Suppress error messages.
 
+'--debug'
+     Print messages useful for debugging.
+
 
 File: mboxgrep.info,  Node: Search scope selection,  Next: Mailbox type selection,  Prev: Output control,  Up: Invoking
 
@@ -197,7 +200,7 @@ File: mboxgrep.info,  Node: Examples,  Next: Bugs,  Prev: Invoking,  Up: Top
 
 Scan '$MAIL' for messages from Dirty Harry:
 
-     mboxgrep -H '^From:.*callahan@homicide\.SFPD\.gov' $MAIL
+     mboxgrep -H '^From:.*callahan@sanfranciscopolice\.org' $MAIL
 
    Re-mail to George messages that mention his name:
 
@@ -224,11 +227,11 @@ File: mboxgrep.info,  Node: Bugs,  Next: To Vicky,  Prev: Examples,  Up: Top
 ******************
 
 Shortly, if 'mboxgrep' crashes and/or works differently than described
-in this manual, you've found a bug.
+in this manual, you have found a bug.
 
    Please report bugs to <dspiljar@datatipp.se>.  Instructions how to
 reproduce the bug or output from a debugger would be highly appreciated.
-Don't, however, send any coredumps.
+Please do not, however, send any core dumps.
 
 
 File: mboxgrep.info,  Node: To Vicky,  Prev: Bugs,  Up: Top
@@ -253,11 +256,11 @@ Node: Miscellaneous1827
 Node: File locking2112
 Node: Regexp selection2749
 Node: Output control3301
-Node: Search scope selection4292
-Node: Mailbox type selection4533
-Node: Examples4854
-Node: Bugs5674
-Node: To Vicky6081
+Node: Search scope selection4345
+Node: Mailbox type selection4586
+Node: Examples4907
+Node: Bugs5731
+Node: To Vicky6149
 
 End Tag Table
 

doc/mboxgrep.texi

@@ -1,13 +1,12 @@
-\input texinfo   @c -*-texinfo-*-
-@c $Id: mboxgrep.texi,v 1.20 2006-01-18 00:09:58 dspiljar Exp $
+\input texinfo
 @setfilename mboxgrep.info
 @settitle Grep through mailboxes
 @finalout
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.10
-@set UPDATED 26 Jan 2023
+@set VERSION 0.7.11
+@set UPDATED 24 Mar 2023
 
 @dircategory Mail
 @direntry
@@ -189,6 +188,9 @@ instance of COMMAND.
 @itemx -s
 Suppress error messages.
 
+@item --debug
+Print messages useful for debugging.
+
 @end table
 
 @node Search scope selection, Mailbox type selection, Output control, Invoking
@@ -224,7 +226,7 @@ mbox) @code{mh}, @code{nnml}, @code{nnmh}, and @code{maildir}.
 Scan @env{$MAIL} for messages from Dirty Harry:
 
 @example
-mboxgrep -H '^From:.*callahan@@homicide\.SFPD\.gov' $MAIL
+mboxgrep -H '^From:.*callahan@@sanfranciscopolice\.org' $MAIL
 @end example
 
 Re-mail to George messages that mention his name:
@@ -258,11 +260,11 @@ mboxgrep -nd -c . spam
 @cindex bug, insect, vermin, bugreport
 
 Shortly, if @code{mboxgrep} crashes and/or works differently than described
-in this manual, you've found a bug.
+in this manual, you have found a bug.
 
 Please report bugs to @email{dspiljar@@datatipp.se}.  
 Instructions how to reproduce the bug or output from a debugger would be 
-highly appreciated. Don't, however, send any coredumps.
+highly appreciated. Please do not, however, send any core dumps.
 
 @node To Vicky, , Bugs, Top
 @chapter Author's Dedication

missing

@@ -0,0 +1,215 @@
+#! /bin/sh
+# Common wrapper for a few potentially missing GNU programs.
+
+scriptversion=2018-03-07.03; # UTC
+
+# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+
+# 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, 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, see <https://www.gnu.org/licenses/>.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+  echo 1>&2 "Try '$0 --help' for more information"
+  exit 1
+fi
+
+case $1 in
+
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
+
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
+
+  -h|--h|--he|--hel|--help)
+    echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
+
+Options:
+  -h, --help      display this help and exit
+  -v, --version   output version information and exit
+
+Supported PROGRAM values:
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
+
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
+
+Send bug reports to <bug-automake@gnu.org>."
+    exit $?
+    ;;
+
+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+    echo "missing $scriptversion (GNU Automake)"
+    exit $?
+    ;;
+
+  -*)
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
+    exit 1
+    ;;
+
+esac
+
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
+
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
+    ;;
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
+
+# Local variables:
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC0"
+# time-stamp-end: "; # UTC"
+# End:

src/Makefile.am

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

src/Makefile.in

@@ -1,57 +1,631 @@
-#  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
+# Makefile.in generated by automake 1.16.3 from Makefile.am.
+# @configure_input@
 
-# $Id: Makefile.in,v 1.12 2006-07-07 04:38:53 dspiljar Exp $
+# Copyright (C) 1994-2020 Free Software Foundation, Inc.
 
-srcdir		=	@srcdir@
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
-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)
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+bin_PROGRAMS = mboxgrep$(EXEEXT)
+subdir = src
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
+am_mboxgrep_OBJECTS = getopt1.$(OBJEXT) getopt.$(OBJEXT) \
+	info.$(OBJEXT) maildir.$(OBJEXT) main.$(OBJEXT) mbox.$(OBJEXT) \
+	md5.$(OBJEXT) mh.$(OBJEXT) misc.$(OBJEXT) re.$(OBJEXT) \
+	scan.$(OBJEXT) wrap.$(OBJEXT)
+mboxgrep_OBJECTS = $(am_mboxgrep_OBJECTS)
+mboxgrep_DEPENDENCIES = $(LIBOBJS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/getopt.Po ./$(DEPDIR)/getopt1.Po \
+	./$(DEPDIR)/info.Po ./$(DEPDIR)/maildir.Po ./$(DEPDIR)/main.Po \
+	./$(DEPDIR)/mbox.Po ./$(DEPDIR)/md5.Po ./$(DEPDIR)/mh.Po \
+	./$(DEPDIR)/misc.Po ./$(DEPDIR)/re.Po ./$(DEPDIR)/scan.Po \
+	./$(DEPDIR)/wrap.Po
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(mboxgrep_SOURCES)
+DIST_SOURCES = $(mboxgrep_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \
+	config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PCRE_CONFIG = @PCRE_CONFIG@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build_alias = @build_alias@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host_alias = @host_alias@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+mboxgrep_SOURCES = getopt1.c getopt.c info.c maildir.c main.c mbox.c md5.c mh.c misc.c re.c scan.c wrap.c
+mboxgrep_LDADD = $(LIBOBJS)
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .o
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign src/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
 
-.c.o: 
-	$(CC) $(CFLAGS) $(INCLUDES) -c $<
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(TARGET): $(OBJS)
-	$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(LIBS)
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
-.PHONY: clean
-clean:
-	rm -f $(TARGET) $(OBJS) core
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
-.PHONY: distclean
-distclean:
-	rm -f *~ Makefile config.h
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
 
-.PHONY: install
-install: mboxgrep
-	$(INSTALL) -d $(prefix)/bin
-	$(INSTALL) -s $(TARGET) $(prefix)/bin
+distclean-hdr:
+	-rm -f config.h stamp-h1
+install-binPROGRAMS: $(bin_PROGRAMS)
+	@$(NORMAL_INSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
+uninstall-binPROGRAMS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+
+mboxgrep$(EXEEXT): $(mboxgrep_OBJECTS) $(mboxgrep_DEPENDENCIES) $(EXTRA_mboxgrep_DEPENDENCIES) 
+	@rm -f mboxgrep$(EXEEXT)
+	$(AM_V_CCLD)$(LINK) $(mboxgrep_OBJECTS) $(mboxgrep_LDADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/maildir.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mbox.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mh.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/re.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scan.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wrap.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(PROGRAMS) config.h
+installdirs:
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/getopt.Po
+	-rm -f ./$(DEPDIR)/getopt1.Po
+	-rm -f ./$(DEPDIR)/info.Po
+	-rm -f ./$(DEPDIR)/maildir.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/mbox.Po
+	-rm -f ./$(DEPDIR)/md5.Po
+	-rm -f ./$(DEPDIR)/mh.Po
+	-rm -f ./$(DEPDIR)/misc.Po
+	-rm -f ./$(DEPDIR)/re.Po
+	-rm -f ./$(DEPDIR)/scan.Po
+	-rm -f ./$(DEPDIR)/wrap.Po
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-hdr distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/getopt.Po
+	-rm -f ./$(DEPDIR)/getopt1.Po
+	-rm -f ./$(DEPDIR)/info.Po
+	-rm -f ./$(DEPDIR)/maildir.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/mbox.Po
+	-rm -f ./$(DEPDIR)/md5.Po
+	-rm -f ./$(DEPDIR)/mh.Po
+	-rm -f ./$(DEPDIR)/misc.Po
+	-rm -f ./$(DEPDIR)/re.Po
+	-rm -f ./$(DEPDIR)/scan.Po
+	-rm -f ./$(DEPDIR)/wrap.Po
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: all install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \
+	distclean distclean-compile distclean-generic distclean-hdr \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-binPROGRAMS
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

src/config.h.in

@@ -48,6 +48,9 @@
    */
 #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
 
@@ -60,8 +63,14 @@
 /* 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/info.c

@@ -28,32 +28,30 @@
 
 void
 print_wrap (char *str, int len, int *n)
-     /* {{{  */
 {
   *n += len;
-  fprintf (stdout, str);
+  fprintf (stdout, "%s", str);
   if (*n >= 50)
     {
       fprintf (stdout, "\n");
       *n = 0;
     }
-  else fprintf (stdout, " ");
+  else
+    fprintf (stdout, " ");
 }
-/* }}} */
 
 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 "
-	   "modify\nit under the terms of the GNU General Public License "
-	   "as published by\nthe Free Software Foundation; either version "
-	   "2 of the License, or\n(at your option) any later version.\n\n",
-	   APPNAME, VERSION);
+           "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 "
+           "2 of the License, or\n(at your option) any later version.\n\n",
+           APPNAME, VERSION);
   fprintf (stdout, "Compilation options:\n");
 #ifdef HAVE_DIRENT_H
   print_wrap ("HAVE_DIRENT_H", 13, &n);
@@ -67,9 +65,10 @@ version (void)
 #ifdef HAVE_FTS_OPEN
   print_wrap ("HAVE_FTS_OPEN", 13, &n);
 #else
-# ifdef HAVE_FTW
+#  ifdef HAVE_FTW
   print_wrap ("HAVE_FTW", 8, &n);
-# endif /* HAVE_FTW */
+#  endif
+       /* HAVE_FTW */
 #endif /* HAVE_FTS_OPEN */
 /*
   fprintf (stdout, "HAVE_LIBLOCKFILE ");
@@ -91,81 +90,87 @@ version (void)
 #endif /* HAVE_SYS_DIR_H */
 #ifdef HAVE_SYS_NDIR_H
   print_wrap ("HAVE_SYS_NDIR_H", 15, &n);
-#endif
+#endif /* HAVE_SYS_NDIR_H */
+#ifdef HAVE_STRPTIME
+  print_wrap ("HAVE_STRPTIME", 15, &n);
+#endif /* HAVE_STRPTIME */
+#ifdef HAVE_REGCOMP
+  print_wrap ("HAVE_REGCOMP", 15, &n);
+#endif /* HAVE_REGCOMP */
+#ifdef HAVE_LIBDMALLOC
+  print_wrap ("HAVE_LIBDMALLOC", 15, &n);
+#endif /* HAVE_LIBDMALLOC */
   fprintf (stdout, "\n");
-  exit(0);
-}
-/* }}} */
 
-void 
+  exit (0);
+}
+
+void
 help (void)
-     /* {{{  */
 {
-  fprintf(stdout, "%s %s - search MAILBOX for messages matching PATTERN\n\n",
-	  APPNAME, VERSION);
-  fprintf(stdout, 
-	  "Miscellaneous:\n\n"
-	  "  -h,  --help\t\t\tThis help screen\n"
-	  "  -V,  --version\t\tDisplay version, copyright and\n"
-	  "\t\t\t\tcompile-time options information\n"
-	  "  -r,  --recursive\t\tDescend into directories recursively\n\n"
-	  "Output control:\n\n"
-	  "  -c,  --count\t\t\tPrint a count of matching messages\n"
-	  "  -d,  --delete\t\t\tDelete matching messages\n"
-          "  -nd, --no-duplicates\t\tIgnore duplicate messages\n"
-	  "  -o,  --output=MAILBOX\t\tWrite messages to MAILBOX\n"
-	  "  -p,  --pipe=COMMAND\t\tPipe each found message to COMMAND\n"
-	  "  -s,  --no-messages\t\tSuppress most error messages\n\n"
-	  "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");
+  fprintf (stdout, "%s %s - search MAILBOX for messages matching PATTERN\n\n",
+           APPNAME, VERSION);
+  fprintf (stdout,
+           "Miscellaneous:\n\n"
+           "  -h,  --help\t\t\tThis help screen\n"
+           "  -V,  --version\t\tDisplay version, copyright and\n"
+           "\t\t\t\tcompile-time options information\n"
+           "  -r,  --recursive\t\tDescend into directories recursively\n\n"
+           "Output control:\n\n"
+           "  -c,  --count\t\t\tPrint a count of matching messages\n"
+           "  -d,  --delete\t\t\tDelete matching messages\n"
+           "  -nd, --no-duplicates\t\tIgnore duplicate messages\n"
+           "  -o,  --output=MAILBOX\t\tWrite messages to MAILBOX\n"
+           "  -p,  --pipe=COMMAND\t\tPipe each found message to COMMAND\n"
+           "  -s,  --no-messages\t\tSuppress most error messages\n"
+           "       --debug\t\t\tPrint messages useful for debugging\n\n"
+           "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
-  fprintf(stdout,  
-	  "  -P,  --perl-regexp\t\tPATTERN is a Perl regular expression\n");
+  fprintf (stdout,
+           "  -P,  --perl-regexp\t\tPATTERN is a Perl regular expression\n");
 #endif /* HAVE_LIBPCRE */
-  fprintf(stdout,
-	  "  -e,  --regexp=PATTERN\t\tUse PATTERN as a regular expression\n"
-	  "  -i,  --ignore-case\t\tIgnore case distinctions\n"
-	  "  -v,  --invert-match\t\tSelect non-matching messages\n\n"
-	  "Search scope selection:\n\n"
-	  "  -H,  --headers\t\tMatch PATTERN against message headers\n"
-	  "  -B,  --body\t\t\tMatch PATTERN against message body\n\n"
-	  "File locking:\n\n"
-	  "  -nl, --no-file-lock\t\tDo not lock files\n"
-	  "  -l,  --file-lock=METHOD\tSelect file locking METHOD\n"
-	  "\t\t\t\tMETHOD is");
+  fprintf (stdout,
+           "  -e,  --regexp=PATTERN\t\tUse PATTERN as a regular expression\n"
+           "  -i,  --ignore-case\t\tIgnore case distinctions\n"
+           "  -v,  --invert-match\t\tSelect non-matching messages\n\n"
+           "Search scope selection:\n\n"
+           "  -H,  --headers\t\tMatch PATTERN against message headers\n"
+           "  -B,  --body\t\t\tMatch PATTERN against message body\n\n"
+           "File locking:\n\n"
+           "  -nl, --no-file-lock\t\tDo not lock files\n"
+           "  -l,  --file-lock=METHOD\tSelect file locking METHOD\n"
+           "\t\t\t\tMETHOD is");
 #ifdef HAVE_FCNTL
-  fprintf(stdout, " `fcntl',");
+  fprintf (stdout, " `fcntl',");
 #endif /* HAVE_FCNTL */
 #ifdef HAVE_FLOCK
-  fprintf(stdout, " `flock',");
+  fprintf (stdout, " `flock',");
 #endif /* HAVE_FLOCK */
-  fprintf(stdout, " or `none'\n\n"
-	  "Mailbox type selection:\n\n"
-	  "  -m,  --mailbox-format=TYPE\tSelect mailbox TYPE\n"
-	  "\t\t\t\tTYPE is `mbox', ");
+  fprintf (stdout, " or `none'\n\n"
+           "Mailbox type selection:\n\n"
+           "  -m,  --mailbox-format=TYPE\tSelect mailbox TYPE\n"
+           "\t\t\t\tTYPE is `mbox', ");
 #ifdef HAVE_LIBZ
-  fprintf(stdout, "`zmbox', ");
+  fprintf (stdout, "`zmbox', ");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-  fprintf(stdout, "`bz2mbox', ");
+  fprintf (stdout, "`bz2mbox', ");
 #endif /* HAVE_LIBBZ2 */
-  fprintf(stdout,
-	  "`mh',\n"
-	  "\t\t\t\t`nnml', `nnmh', or `maildir'.\n\n"
-	  "Mail bug reports and flames to <%s>.\n", BUGREPORT_ADDR);
+  fprintf (stdout,
+           "`mh',\n"
+           "\t\t\t\t`nnml', `nnmh', or `maildir'.\n\n"
+           "Mail bug reports and flames to <%s>.\n", BUGREPORT_ADDR);
 
-  exit(0);
+  exit (0);
 }
-/* }}} */
 
-void 
+void
 usage (void)
-     /* {{{  */
 {
   printf ("Usage: %s [OPTION] PATTERN MAILBOX ...\n\n"
           "Try `%s --help' for more information.\n", APPNAME, APPNAME);
+
   exit (2);
 }
-/* }}} */
-

src/info.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   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,11 +15,10 @@
   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: info.h,v 1.5 2003-04-13 19:15:58 dspiljar Exp $ */
+*/
 
 #ifndef INFO_H
-#define INFO_H
+#  define INFO_H
 
 void print_wrap (char *str, int len, int *n);
 void version (void);

src/maildir.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 - 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
@@ -15,8 +15,7 @@
   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: maildir.c,v 1.25 2006-10-19 01:53:43 dspiljar Exp $ */
+*/
 
 #include <config.h>
 
@@ -24,20 +23,23 @@
 #include <string.h>
 
 #ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
+#  include <dirent.h>
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
+#  define dirent direct
+#  define NAMLEN(dirent) (dirent)->d_namlen
+#  ifdef HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#  endif
+       /* HAVE_SYS_NDIR_H */
+#  ifdef HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#  endif
+       /* HAVE_SYS_DIR_H */
+#  ifdef HAVE_NDIR_H
+#    include <ndir.h>
+#  endif
+       /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <stdlib.h>
@@ -53,7 +55,7 @@
 #include "wrap.h"
 
 #ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
+#  include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
 maildir_t *
@@ -65,29 +67,29 @@ maildir_open (const char *path)
 
   foo = m_opendir (path);
   if (foo == NULL)
-      return NULL;
+    return NULL;
 
   closedir (foo);
 
   if (-1 == maildir_check (path))
     {
       if (config.merr)
-	  fprintf (stderr, "%s: %s: Not a maildir folder\n", APPNAME, path);
+        fprintf (stderr, "%s: %s: Not a maildir folder\n", APPNAME, path);
       return NULL;
     }
 
-  dirname = (char *) xmalloc((sizeof (char) * (strlen (path) + 5)));
+  dirname = (char *) xmalloc ((sizeof (char) * (strlen (path) + 5)));
 
-  mp = (maildir_t *) xmalloc(sizeof (maildir_t));
+  mp = (maildir_t *) xmalloc (sizeof (maildir_t));
   sprintf (dirname, "%s/new", path);
   mp->new = m_opendir (dirname);
   if (mp->new == NULL)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, dirname);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, dirname);
+          perror (NULL);
+        }
       free (dirname);
       errno = 0;
       return NULL;
@@ -98,67 +100,68 @@ maildir_open (const char *path)
   if (mp->cur == NULL)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, dirname);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, dirname);
+          perror (NULL);
+        }
       free (dirname);
       errno = 0;
       return NULL;
-    }  
+    }
 
   free (dirname);
   return mp;
-} /* maildir_open */
+}                               /* maildir_open */
 
 message_t *
-maildir_read_message (maildir_t *mdp)
+maildir_read_message (maildir_t * mdp)
 {
   int isheaders = 1;
   int have_from = 0, have_to = 0, have_message_id = 0, have_sender = 0,
-      have_date = 0;
+    have_date = 0;
   static message_t *message;
   static struct dirent *d_content;
   char *filename, buffer[BUFSIZ];
   static FILE *fp;
   static int s;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
-  for(;;)
+  for (;;)
     {
-      if (mdp->new != NULL) 
-	{
-	  d_content = readdir (mdp->new);
-	  if (d_content == NULL)
-	    {
-	      closedir (mdp->new);
-	      mdp->new = NULL;
-	    }
-	}
+      if (mdp->new != NULL)
+        {
+          d_content = readdir (mdp->new);
+          if (d_content == NULL)
+            {
+              closedir (mdp->new);
+              mdp->new = NULL;
+            }
+        }
       if (mdp->new == NULL && mdp->cur != NULL)
-	{
-	  d_content = readdir (mdp->cur);
-	  if (d_content == NULL)
-	    {
-	      closedir (mdp->cur);
-	      mdp->cur = NULL;
-	    }
-	}
+        {
+          d_content = readdir (mdp->cur);
+          if (d_content == NULL)
+            {
+              closedir (mdp->cur);
+              mdp->cur = NULL;
+            }
+        }
       if (mdp->new == NULL && mdp->cur == NULL)
-{
-	free (message->headers);
-	free (message->body);
-	free (message);
-	return NULL;
-}
+        {
+          free (message->headers);
+          free (message->body);
+          free (message);
+          return NULL;
+        }
 
       if (d_content->d_name[0] == '.')
-	continue;
+        continue;
 
-      filename = 
-	(char *) xmalloc ((sizeof (char)*((strlen (d_content->d_name)) 
-					  + (strlen (config.boxname)) + 6)));
+      filename =
+        (char *) xmalloc ((sizeof (char) * ((strlen (d_content->d_name))
+                                            + (strlen (config.boxname)) +
+                                            6)));
 
 /*
       filename = 
@@ -166,73 +169,79 @@ maildir_read_message (maildir_t *mdp)
 					 + (strlen(config.boxname)) + 2)));
 */
       if (mdp->new != NULL)
-	sprintf (filename, "%s/new/%s", config.boxname, d_content->d_name);
+        sprintf (filename, "%s/new/%s", config.boxname, d_content->d_name);
       else
-	sprintf (filename, "%s/cur/%s", config.boxname, d_content->d_name);
+        sprintf (filename, "%s/cur/%s", config.boxname, d_content->d_name);
+
       message->filename = (char *) xstrdup (filename);
       free (filename);
 
       isheaders = 1;
-      fp = m_fopen(message->filename, "r");
+      fp = m_fopen (message->filename, "r");
 
       if (fp == NULL)
-	  continue;
+        continue;
 
       while (fgets (buffer, BUFSIZ, fp) != NULL)
-	{
-	  s = strlen (buffer);
-	  if (0 == strncmp ("\n", buffer, 1) && isheaders == 1)
-	    {
-	      isheaders = 0;
-	      continue;
-	    } /* if */
-	  if (isheaders)
-	    {
-	      if (0 == strncasecmp ("From: ", buffer, 6))
-		have_from = 1;
-	      if (0 == strncasecmp ("Sender: ", buffer, 8))
-		have_sender = 1;
-	      if (0 == strncasecmp ("Date: ", buffer, 6))
-		have_date = 1;
-	      if (0 == strncasecmp ("To: ", buffer, 4))
-		have_to = 1;
-	      if (0 == strncasecmp ("Message-ID: ", buffer, 12))
-		have_message_id = 1;
-	      if (0 == strncasecmp ("Return-Path: ", buffer, 13))
-		  message->from = parse_return_path(buffer);
+        {
+          s = strlen (buffer);
+          if (0 == strncmp ("\n", buffer, 1) && isheaders == 1)
+            {
+              isheaders = 0;
+              continue;
+            }                   /* if */
+          if (isheaders)
+            {
+              if (0 == strncasecmp ("From: ", buffer, 6))
+                have_from = 1;
+              if (0 == strncasecmp ("Sender: ", buffer, 8))
+                have_sender = 1;
+              if (0 == strncasecmp ("Date: ", buffer, 6))
+                have_date = 1;
+              if (0 == strncasecmp ("To: ", buffer, 4))
+                have_to = 1;
+              if (0 == strncasecmp ("Message-ID: ", buffer, 12))
+                have_message_id = 1;
+              if (0 == strncasecmp ("Return-Path: ", buffer, 13))
+                message->from = parse_return_path (buffer);
+
+              message->headers =
+                (char *) xrealloc (message->headers,
+                                   ((1 + s +
+                                     message->hbytes) * sizeof (char)));
+
+              strcpy (message->headers + message->hbytes, buffer);
+              message->hbytes += s;
+            }                   /* if */
+          else
+            {
+              message->body =
+                (char *) xrealloc (message->body,
+                                   ((1 + s +
+                                     message->bbytes) * sizeof (char)));
+              strcpy (message->body + message->bbytes, buffer);
+              message->bbytes += s;
+            }                   /* else */
+        }                       /* while */
 
-	      message->headers =
-		(char *) xrealloc (message->headers,
-				  ((1 + s + message->hbytes) * sizeof (char)));
-	      strcpy (message->headers + message->hbytes, buffer);
-	      message->hbytes += s;
-	    } /* if */
-	  else
-	    {
-	      message->body =
-		(char *) xrealloc (message->body,
-				  ((1 + s + message->bbytes) * sizeof (char)));
-	      strcpy (message->body + message->bbytes, buffer);
-	      message->bbytes += s;
-	    } /* else */
-	} /* while */
 /*       if (!have_from || !have_to || !have_message_id) */
-      if ((!have_from && !have_sender)|| !have_date)
-	{
-	  if (config.merr)
-	    fprintf(stderr, "%s: %s: Not a RFC 2822 message\n", 
-		    APPNAME, message->filename);
-	  fclose(fp);
-	  continue;
-	}
-      
-      fclose(fp);
-      return message; 
-    } /* for */
-} /* maildir_read_message */
 
-void 
-maildir_write_message (message_t *m, const char *path)
+      if ((!have_from && !have_sender) || !have_date)
+        {
+          if (config.merr)
+            fprintf (stderr, "%s: %s: Not a RFC 2822 message\n",
+                     APPNAME, message->filename);
+          fclose (fp);
+          continue;
+        }
+
+      fclose (fp);
+      return message;
+    }                           /* for */
+}                               /* maildir_read_message */
+
+void
+maildir_write_message (message_t * m, const char *path)
 {
   char bla[BUFSIZ], *s1, *s2;
   int t;
@@ -242,11 +251,11 @@ maildir_write_message (message_t *m, const char *path)
   t = (int) time (NULL);
 
   sprintf (bla, "%i.%i_%i.%s",
-	   t, config.pid, runtime.maildir_count, config.hostname);
+           t, config.pid, runtime.maildir_count, config.hostname);
   s1 = (char *) xmalloc ((strlen (path) + strlen (bla) + 6) * sizeof (char));
-  sprintf(s1, "%s/tmp/%s", path, bla);
+  sprintf (s1, "%s/tmp/%s", path, bla);
   s2 = (char *) xmalloc ((strlen (path) + strlen (bla) + 6) * sizeof (char));
-  sprintf(s2, "%s/new/%s", path, bla);
+  sprintf (s2, "%s/new/%s", path, bla);
 
   f1 = m_fopen (s1, "w");
   fprintf (f1, "%s\n%s", m->headers, m->body);
@@ -254,7 +263,7 @@ maildir_write_message (message_t *m, const char *path)
   rename (s1, s2);
 }
 
-int 
+int
 maildir_check (const char *path)
 {
   static struct stat fs;
@@ -265,51 +274,57 @@ maildir_check (const char *path)
 
   sprintf (s, "%s/cur", path);
   i = stat (s, &fs);
-  if (-1 == i) return -1;
-  if (! S_ISDIR (fs.st_mode)) return -1;
+  if (-1 == i)
+    return -1;
+  if (!S_ISDIR (fs.st_mode))
+    return -1;
 
   sprintf (s, "%s/new", path);
   i = stat (s, &fs);
-  if (-1 == i) return -1;
-  if (! S_ISDIR (fs.st_mode)) return -1;
+  if (-1 == i)
+    return -1;
+  if (!S_ISDIR (fs.st_mode))
+    return -1;
 
-  sprintf(s, "%s/tmp", path);
+  sprintf (s, "%s/tmp", path);
   i = stat (s, &fs);
-  if (-1 == i) return -1;
-  if (! S_ISDIR (fs.st_mode)) return -1;
+  if (-1 == i)
+    return -1;
+  if (!S_ISDIR (fs.st_mode))
+    return -1;
 
   free (s);
 
   return 0;
 }
 
-void 
+void
 maildir_create (const char *path)
 {
   char *s;
   int i;
 
-  s = (char *) xmalloc ((strlen (path) + 4) * sizeof(char));
+  s = (char *) xmalloc ((strlen (path) + 4) * sizeof (char));
   errno = 0;
 
   for (;;)
     {
-      sprintf(s, "%s", path);
-      i = mkdir (s, S_IRWXU);
-      if (-1 == i) 
-	break;
-      sprintf(s, "%s/new", path);
+      sprintf (s, "%s", path);
       i = mkdir (s, S_IRWXU);
       if (-1 == i)
-	break;
-      sprintf(s, "%s/cur", path);
+        break;
+      sprintf (s, "%s/new", path);
       i = mkdir (s, S_IRWXU);
       if (-1 == i)
-	break;
-      sprintf(s, "%s/tmp", path);
+        break;
+      sprintf (s, "%s/cur", path);
       i = mkdir (s, S_IRWXU);
       if (-1 == i)
-	break;
+        break;
+      sprintf (s, "%s/tmp", path);
+      i = mkdir (s, S_IRWXU);
+      if (-1 == i)
+        break;
 
       break;
     }
@@ -317,9 +332,9 @@ maildir_create (const char *path)
   if (errno != 0)
     {
       if (config.merr)
-	{
-	  fprintf(stderr, "%s:%s: ", APPNAME, s);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s:%s: ", APPNAME, s);
+          perror (NULL);
+        }
     }
 }

src/maildir.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   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,32 +15,35 @@
   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: maildir.h,v 1.6 2003-03-30 23:07:10 dspiljar Exp $ */
+*/
 
 #ifndef MAILDIR_H
-#define MAILDIR_H
+#  define MAILDIR_H
 
-#include <config.h>
+#  include <config.h>
 
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+#  ifdef HAVE_DIRENT_H
+#    include <dirent.h>
+#    define NAMLEN(dirent) strlen((dirent)->d_name)
+#  else
+#    define dirent direct
+#    define NAMLEN(dirent) (dirent)->d_namlen
+#    ifdef HAVE_SYS_NDIR_H
+#      include <sys/ndir.h>
+#    endif
+       /* HAVE_SYS_NDIR_H */
+#    ifdef HAVE_SYS_DIR_H
+#      include <sys/dir.h>
+#    endif
+       /* HAVE_SYS_DIR_H */
+#    ifdef HAVE_NDIR_H
+#      include <ndir.h>
+#    endif
+       /* HAVE_NDIR_H */
+#  endif
+       /* HAVE_DIRENT_H */
 
-#include "mboxgrep.h"
+#  include "mboxgrep.h"
 
 typedef struct
 {
@@ -51,8 +54,8 @@ typedef struct
 maildir_t *maildir_open (const char *path);
 int maildir_check (const char *path);
 void maildir_create (const char *path);
-void maildir_close (maildir_t *mdp);
-message_t *maildir_read_message (maildir_t *mdp);
-void maildir_write_message (message_t *m, const char *path);
+void maildir_close (maildir_t * mdp);
+message_t *maildir_read_message (maildir_t * mdp);
+void maildir_write_message (message_t * m, const char *path);
 
 #endif /* MAILDIR_H */

src/main.c

@@ -15,7 +15,6 @@
   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
-
 */
 
 #include <config.h>
@@ -27,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #ifdef HAVE_LIBZ
-#include <zlib.h>
+#  include <zlib.h>
 #endif /* HAVE_LIBZ */
 
 #include "getopt.h"
@@ -37,11 +36,11 @@
 #include "mbox.h"
 #include "mh.h"
 #include "scan.h"
-#include "wrap.h" /* xcalloc() et cetera */
+#include "wrap.h"               /* xcalloc() et cetera */
 #include "re.h"
 
 #ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
+#  include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
 option_t config;
@@ -49,44 +48,38 @@ runtime_t runtime;
 
 int
 main (int argc, char **argv)
-     /* {{{  */
-
 {
   int havemailbox = 0;
   int singlefile = 0;
   runtime.count = 0;
   runtime.maildir_count = 0;
 
-  static struct option long_options[] = 
-    /* {{{  */
-
-    {
-      {"count", 0, 0, 'c'},
-      {"delete", 0, 0, 'd'},
-      /*  {"date", 1, 0, 'D'}, */
-      {"extended-regexp", 0, 0, 'E'},
-      {"basic-regexp", 0, 0, 'G'},
-      {"perl-regexp", 0, 0, 'P'},
-      {"help", 0, 0, 'h'},
-      {"ignore-case", 0, 0, 'i'},
-      {"mailbox-format", 1, 0, 'm'},
-      {"no", 1, 0, 'n' },
-      {"pipe", 1, 0, 'p'},
-      {"regexp", 1, 0, 'e'},
-      {"invert-match", 0, 0, 'v'},
-      {"version", 0, 0, 'V'},
-      {"headers", 0, 0, 'H'},
-      {"body", 0, 0, 'B'},
-      {"no-messages", 0, 0, 's'},
-      {"output", 1, 0, 'o'},
-      {"no-duplicates", 0, 0, 200},
-      {"no-file-lock", 0, 0, 201},
-      {"file-lock", 1, 0, 'l'},
-      {"recursive", 0, 0, 'r'},
-      {0, 0, 0, 0}
-    };
-
-  /* }}} */
+  static struct option long_options[] = {
+    {"count", 0, 0, 'c'},
+    {"delete", 0, 0, 'd'},
+    /*  {"date", 1, 0, 'D'}, */
+    {"extended-regexp", 0, 0, 'E'},
+    {"basic-regexp", 0, 0, 'G'},
+    {"perl-regexp", 0, 0, 'P'},
+    {"help", 0, 0, 'h'},
+    {"ignore-case", 0, 0, 'i'},
+    {"mailbox-format", 1, 0, 'm'},
+    {"no", 1, 0, 'n'},
+    {"pipe", 1, 0, 'p'},
+    {"regexp", 1, 0, 'e'},
+    {"invert-match", 0, 0, 'v'},
+    {"version", 0, 0, 'V'},
+    {"headers", 0, 0, 'H'},
+    {"body", 0, 0, 'B'},
+    {"no-messages", 0, 0, 's'},
+    {"output", 1, 0, 'o'},
+    {"no-duplicates", 0, 0, 200},
+    {"no-file-lock", 0, 0, 201},
+    {"debug", 0, 0, 202},
+    {"file-lock", 1, 0, 'l'},
+    {"recursive", 0, 0, 'r'},
+    {0, 0, 0, 0}
+  };
 
   set_default_options ();
 
@@ -108,22 +101,22 @@ main (int argc, char **argv)
   runtime.cs->md5 = (char **) xcalloc (1, sizeof (char **));
   runtime.cs->n = 0;
 
-  if (optind < argc && ! config.haveregex)
+  if (optind < argc && !config.haveregex)
     {
       config.regex_s = xstrdup (argv[optind]);
       config.haveregex = 1;
       ++optind;
-    } /* if */
+    }
 
-  if (config.haveregex) 
+  if (config.haveregex)
     {
 #ifdef HAVE_LIBPCRE
       if (config.perl)
-	pcre_init ();
+        pcre_init ();
       else
 #endif /* HAVE_LIBPCRE */
-	regex_init ();
-    } /* if */
+        regex_init ();
+    }
   else
     usage ();
 
@@ -131,56 +124,49 @@ main (int argc, char **argv)
     singlefile = 1;
 
   while (optind < argc)
-    /* {{{  */
-
     {
-      if (config.action == DELETE) {
-	tmpmbox_create (argv[optind]);
-	runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w");
-      }
+      if (config.action == DELETE)
+        {
+          tmpmbox_create (argv[optind]);
+          runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w");
+        }
 
       config.boxname = xstrdup (argv[optind]);
 
       if (config.recursive)
-	recursive_scan (argv[optind]);
+        recursive_scan (argv[optind]);
       else
-	scan_mailbox (argv[optind]);
+        scan_mailbox (argv[optind]);
+
       havemailbox = 1;
+
       if (config.action == COUNT)
-	{
-	  if (singlefile)
-	    fprintf (stdout, "%i\n", runtime.count);
-	  else
-	    {
-	      if (0 == strcmp ("-", argv[optind]))
-		fprintf (stdout, "(standard input):%i\n", runtime.count);
-	      else
-		fprintf (stdout, "%s:%i\n", argv[optind], runtime.count);
-	    }
-	}
+        {
+          if (singlefile)
+            fprintf (stdout, "%i\n", runtime.count);
+          else
+            {
+              if (0 == strcmp ("-", argv[optind]))
+                fprintf (stdout, "(standard input):%i\n", runtime.count);
+              else
+                fprintf (stdout, "%s:%i\n", argv[optind], runtime.count);
+            }
+        }
       if (config.action == DELETE)
-	{
-	  mbox_close (runtime.tmp_mbox);
-	  rename (config.tmpfilename, argv[optind]);
-	}
+        {
+          mbox_close (runtime.tmp_mbox);
+          rename (config.tmpfilename, argv[optind]);
+        }
       ++optind;
-    } /* while */
-
-  /* }}} */
-
-  if (! havemailbox)
-    /* {{{  */
+    }
 
+  if (!havemailbox)
     {
       config.format = MBOX;
       scan_mailbox ("-");
       if (config.action == COUNT)
-	fprintf (stdout, "%i\n", runtime.count);
+        fprintf (stdout, "%i\n", runtime.count);
     }
 
-  /* }}} */
-
   return 0;
-} /* main */
-
-/* }}} */
+}

src/mbox.c

@@ -1,4 +1,4 @@
-/* -*- C -*- 
+/*
    mboxgrep - scan mailbox for messages matching a regular expression
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006  Daniel Spiljar
 
@@ -15,8 +15,7 @@
    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: mbox.c,v 1.34 2006-10-22 23:34:49 dspiljar Exp $ */
+*/
 
 #include <config.h>
 
@@ -31,13 +30,13 @@
 #include <errno.h>
 #include <time.h>
 #ifdef HAVE_FLOCK
-#include <sys/file.h>
+#  include <sys/file.h>
 #endif /* HAVE_FLOCK */
 #ifdef HAVE_LIBZ
-#include <zlib.h>
+#  include <zlib.h>
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-#include <bzlib.h>
+#  include <bzlib.h>
 #endif /* HAVE_LIBBZ2 */
 #define BUFLEN 16384
 
@@ -47,12 +46,11 @@
 #include "wrap.h"
 
 #ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
+#  include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
 mbox_t *
 mbox_open (const char *path, const char *mode)
-     /* {{{  */
 {
   mbox_t *mp;
   static int fd;
@@ -69,155 +67,154 @@ mbox_open (const char *path, const char *mode)
   else
     {
       if (mode[0] == 'r')
-	fd = m_open (path, O_RDONLY, 0);
+        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));
+        fd = m_open (path, (O_WRONLY | O_CREAT | O_APPEND),
+                     (S_IWUSR | S_IRUSR));
       else
-	{
-	  fprintf (stderr, "%s: mbox.c: Unknown mode %c.  You shouldn't "
-		   "get this error...", APPNAME, mode[0]);
-	  exit (2);
-	}
+        {
+          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.merr)
+            {
+              fprintf (stderr, "%s: %s: ", APPNAME, path);
+              perror (NULL);
+            }
+          errno = 0;
+          return NULL;
+        }
+
       if (config.lock)
-	{
+        {
 #ifdef HAVE_FLOCK
-	  int op;
+          int op;
 
-	  if (mode[0] == 'r')
-	    op = LOCK_SH;
-	  else
-	    op = LOCK_EX;
-	  if (-1 == flock (fd, op))
+          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;
+          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))
+          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 (config.merr)
+                {
+                  fprintf (stderr, "%s: %s: ", APPNAME, path);
+                  perror (NULL);
+                }
+              errno = 0;
+              close (fd);
+              return NULL;
+            }
+        }
 
       if (mode[0] == 'r')
-	{
-	  if (config.format == MBOX)
-	    mp->fp = (FILE *) m_fdopen (fd, "r");
+        {
+          if (config.format == MBOX)
+            mp->fp = (FILE *) m_fdopen (fd, "r");
 #ifdef HAVE_LIBZ
-	  else if (config.format == ZMBOX)
-	    mp->fp = (gzFile *) m_gzdopen (fd, "rb");
+          else if (config.format == ZMBOX)
+            mp->fp = (gzFile *) m_gzdopen (fd, "rb");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-	  else if (config.format == BZ2MBOX)
-	    mp->fp = (BZFILE *) BZ2_bzdopen (fd, "rb");
+          else if (config.format == BZ2MBOX)
+            mp->fp = (BZFILE *) BZ2_bzdopen (fd, "rb");
 #endif /* HAVE_LIBBZ2 */
-	}
+        }
       else if (mode[0] == 'w')
-	{
-	  if (config.format == MBOX)
-	    mp->fp = (FILE *) m_fdopen (fd, "w");
+        {
+          if (config.format == MBOX)
+            mp->fp = (FILE *) m_fdopen (fd, "w");
 #ifdef HAVE_LIBZ
-	  else if (config.format == ZMBOX)
-	    mp->fp = (gzFile *) m_gzdopen (fd, "wb");
+          else if (config.format == ZMBOX)
+            mp->fp = (gzFile *) m_gzdopen (fd, "wb");
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-	  else if (config.format == BZ2MBOX)
-	    mp->fp = (BZFILE *) BZ2_bzdopen (fd, "wb");
+          else if (config.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 (config.merr)
+            {
+              fprintf (stderr, "%s: %s: ", APPNAME, path);
+              perror (NULL);
+            }
+          errno = 0;
+          close (fd);
+          return NULL;
+        }
     }
 
   if (mode[0] == 'r')
     {
       if (config.format == MBOX)
-	fgets (buffer, BUFSIZ, mp->fp);
+        fgets (buffer, BUFSIZ, mp->fp);
 #ifdef HAVE_LIBZ
       else if (config.format == ZMBOX)
-	gzgets (mp->fp, buffer, BUFSIZ);
+        gzgets (mp->fp, buffer, BUFSIZ);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
       else if (config.format == BZ2MBOX)
-	{
-	  char c[1] = "\0";
-	  int n = 0;
+        {
+          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';
-	}
+          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 == MBOX)
-	    fclose (mp->fp);
+        {
+          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 == MBOX)
+            fclose (mp->fp);
 #ifdef HAVE_LIBZ
-	  else if (config.format == ZMBOX)
-	    gzclose (mp->fp);
+          else if (config.format == ZMBOX)
+            gzclose (mp->fp);
 #endif /* HAVE_LIBZ */
 #ifdef HAVE_LIBBZ2
-	  else if (config.format == BZ2MBOX)
-	    BZ2_bzclose (mp->fp);
+          else if (config.format == BZ2MBOX)
+            BZ2_bzclose (mp->fp);
 #endif /* HAVE_LIBBZ2 */
-	  return NULL;
-	}
+          return NULL;
+        }
       strcpy (mp->postmark_cache, buffer);
     }
   return mp;
 }
-/* }}} */
 
 void
 mbox_close (mbox_t * mp)
-     /* {{{  */
 {
   if (config.format == MBOX)
     fclose (mp->fp);
@@ -233,18 +230,15 @@ mbox_close (mbox_t * mp)
   free (mp->postmark_cache);
   free (mp);
 }
-/* }}} */
 
 message_t *
 mbox_read_message (mbox_t * mp)
-     /* {{{  */
-
 {
   int isheaders = 1, s;
   char buffer[BUFSIZ];
   message_t *message;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
   s = strlen (mp->postmark_cache);
   message->headers =
@@ -256,93 +250,89 @@ mbox_read_message (mbox_t * mp)
   for (;;)
     {
       if (config.format == MBOX)
-	{
-	  if (fgets (buffer, BUFSIZ, mp->fp) == NULL)
-	    {
-	      if (isheaders)
-		return NULL;
-	      else
-		return message;
-	    }
-	}
+        {
+          if (fgets (buffer, BUFSIZ, mp->fp) == NULL)
+            {
+              if (isheaders)
+                return NULL;
+              else
+                return message;
+            }
+        }
 
 #ifdef HAVE_LIBZ
       else if (config.format == ZMBOX)
-	{
-	  if (gzgets (mp->fp, buffer, BUFSIZ) == NULL)
-	    {
-	      if (isheaders)
-		return NULL;
-	      else
-		return message;
-	    }
-	}
+        {
+          if (gzgets (mp->fp, buffer, BUFSIZ) == NULL)
+            {
+              if (isheaders)
+                return NULL;
+              else
+                return message;
+            }
+        }
 #endif /* HAVE_LIBZ */
 
 #ifdef HAVE_LIBBZ2
       else if (config.format == BZ2MBOX)
-	{
-	  char c[1] = "\0";
-	  int n = 0;
+        {
+          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';
+          while (c[0] != '\n' && n < BUFSIZ)
+            {
+              BZ2_bzread (mp->fp, c, 1);
+              buffer[n] = c[0];
+              n++;
+            }
+          buffer[n] = '\0';
 
-	  if (buffer[0] == '\0')
-	    {
-	      if (isheaders)
-		return NULL;
-	      else
-		return message;
-	    }
-	}
+          if (buffer[0] == '\0')
+            {
+              if (isheaders)
+                return NULL;
+              else
+                return message;
+            }
+        }
 #endif /* HAVE_LIBBZ2 */
 
       s = strlen (buffer);
 
       if (buffer[0] == '\n' && isheaders == 1)
-	{
-	  isheaders = 0;
-	  continue;
-	}
+        {
+          isheaders = 0;
+          continue;
+        }
 
       if (isheaders)
-	{
-	  message->headers =
-	    (char *) realloc (message->headers,
-			      ((1 + s + message->hbytes) * sizeof (char)));
-	  strcpy (message->headers + message->hbytes, buffer);
-	  message->hbytes += s;
-	}			/* if */
+        {
+          message->headers =
+            (char *) realloc (message->headers,
+                              ((1 + s + message->hbytes) * sizeof (char)));
+          strcpy (message->headers + message->hbytes, buffer);
+          message->hbytes += s;
+        }
       else
-	{
-	  if (0 == strncmp (buffer, "From ", 5))
-	    {
-	      strcpy (mp->postmark_cache, buffer);
-	      return message;
-	    }
-	  message->body =
-	    (char *) realloc (message->body,
-			      ((1 + s + message->bbytes) * sizeof (char)));
-	  strcpy (message->body + message->bbytes, buffer);
-	  message->bbytes += s;
-
-	}
-    }				/* for */
+        {
+          if (0 == strncmp (buffer, "From ", 5))
+            {
+              strcpy (mp->postmark_cache, buffer);
+              return message;
+            }
+          message->body =
+            (char *) realloc (message->body,
+                              ((1 + s + message->bbytes) * sizeof (char)));
+          strcpy (message->body + message->bbytes, buffer);
+          message->bbytes += s;
+        }
+    }
   return NULL;
 }
 
-/* }}} */
 
 void
 tmpmbox_create (const char *path)
-     /* {{{  */
-
 {
   int foo;
 
@@ -351,19 +341,17 @@ tmpmbox_create (const char *path)
   tmpfile_mod_own (foo, path);
 }
 
-/* }}} */
 
 void
 tmpfile_name (const char *path)
-     /* {{{  */
 {
   char *fname, *tmpdir;
 
-  if (path == NULL) /* no path prefix given, use /tmp or TMPDIR */
+  if (path == NULL)             /* no path prefix given, use /tmp or TMPDIR */
     {
       tmpdir = getenv ("TMPDIR");
       if (tmpdir == NULL)
-	tmpdir = xstrdup ("/tmp");
+        tmpdir = xstrdup ("/tmp");
       fname = xstrdup ("/mboxgrepXXXXXX");
     }
   else
@@ -374,16 +362,13 @@ tmpfile_name (const char *path)
 
   config.tmpfilename =
     (char *) xmalloc ((strlen (tmpdir) + (strlen (fname) + 1))
-		      * sizeof (char));
+                      * sizeof (char));
   sprintf (config.tmpfilename, "%s%s", tmpdir, fname);
 }
-/* }}} */
 
 
-void 
-mbox_write_message (message_t *msg, mbox_t *mbox)
-     /* {{{  */
-
+void
+mbox_write_message (message_t * msg, mbox_t * mbox)
 {
   if (config.format == MBOX)
     fprintf (mbox->fp, "%s\n%s", msg->headers, msg->body);
@@ -391,7 +376,7 @@ mbox_write_message (message_t *msg, mbox_t *mbox)
   else if (config.format == ZMBOX)
     {
       gzwrite_loop (mbox->fp, msg->headers);
-      gzwrite(mbox->fp, "\n", 1);
+      gzwrite (mbox->fp, "\n", 1);
       gzwrite_loop (mbox->fp, msg->body);
     }
 #endif /* HAVE_LIBZ */
@@ -404,11 +389,9 @@ mbox_write_message (message_t *msg, mbox_t *mbox)
     }
 #endif /* HAVE_LIBBZ2 */
 }
-/* }}}  */
 
 void
 tmpfile_mod_own (const int fd, const char *path)
-     /* {{{  */
 {
   /* If we're root, copy {owner, group, perms} of mailbox to the tmpfile
    * so rename() will thus retain the original's ownership & permissions.
@@ -418,20 +401,21 @@ tmpfile_mod_own (const int fd, const char *path)
       struct stat s;
 
       if (stat (path, &s) != -1)
-	{
-	  if (fchown (fd, s.st_uid, s.st_gid) == -1)
-	    if (config.merr) perror (config.tmpfilename);
-	  if (fchmod (fd, s.st_mode) == -1)
-	    if (config.merr) perror (config.tmpfilename);
-	}
-      else if (config.merr) perror (path);
+        {
+          if (fchown (fd, s.st_uid, s.st_gid) == -1)
+            if (config.merr)
+              perror (config.tmpfilename);
+          if (fchmod (fd, s.st_mode) == -1)
+            if (config.merr)
+              perror (config.tmpfilename);
+        }
+      else if (config.merr)
+        perror (path);
     }
 }
-/* }}}  */
 
 int
 tmpfile_create (void)
-     /* {{{  */
 {
   int fd;
 
@@ -439,12 +423,11 @@ tmpfile_create (void)
   if (-1 == fd)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, config.tmpfilename);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, config.tmpfilename);
+          perror (NULL);
+        }
       exit (2);
     }
   return fd;
 }
-/* }}}  */

src/mbox.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
    mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000, 2001, 2002, 2003, 2004  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
@@ -15,15 +15,14 @@
    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: mbox.h,v 1.13 2006-10-22 23:34:49 dspiljar Exp $ */
+*/
 
 #ifndef MBOX_H
-#define MBOX_H 1
+#  define MBOX_H 1
 
-#include <config.h>
+#  include <config.h>
 
-#include "message.h"
+#  include "message.h"
 
 typedef struct
 {
@@ -40,6 +39,6 @@ void tmpfile_mod_own (const int fd, const char *path);
 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_write_message (message_t * m, mbox_t * mbox);
 
 #endif /* MBOX_H */

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.11"
 #define BUGREPORT_ADDR "dspiljar AT datatipp.se"
 
 #define HOST_NAME_SIZE 256
@@ -107,6 +106,7 @@ typedef struct
   int merr;
   int pid;
   int haveregex;
+  int debug;
 
   char hostname[HOST_NAME_SIZE];
   char *boxname, *outboxname, *pipecmd, *tmpfilename, *regex_s;

src/message.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2020  Daniel Spiljar
+  Copyright (C) 2020, 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,18 +15,17 @@
   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$ */
+*/
 
 #ifndef MESSAGE_H
-#define MESSAGE_H 1
+#  define MESSAGE_H 1
 
-#include <config.h>
+#  include <config.h>
 
 typedef struct
 {
-  char *filename; /* used with directory formats, such as maildir or MH */
-  char *msgid; 
+  char *filename;               /* used with directory formats, such as maildir or MH */
+  char *msgid;
   char *from;
   char *headers;
   int hbytes;

src/mh.c

@@ -22,20 +22,23 @@
 #include <string.h>
 
 #ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
+#  include <dirent.h>
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
+#  define dirent direct
+#  define NAMLEN(dirent) (dirent)->d_namlen
+#  ifdef HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#  endif
+       /* HAVE_SYS_NDIR_H */
+#  ifdef HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#  endif
+       /* HAVE_SYS_DIR_H */
+#  ifdef HAVE_NDIR_H
+#    include <ndir.h>
+#  endif
+       /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <sys/types.h>
@@ -49,12 +52,13 @@
 #include "wrap.h"
 
 #ifdef HAVE_LIBDMALLOC
-# include <dmalloc.h>
+#  include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
 extern option_t config;
 
-DIR *mh_open (const char *path)
+DIR *
+mh_open (const char *path)
 {
   DIR *dp;
 
@@ -62,22 +66,24 @@ DIR *mh_open (const char *path)
   if (dp == NULL)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, path);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, path);
+          perror (NULL);
+        }
       errno = 0;
       return NULL;
     }
   return dp;
-} /* mh_open */
+}                               /* mh_open */
 
-void mh_close (DIR *dp)
+void
+mh_close (DIR * dp)
 {
   closedir (dp);
-} /* mh_close */
+}                               /* mh_close */
 
-message_t *mh_read_message (DIR *dp)
+message_t *
+mh_read_message (DIR * dp)
 {
   int isheaders = 1;
   int have_from = 0, have_date = 0, have_sender = 0;
@@ -87,20 +93,21 @@ message_t *mh_read_message (DIR *dp)
   char buffer[BUFSIZ], *filename;
   FILE *fp;
 
-  message = malloc_message ();
+  message = allocate_message ();
 
   filename = NULL;
 
-  for(;;)
+  for (;;)
     {
-      d_content = readdir(dp);
-      if (d_content == NULL) return NULL;
+      d_content = readdir (dp);
+      if (d_content == NULL)
+        return NULL;
       if (d_content->d_name[0] == '.')
-	continue;
+        continue;
 
-      filename = (char *) xrealloc 
-	(filename, ((strlen (d_content->d_name)) + 
-		    (strlen (config.boxname)) + 2));
+      filename = (char *) xrealloc
+        (filename, ((strlen (d_content->d_name)) +
+                    (strlen (config.boxname)) + 2));
 
 /*       message->headers = (char *) xrealloc (message->headers, 0); */
 /*       message->hbytes = 0; */
@@ -112,13 +119,13 @@ message_t *mh_read_message (DIR *dp)
       fp = m_fopen (filename, "r");
       isheaders = 1;
       if (fp == NULL)
-	{
-	  free (message->headers);
-	  free (message->body);
-	  message->hbytes = 0;
-	  message->bbytes = 0;
-	  continue;
-	}
+        {
+          free (message->headers);
+          free (message->body);
+          message->hbytes = 0;
+          message->bbytes = 0;
+          continue;
+        }
 
       fgets (buffer, BUFSIZ, fp);
 
@@ -137,76 +144,80 @@ message_t *mh_read_message (DIR *dp)
 /* 	      continue; */
 /* 	    } */
 /* 	} */
-      
+
       fseek (fp, 0, SEEK_SET);
 
       while (fgets (buffer, BUFSIZ, fp) != NULL)
-	{
-	  s = strlen (buffer);
-	  if (0 == strncmp ("\n", buffer, 1) && isheaders == 1)
-	    {
-	      isheaders = 0;
-	      continue;
-	    } /* if */
-	  if (isheaders)
-	    {
-	      if (0 == strncasecmp ("From: ", buffer, 6))
-		have_from = 1;
-	      if (0 == strncasecmp ("Sender: ", buffer, 8))
-		have_sender = 1;
-	      if (0 == strncasecmp ("Date: ", buffer, 6))
-		have_date = 1;
-	      if (0 == strncasecmp ("Return-Path: ", buffer, 13))
-		  message->from = parse_return_path (buffer);
+        {
+          s = strlen (buffer);
+          if (0 == strncmp ("\n", buffer, 1) && isheaders == 1)
+            {
+              isheaders = 0;
+              continue;
+            }                   /* if */
+          if (isheaders)
+            {
+              if (0 == strncasecmp ("From: ", buffer, 6))
+                have_from = 1;
+              if (0 == strncasecmp ("Sender: ", buffer, 8))
+                have_sender = 1;
+              if (0 == strncasecmp ("Date: ", buffer, 6))
+                have_date = 1;
+              if (0 == strncasecmp ("Return-Path: ", buffer, 13))
+                message->from = parse_return_path (buffer);
 
-	      message->headers =
-		(char *) realloc (message->headers,
-				  ((1 + s + message->hbytes) * sizeof (char)));
-	      strcpy (message->headers + message->hbytes, buffer);
-	      message->hbytes += s;
-	    } /* if */
-	  else
-	    {
-	      message->body =
-		(char *) realloc (message->body,
-				  ((1 + s + message->bbytes) * sizeof (char)));
-	      strcpy (message->body + message->bbytes, buffer);
-	      message->bbytes += s;
-	    } /* else */
-	} /* while */
+              message->headers =
+                (char *) realloc (message->headers,
+                                  ((1 + s +
+                                    message->hbytes) * sizeof (char)));
+              strcpy (message->headers + message->hbytes, buffer);
+              message->hbytes += s;
+            }                   /* if */
+          else
+            {
+              message->body =
+                (char *) realloc (message->body,
+                                  ((1 + s +
+                                    message->bbytes) * sizeof (char)));
+              strcpy (message->body + message->bbytes, buffer);
+              message->bbytes += s;
+            }                   /* else */
+        }                       /* while */
 
-      if ((!have_from && !have_sender)|| !have_date)
-	{
-	  if (config.merr)
-	    fprintf (stderr, "%s: %s: Not a RFC 2822 message\n",
-		     APPNAME, filename);
-	  fclose (fp);
-	  free (message->headers);
-	  message->headers = NULL;
-	  free (message->body);
-	  message->body = NULL;
-	  message->hbytes = 0;
-	  message->bbytes = 0;
-	  continue;
-	}
+      if ((!have_from && !have_sender) || !have_date)
+        {
+          if (config.merr)
+            fprintf (stderr, "%s: %s: Not a RFC 2822 message\n",
+                     APPNAME, filename);
+          fclose (fp);
+          free (message->headers);
+          message->headers = NULL;
+          free (message->body);
+          message->body = NULL;
+          message->hbytes = 0;
+          message->bbytes = 0;
+          continue;
+        }
 
       else
-	{
-	  message->filename = (char *) xstrdup (filename);
-	  fclose (fp);
-	  free (filename);
+        {
+          message->filename = (char *) xstrdup (filename);
+          fclose (fp);
+          free (filename);
 
-	  return message;
-	}
-    } /* for */
-} /* mh_read_message */
+          return message;
+        }
+    }                           /* for */
+}                               /* mh_read_message */
 
-void mh_write_message (message_t *m, const char *path)
+void
+mh_write_message (message_t * m, const char *path)
 {
   struct dirent *dc;
   int x, y = 0;
   char s1[BUFSIZ];
-  DIR *d; FILE *f;
+  DIR *d;
+  FILE *f;
 
   d = m_opendir (path);
   rewinddir (d);
@@ -215,11 +226,11 @@ void mh_write_message (message_t *m, const char *path)
     {
       x = strtol (dc->d_name, NULL, 10);
       if (x > y)
-	y = x;
+        y = x;
     }
   y++;
   sprintf (s1, "%s/%i", path, y);
-  
+
   f = m_fopen (s1, "w");
   fprintf (f, "%s\n%s", m->headers, m->body);
   fclose (f);

src/mh.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   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,33 +15,36 @@
   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: mh.h,v 1.6 2003-03-30 23:07:10 dspiljar Exp $ */
+*/
 
 #ifndef MH_H
-#define MH_H 1
+#  define MH_H 1
 
-#include <config.h>
+#  include <config.h>
 
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
+#  ifdef HAVE_DIRENT_H
+#    include <dirent.h>
+#  else
+#    ifdef HAVE_SYS_NDIR_H
+#      include <sys/ndir.h>
+#    endif
+       /* HAVE_SYS_NDIR_H */
+#    ifdef HAVE_SYS_DIR_H
+#      include <sys/dir.h>
+#    endif
+       /* HAVE_SYS_DIR_H */
+#    ifdef HAVE_NDIR_H
+#      include <ndir.h>
+#    endif
+       /* HAVE_NDIR_H */
+#  endif
+       /* HAVE_DIRENT_H */
 
-#include "mboxgrep.h"
+#  include "mboxgrep.h"
 
 DIR *mh_open (const char *path);
-void mh_close (DIR *dp);
-message_t *mh_read_message (DIR *dp);
-void mh_write_message (message_t *m, const char *path);
+void mh_close (DIR * dp);
+message_t *mh_read_message (DIR * dp);
+void mh_write_message (message_t * m, const char *path);
 
 #endif /* MH_H */

src/misc.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 - 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
@@ -15,12 +15,11 @@
   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: misc.c,v 1.17 2006-07-06 10:53:49 dspiljar Exp $ */
-
-#define _XOPEN_SOURCE  /* Pull in strptime(3) from time.h */
-#define _BSD_SOURCE    /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
-                        * from string.h. */
+#define _XOPEN_SOURCE           /* Pull in strptime(3) from time.h */
+#define _BSD_SOURCE             /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
+                                 * from string.h. */
 
 #include <config.h>
 
@@ -38,7 +37,6 @@
 
 format_t
 folder_format (const char *name)
-     /* {{{  */
 {
   format_t f;
 
@@ -63,16 +61,15 @@ folder_format (const char *name)
   else
     {
       if (config.merr)
-	fprintf (stderr, "mboxgrep: %s: unknown folder type\n", name);
+        fprintf (stderr, "%s: %s: unknown folder type\n", APPNAME, name);
       exit (2);
     }
 
   return f;
 }
-/* }}} */
 
-lockmethod_t lock_method (const char *name)
-     /* {{{  */
+lockmethod_t
+lock_method (const char *name)
 {
   lockmethod_t l;
 
@@ -91,55 +88,54 @@ lockmethod_t lock_method (const char *name)
   else
     {
       if (config.merr)
-	fprintf (stderr, "mboxgrep: %s: unknown file locking method\n", name);
+        fprintf (stderr, "mboxgrep: %s: unknown file locking method\n", name);
       exit (2);
     }
 
   return l;
 }
-/* }}} */
 
-/* time_t parse_date(char *datestr) */
-     /* {{{  */
-/* { */
-/*   time_t t; */
-/*   const char *fmt = "%d%n%b%n%Y%n%T"; */
-/*   int h, m; */
-/*   struct tm tm; */
-/*   char *str2, str1[BUFSIZ]; */
+/*
+time_t parse_date(char *datestr)
+{
+  time_t t;
+  const char *fmt = "%d%n%b%n%Y%n%T";
+  int h, m;
+  struct tm tm;
+  char *str2, str1[BUFSIZ];
 
-/*   sscanf (datestr, "Date: %[^\r\n]", str1); */
+  sscanf (datestr, "Date: %[^\r\n]", str1);
 
-/*   str2 = (char *) strptime (str1, "%d%n%b%n%Y%n%T", &tm); */
-/*   if (str2 == NULL) */
-/*     str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm); */
-/*   if (str2 == NULL) */
-/*     return (time_t) 0; */
- 
-/*   if (sscanf (str2, "%3d%2d", &h, &m) == 2) */
-/*     { */
-/*       tm.tm_hour -= h; */
-/*       tm.tm_min -= (h >= 0 ? m : -m); */
-/*       t = (time_t) mktime (&tm); */
-/*     } */
+  str2 = (char *) strptime (str1, "%d%n%b%n%Y%n%T", &tm);
+  if (str2 == NULL)
+    str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm);
+  if (str2 == NULL)
+    return (time_t) 0;
 
-/*   return t; */
-/* } */
-/* }}} */
+  if (sscanf (str2, "%3d%2d", &h, &m) == 2)
+    {
+      tm.tm_hour -= h;
+      tm.tm_min -= (h >= 0 ? m : -m);
+      t = (time_t) mktime (&tm);
+    }
 
-char * parse_return_path(char *rpath)
-     /* {{{  */
+   return t;
+}
+*/
+
+char *
+parse_return_path (char *rpath)
 {
   char *blah1, blah2[BUFSIZ];
 
-  sscanf(rpath, "Return-Path: <%[^\r\n>]>", blah2);
+  sscanf (rpath, "Return-Path: <%[^\r\n>]>", blah2);
   blah1 = xstrdup (blah2);
 
   return blah1;
 }
-/* }}} */
 
-void * malloc_message (void)
+void *
+allocate_message (void)
 {
   message_t *message;
 
@@ -158,7 +154,8 @@ void * malloc_message (void)
   return message;
 }
 
-void postmark_print (message_t *msg)
+void
+postmark_print (message_t * msg)
 {
   time_t tt;
   struct tm *ct;
@@ -185,9 +182,10 @@ set_default_options (void)
   config.dedup = 0;
   config.recursive = 0;
   config.ignorecase = 0;
-  config.format = MBOX; /* default mailbox format */
-  config.lock = FCNTL; /* default file locking method */
-  config.merr = 1; /* report errors by default */
+  config.format = MBOX;         /* default mailbox format */
+  config.lock = FCNTL;          /* default file locking method */
+  config.merr = 1;              /* report errors by default */
+  config.debug = 0;
 }
 
 void
@@ -197,107 +195,108 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
 
   while (1)
     {
-      c = getopt_long (*argc, argv, "BcdEe:GHhil:m:n:o:Pp:rsVv", long_options, 
-		       &option_index);
+      c = getopt_long (*argc, argv, "BcdEe:GHhil:m:n:o:Pp:rsVv", long_options,
+                       &option_index);
 
       if (c == -1)
-	break;
+        break;
 
       switch (c)
-	/* {{{  */
-
-	{
-	case '?':
-	  usage();
-	case 'c':
-	  config.action = COUNT;
-	  break;
-	case 'd':
-	  config.action = DELETE;
-	  break;
-	case 'e':
-	  config.regex_s = xstrdup (optarg);
-	  config.haveregex = 1;
-	  break;
-	case 'o':
-	  config.outboxname = xstrdup (optarg);
-	  config.action = WRITE;
-	  break;
-	case 'E':
-	  config.extended = 1;
-	  break;
-	case 'G':
-	  config.extended = 0;
-	  break;
-	case 'P':
+        {
+        case '?':
+          usage ();
+        case 'c':
+          config.action = COUNT;
+          break;
+        case 'd':
+          config.action = DELETE;
+          break;
+        case 'e':
+          config.regex_s = xstrdup (optarg);
+          config.haveregex = 1;
+          break;
+        case 'o':
+          config.outboxname = xstrdup (optarg);
+          config.action = WRITE;
+          break;
+        case 'E':
+          config.extended = 1;
+          break;
+        case 'G':
+          config.extended = 0;
+          break;
+        case 'P':
 #ifdef HAVE_LIBPCRE
-	  config.extended = 0;
-	  config.perl = 1;
+          config.extended = 0;
+          config.perl = 1;
 #else
-	  fprintf(stderr, 
-		  "%s: Support for Perl regular expressions not "
-		  "compiled in\n");
-	  exit(2);
+          fprintf (stderr,
+                   "%s: Support for Perl regular expressions not "
+                   "compiled in\n", APPNAME);
+          exit (2);
 #endif /* HAVE_LIBPCRE */
-	  break;
-	case 'h':
-	  help ();
-	  break;
-	case 'i':
-	  config.ignorecase = 1;
-	  break;
-	case 'm':
-	  config.format = folder_format (optarg);
-	  break;
-	case 'l':
-	  config.lock = lock_method (optarg);
-	  break;
-	case 'p':
-	  config.action = PIPE;
-	  config.pipecmd = xstrdup (optarg);
-	  break;
-	case 'V':
-	  version ();
-	  break;
-	case 'v':
-	  config.invert = 1;
-	  break;
-	case 'H':
-	  config.headers = 1;
-	  break;
-	case 'B':
-	  config.body = 1;
-	  break;
-	case 's':
-	  config.merr = 0;
-	  break;
-	case 201:
-	  config.lock = 0;
-	  break;
-	case 'r':
-	  config.recursive = 1;
-	  break;
+          break;
+        case 'h':
+          help ();
+          break;
+        case 'i':
+          config.ignorecase = 1;
+          break;
+        case 'm':
+          config.format = folder_format (optarg);
+          break;
+        case 'l':
+          config.lock = lock_method (optarg);
+          break;
+        case 'p':
+          config.action = PIPE;
+          config.pipecmd = xstrdup (optarg);
+          break;
+        case 'V':
+          version ();
+          break;
+        case 'v':
+          config.invert = 1;
+          break;
+        case 'H':
+          config.headers = 1;
+          break;
+        case 'B':
+          config.body = 1;
+          break;
+        case 's':
+          config.merr = 0;
+          break;
+        case 201:
+          config.lock = 0;
+          break;
+        case 202:
+          config.debug = 1;
+          fprintf (stderr, "%s: %s, line %d: enable debugging\n",
+                   APPNAME, __FILE__, __LINE__);
+          break;
+        case 'r':
+          config.recursive = 1;
+          break;
         case 200:
           config.dedup = 1;
           break;
         case 'n':
-	  {
-	    switch (optarg[0])
-	      {
-	        case 'd':
-		  config.dedup = 1;
-		  break;
-		case 'l':
-		  config.lock = 0;
-		  break;
-	        default:
-		  fprintf(stderr, "%s: invalid option -- n%c\n", 
-			  APPNAME, optarg[0]);
-		  exit(2);
-	      }
-	  }
-	} /* switch */
-
-      /* }}} */
-    } /* while */
+          {
+            switch (optarg[0])
+              {
+              case 'd':
+                config.dedup = 1;
+                break;
+              case 'l':
+                config.lock = 0;
+                break;
+              default:
+                fprintf (stderr, "%s: invalid option -- n%c\n",
+                         APPNAME, optarg[0]);
+                exit (2);
+              }
+          }
+        }                       /* switch */
+    }                           /* while */
 }

src/misc.h

@@ -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 - 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
@@ -15,24 +15,24 @@
   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: misc.h,v 1.9 2006-07-06 10:53:49 dspiljar Exp $ */
+*/
 
 #ifndef MISC_H
-#define MISC_H 1
+#  define MISC_H 1
 
-#include "mboxgrep.h"
-#include "getopt.h"
-#include "message.h"
+#  include "mboxgrep.h"
+#  include "getopt.h"
+#  include "message.h"
 /* #include <time.h> */
 
 format_t folder_format (const char *name);
 lockmethod_t lock_method (const char *name);
 /* time_t parse_date(char *datestr); */
-char * parse_return_path(char *rpath);
-void * malloc_message (void);
-void postmark_print (message_t *msg);
+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, struct option *long_options);
+void get_runtime_options (int *argc, char **argv,
+                          struct option *long_options);
 
 #endif /* MISC_H */

src/re.c

@@ -1,6 +1,6 @@
-/* -*- C -*-
+/*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2006  Daniel Spiljar
+  Copyright (C) 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
@@ -15,18 +15,18 @@
   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: re.c,v 1.3 2006-07-07 04:15:44 dspiljar Exp $ */
+*/
 
 #include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <regex.h>
 #ifdef HAVE_LIBPCRE
-#include <pcre.h>
+#  include <pcre.h>
 #endif /* HAVE_LIBPCRE */
 #include "mboxgrep.h"
 #include "message.h"
+#include "wrap.h"               /* xcalloc() et cetera */
 
 #ifdef HAVE_LIBPCRE
 void
@@ -36,35 +36,32 @@ pcre_init (void)
   const char *error;
 
   config.pcre_pattern =
-    (pcre *) pcre_compile (config.regex_s, 
-			   (config.ignorecase ? PCRE_CASELESS : 0),
-			   &error, &errptr, NULL);
+    (pcre *) pcre_compile (config.regex_s,
+                           (config.ignorecase ? PCRE_CASELESS : 0),
+                           &error, &errptr, NULL);
   if (config.pcre_pattern == NULL)
     {
       if (config.merr)
-	fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s,
-		 error);
-      exit(2);
+        fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, error);
+      exit (2);
     }
 }
 
 void
-pcre_match (message_t *msg)
+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);
+                 (pcre_extra *) config.pcre_hints,
+                 msg->headers, (int) strlen (msg->headers), 0, 0, of, BUFSIZ);
   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);
+                 (pcre_extra *) config.pcre_hints,
+                 msg->body, (int) strlen (msg->body), 0, 0, of, BUFSIZ);
 
   config.res1 = config.res1 ^ 1;
   config.res2 = config.res2 ^ 1;
@@ -77,33 +74,34 @@ regex_init (void)
   int flag1 = 0, flag2 = 0;
   int errcode = 0;
   char errbuf[BUFSIZ];
-	  
+
   if (config.ignorecase)
     flag1 = REG_ICASE;
   if (config.extended)
     flag2 = REG_EXTENDED;
-	
-  errcode = regcomp ((regex_t *) config.posix_pattern, config.regex_s, 
-		     (flag1 | flag2 | REG_NEWLINE ));
+
+  config.posix_pattern = (regex_t *) xmalloc (sizeof (regex_t));
+  errcode = regcomp ((regex_t *) config.posix_pattern, config.regex_s,
+                     (flag1 | flag2 | REG_NEWLINE));
   if (0 != errcode)
     {
       if (config.merr)
-	{
-	  regerror (errcode, (regex_t *) config.posix_pattern, errbuf, BUFSIZ);
-	  fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s,
-		   errbuf);
-	}
+        {
+          regerror (errcode, (regex_t *) config.posix_pattern, errbuf,
+                    BUFSIZ);
+          fprintf (stderr, "%s: %s: %s\n", APPNAME, config.regex_s, errbuf);
+        }
       exit (2);
     }
 }
 
 void
-regex_match (message_t *msg)
+regex_match (message_t * msg)
 {
   if (config.headers)
     config.res1 = regexec ((regex_t *) config.posix_pattern,
-			   msg->headers, 0, NULL, 0);
+                           msg->headers, 0, NULL, 0);
   if (config.body)
     config.res2 = regexec ((regex_t *) config.posix_pattern,
-			   msg->body, 0, NULL, 0);
+                           msg->body, 0, NULL, 0);
 }

src/re.h

@@ -1,6 +1,6 @@
-/* -*- C -*-
+/*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2006  Daniel Spiljar
+  Copyright (C) 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
@@ -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
-
-  $Id: re.h,v 1.3 2006-07-07 04:15:44 dspiljar Exp $ */
+*/
 
 #include "mboxgrep.h"
 
 #ifdef HAVE_LIBPCRE
 void pcre_init (void);
-void pcre_match (message_t *msg);
+void pcre_match (message_t * msg);
 #endif /* HAVE_LIBPCRE */
 void regex_init (void);
-void regex_match (message_t *msg);
+void regex_match (message_t * msg);

src/scan.c

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
    mboxgrep - scan mailbox for messages matching a regular expression
-   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006  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
@@ -15,8 +15,7 @@
    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: scan.c,v 1.32 2006-10-22 23:34:49 dspiljar Exp $ */
+ */
 
 #include <config.h>
 
@@ -26,20 +25,23 @@
 #include <sys/types.h>
 
 #ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
+#  include <dirent.h>
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
+#  define dirent direct
+#  define NAMLEN(dirent) (dirent)->d_namlen
+#  ifdef HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#  endif
+       /* HAVE_SYS_NDIR_H */
+#  ifdef HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#  endif
+       /* HAVE_SYS_DIR_H */
+#  ifdef HAVE_NDIR_H
+#    include <ndir.h>
+#  endif
+       /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 
 #include <time.h>
@@ -57,20 +59,21 @@
 #include "misc.h"
 #include "re.h"
 #ifdef HAVE_FTS_OPEN
-# include <sys/stat.h>
-# include <fts.h>
+#  include <sys/stat.h>
+#  include <fts.h>
 #else
-# ifdef HAVE_FTW
-#  include <ftw.h>
-# endif /* HAVE_FTW */
+#  ifdef HAVE_FTW
+#    include <ftw.h>
+#  endif
+       /* HAVE_FTW */
 #endif /* HAVE_FTS_OPEN */
 
 #ifdef HAVE_LIBDMALLOC
-#include <dmalloc.h>
+#  include <dmalloc.h>
 #endif /* HAVE_LIBDMALLOC */
 
-void scan_mailbox (char path[])
-     /* {{{  */
+void
+scan_mailbox (char path[])
 {
   static FILE *outf;
   static mbox_t *mbox, *out;
@@ -82,40 +85,45 @@ void scan_mailbox (char path[])
 
   if (config.format == MAILDIR && config.action == WRITE)
     {
-      foo = opendir (config.outboxname); /* do NOT change this to m_opendir! */
+      foo = opendir (config.outboxname);        /* do NOT change this to m_opendir! */
       if (foo == NULL && errno == ENOENT)
-	maildir_create (config.outboxname);
-      else closedir (foo);
+        maildir_create (config.outboxname);
+      else
+        closedir (foo);
 
       if (-1 == maildir_check (config.outboxname))
-	{
-	  if (config.merr)
-	    fprintf (stderr, "%s: %s: Not a maildir folder\n", APPNAME, 
-		     config.outboxname);
-	  exit (2);
-	}
+        {
+          if (config.merr)
+            fprintf (stderr, "%s: %s: Not a maildir folder\n", APPNAME,
+                     config.outboxname);
+          exit (2);
+        }
     }
 
   runtime.count = 0;
   if (config.action == DELETE)
     delete = 1;
 
-  if ((config.format == MBOX) || (config.format == ZMBOX) ||
-      (config.format == BZ2MBOX))
+  if ((config.format == MBOX) || (config.format == ZMBOX)
+      || (config.format == BZ2MBOX))
     {
       mbox = (mbox_t *) mbox_open (path, "r");
-      if (mbox == NULL) return;
+      if (mbox == NULL)
+        return;
     }
-  else if ((config.format == MH) || (config.format == NNMH) ||
-	   (config.format == NNML))
+  else if ((config.format == MH) || (config.format == NNMH)
+           || (config.format == NNML))
     {
       boxd = mh_open (path);
-      if (boxd == NULL) return;
+      if (boxd == NULL)
+        return;
     }
   else if (config.format == MAILDIR)
     {
       maildird = maildir_open (path);
-      if (maildird == NULL) return;
+
+      if (maildird == NULL)
+        return;
     }
 
   for (;;)
@@ -123,102 +131,105 @@ void scan_mailbox (char path[])
       config.res1 = 1;
       config.res2 = 1;
 
-      if ((config.format == MBOX) || (config.format == ZMBOX) ||
-	  (config.format == BZ2MBOX))
-	msg = (message_t *) mbox_read_message (mbox);
-      else if ((config.format == MH) || (config.format == NNMH) ||
-	       (config.format == NNML))
-	msg = (message_t *) mh_read_message (boxd);
+      if ((config.format == MBOX) || (config.format == ZMBOX)
+          || (config.format == BZ2MBOX))
+        msg = (message_t *) mbox_read_message (mbox);
+      else if ((config.format == MH) || (config.format == NNMH)
+               || (config.format == NNML))
+        msg = (message_t *) mh_read_message (boxd);
       else if (config.format == MAILDIR)
-	msg = (message_t *) maildir_read_message (maildird);
+        msg = (message_t *) maildir_read_message (maildird);
 
-      if (msg == NULL) break;
+      if (msg == NULL)
+        break;
 
-      if (msg->from == NULL) msg->from = (char *) xstrdup ("nobody");
+      if (msg->from == NULL)
+        msg->from = (char *) xstrdup ("nobody");
 
 #ifdef HAVE_LIBPCRE
       if (config.perl)
-	pcre_match (msg);
+        pcre_match (msg);
       else
 #endif /* HAVE_LIBPCRE */
-	regex_match (msg);
+        regex_match (msg);
 
       if (config.dedup)
-	isdup = md5_check_message (msg->body, runtime.cs);
+        isdup = md5_check_message (msg->body, runtime.cs);
 
       if (((config.res1 == 0) | (config.res2 == 0)) ^
-	  ((config.invert ^ delete)) &&
-	  ((config.dedup && !isdup) || !config.dedup))
-	{
-	  if (config.action == DISPLAY)
-	    {
-	      if (config.format != MBOX && config.format != ZMBOX
-		  && config.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)
-	    {
-	      if (config.format == MAILDIR)
-		maildir_write_message (msg, config.outboxname);
-	      else if (config.format == MH || config.format == NNMH ||
-		       config.format == NNML)
-		mh_write_message (msg, config.outboxname);
-	      else if ((config.format == MBOX) || (config.format == ZMBOX) ||
-		       (config.format == BZ2MBOX))
-		{
-		  out = mbox_open (config.outboxname, "w");
-		  /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
-		  mbox_write_message (msg, out);
-		  mbox_close (out);
-		}
-	    }
-	  else if (config.action == PIPE)
-	    {
-	      outf = popen (config.pipecmd, "w");
-	      if (outf == NULL)
-		{
-		  if (config.merr)
-		    {
-		      fprintf (stderr, "%s: %s: ", APPNAME, config.pipecmd);
-		      perror (NULL);
-		    }
-		  exit (2);
-		} /* if */
-	      fprintf (outf, "%s\n%s", msg->headers, msg->body);
-	      pclose (outf);
-	    }
-	  else if (config.action == COUNT)
-	    runtime.count++;
-	  else if (config.action == DELETE &&
-		   ((config.format == MBOX) || (config.format == ZMBOX) ||
-		    (config.format == BZ2MBOX)))
-	    mbox_write_message (msg, runtime.tmp_mbox);
-	}
+          ((config.invert ^ delete)) &&
+          ((config.dedup && !isdup) || !config.dedup))
+        {
+          if (config.action == DISPLAY)
+            {
+              if (config.format != MBOX && config.format != ZMBOX
+                  && config.format != BZ2MBOX
+                  && 0 != strncmp ("From ", msg->headers, 5))
+                postmark_print (msg);
 
-      else if (((((config.res1 == 0) | (config.res2 == 0)) ^
-		 config.invert) && delete) &&
-	       ((config.format == MH) || (config.format == NNMH) || 
-		(config.format == NNML) || (config.format == MAILDIR)))
-	m_unlink(msg->filename);
+              fprintf (stdout, "%s\n%s", msg->headers, msg->body);
+            }
+          else if (config.action == WRITE)
+            {
+              if (config.format == MAILDIR)
+                maildir_write_message (msg, config.outboxname);
+              else if (config.format == MH || config.format == NNMH
+                       || config.format == NNML)
+                mh_write_message (msg, config.outboxname);
+              else if ((config.format == MBOX) || (config.format == ZMBOX)
+                       || (config.format == BZ2MBOX))
+                {
+                  out = mbox_open (config.outboxname, "w");
+                  /* fprintf (out->fp, "%s\n%s", msg->headers, msg->body); */
+                  mbox_write_message (msg, out);
+                  mbox_close (out);
+                }
+            }
+          else if (config.action == PIPE)
+            {
+              outf = popen (config.pipecmd, "w");
+              if (outf == NULL)
+                {
+                  if (config.merr)
+                    {
+                      fprintf (stderr, "%s: %s: ", APPNAME, config.pipecmd);
+                      perror (NULL);
+                    }
+                  exit (2);
+                }               /* if */
+              fprintf (outf, "%s\n%s", msg->headers, msg->body);
+              pclose (outf);
+            }
+          else if (config.action == COUNT)
+            runtime.count++;
+          else if (config.action == DELETE &&
+                   ((config.format == MBOX) || (config.format == ZMBOX)
+                    || (config.format == BZ2MBOX)))
+            mbox_write_message (msg, runtime.tmp_mbox);
+        }
 
-      free(msg->body);
-      free(msg->headers);
-      free(msg);
-    } /* for */
-  if ((config.format == MBOX) || (config.format == ZMBOX) ||
-      (config.format == BZ2MBOX))
+      else
+        if (((((config.res1 == 0) | (config.res2 == 0)) ^ config.invert)
+             && delete) && ((config.format == MH) || (config.format == NNMH)
+                            || (config.format == NNML)
+                            || (config.format == MAILDIR)))
+        m_unlink (msg->filename);
+
+      free (msg->body);
+      free (msg->headers);
+      free (msg);
+    }                           /* for */
+
+  if ((config.format == MBOX) || (config.format == ZMBOX)
+      || (config.format == BZ2MBOX))
     mbox_close (mbox);
-  else if ((config.format == MH) || (config.format == NNMH) ||
-	   (config.format == NNML))
-    mh_close(boxd);
+  else if ((config.format == MH) || (config.format == NNMH)
+           || (config.format == NNML))
+    mh_close (boxd);
 }
-/* }}} */
-
-void recursive_scan (char path[])
-     /* {{{  */
 
+void
+recursive_scan (char path[])
 {
 #ifdef HAVE_FTS_OPEN
   FTS *ftsfoo;
@@ -236,9 +247,9 @@ void recursive_scan (char path[])
 
     if (ftsfoo == NULL)
       {
-	/* fixme (?) */
-	perror(APPNAME);
-	exit (2);
+        /* fixme (?) */
+        perror (APPNAME);
+        exit (2);
       }
 
     while ((ftsbar = fts_read (ftsfoo)))
@@ -251,34 +262,34 @@ void recursive_scan (char path[])
 #endif /* HAVE_FTS_OPEN */
 }
 
-/* }}} */
-
-int md5_check_message (char *body, checksum_t *chksum)
-     /* {{{  */
+int
+md5_check_message (char *body, checksum_t * chksum)
 {
   struct md5_ctx a;
   char b[16];
   int i;
 
   md5_init_ctx (&a);
+
   if (body == NULL)
     md5_process_bytes ("", 0, &a);
   else
-    md5_process_bytes (body, strlen(body), &a);
-  md5_finish_ctx(&a, b);
+    md5_process_bytes (body, strlen (body), &a);
+
+  md5_finish_ctx (&a, b);
 
   for (i = 0; i < chksum->n; i++)
     {
-      if (0 == strncmp ((char *)chksum->md5[i], b, 16)) 
-	return 1; 
+      if (0 == strncmp ((char *) chksum->md5[i], b, 16))
+        return 1;
     }
 
-  chksum->md5 = 
-	(char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
+  chksum->md5 =
+    (char **) xrealloc (chksum->md5, (1 + chksum->n) * sizeof (char *));
+
   chksum->md5[chksum->n] = xstrdup (b);
 
   (chksum->n)++;
 
   return 0;
 }
-/* }}} */

src/scan.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   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,16 +15,15 @@
   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: scan.h,v 1.7 2003-03-30 23:07:10 dspiljar Exp $ */
+*/
 
 #ifndef SCAN_H
-#define SCAN_H 1
+#  define SCAN_H 1
 
-#include "mboxgrep.h"
+#  include "mboxgrep.h"
 
 void scan_mailbox (char path[]);
 void recursive_scan (char path[]);
-int md5_check_message (char *body, checksum_t *chksum);
+int md5_check_message (char *body, checksum_t * chksum);
 
 #endif /* SCAN_H */

src/wrap.c

@@ -1,6 +1,6 @@
 /* -*- C -*- 
   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,8 +15,7 @@
   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: wrap.c,v 1.13 2006-01-20 03:00:39 dspiljar Exp $ */
+*/
 
 #include <config.h>
 #include <unistd.h>
@@ -25,24 +24,30 @@
 #include <errno.h>
 
 #ifdef HAVE_DIRENT_H
-# include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
+#  include <dirent.h>
+#  define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
+#  define dirent direct
+#  define NAMLEN(dirent) (dirent)->d_namlen
+#  ifdef HAVE_SYS_NDIR_H
+#    include <sys/ndir.h>
+#  endif
+       /* HAVE_SYS_NDIR_H */
+#  ifdef HAVE_SYS_DIR_H
+#    include <sys/dir.h>
+#  endif
+       /* HAVE_SYS_DIR_H */
+#  ifdef HAVE_NDIR_H
+#    include <ndir.h>
+#  endif
+       /* HAVE_NDIR_H */
 #endif /* HAVE_DIRENT_H */
 #ifdef HAVE_LIBZ
-#include <zlib.h>
+#  include <zlib.h>
 #endif /* HAVE_LIBZ */
+#ifdef HAVE_LIBBZ2
+#  include <bzlib.h>
+#endif /* HAVE_LIBBZ2 */
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -52,12 +57,13 @@
 #include "mboxgrep.h"
 
 #ifndef APPNAME
-#define APPNAME "mboxgrep"
+#  define APPNAME "mboxgrep"
 #endif
 
 #define BUFLEN 16384
 
-int m_open (const char *pathname, int flags, mode_t mode)
+int
+m_open (const char *pathname, int flags, mode_t mode)
 {
   int blah;
 
@@ -65,18 +71,19 @@ int m_open (const char *pathname, int flags, mode_t mode)
   if (blah == -1 && config.merr)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, pathname);
-	  perror (NULL);
-	}
-/* failure to open a file for writing should be fatal */
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, pathname);
+          perror (NULL);
+        }
+      /* failure to open a file for writing should be fatal */
       if (((flags & O_WRONLY) == O_WRONLY) || ((flags & O_RDWR) == O_RDWR))
-	exit (2);
+        exit (2);
     }
   return blah;
-}      
+}
 
-FILE *m_fopen (const char *path, const char *mode)
+FILE *
+m_fopen (const char *path, const char *mode)
 {
   FILE *blah;
 
@@ -84,17 +91,18 @@ FILE *m_fopen (const char *path, const char *mode)
   if (blah == NULL)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, path);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, path);
+          perror (NULL);
+        }
       if (mode[0] == 'w')
-	exit (2);
+        exit (2);
     }
   return blah;
 }
 
-FILE *m_fdopen (int fildes, const char *mode)
+FILE *
+m_fdopen (int fildes, const char *mode)
 {
   FILE *blah;
 
@@ -102,29 +110,31 @@ FILE *m_fdopen (int fildes, const char *mode)
   if (blah == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
     }
   return blah;
 }
 
 #ifdef HAVE_LIBZ
 
-gzFile *m_gzdopen (int fildes, const char *mode)
+gzFile
+m_gzdopen (int fildes, const char *mode)
 {
-  gzFile *blah;
+  gzFile blah;
 
   blah = gzdopen (fildes, mode);
   if (blah == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
     }
   return blah;
 }
 
 #endif /* HAVE_LIBZ */
 
-DIR *m_opendir (const char *name)
+DIR *
+m_opendir (const char *name)
 {
   DIR *blah;
 
@@ -132,17 +142,18 @@ DIR *m_opendir (const char *name)
   if (blah == NULL)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, name);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, name);
+          perror (NULL);
+        }
     }
   return blah;
 }
 
 #ifndef HAVE_LIBDMALLOC
 
-void *xmalloc (size_t size)
+void *
+xmalloc (size_t size)
 {
   void *foo;
 
@@ -150,13 +161,14 @@ void *xmalloc (size_t size)
   if (foo == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
       exit (2);
     }
   return foo;
 }
 
-void *xrealloc (void *ptr, size_t size)
+void *
+xrealloc (void *ptr, size_t size)
 {
   void *foo;
 
@@ -164,13 +176,14 @@ void *xrealloc (void *ptr, size_t size)
   if (foo == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
       exit (2);
     }
   return foo;
 }
 
-void *xcalloc (size_t nmemb, size_t size)
+void *
+xcalloc (size_t nmemb, size_t size)
 {
   void *foo;
 
@@ -178,13 +191,14 @@ void *xcalloc (size_t nmemb, size_t size)
   if (foo == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
       exit (2);
     }
   return foo;
 }
 
-char *xstrdup (const char *s)
+char *
+xstrdup (const char *s)
 {
   char *foo;
 
@@ -192,7 +206,7 @@ char *xstrdup (const char *s)
   if (foo == NULL)
     {
       if (config.merr)
-	perror (APPNAME);
+        perror (APPNAME);
       exit (2);
     }
   return foo;
@@ -200,7 +214,8 @@ char *xstrdup (const char *s)
 
 #endif /* HAVE_LIBDMALLOC */
 
-int m_unlink (const char *pathname)
+int
+m_unlink (const char *pathname)
 {
   int baz;
 
@@ -208,17 +223,18 @@ int m_unlink (const char *pathname)
   if (baz == -1)
     {
       if (config.merr)
-	{
-	  fprintf (stderr, "%s: %s: ", APPNAME, pathname);
-	  perror (NULL);
-	}
+        {
+          fprintf (stderr, "%s: %s: ", APPNAME, pathname);
+          perror (NULL);
+        }
     }
   return baz;
 }
 
 #ifdef HAVE_LIBZ
 
-void gzwrite_loop (void *fp, char *str)
+void
+gzwrite_loop (void *fp, char *str)
 {
   int quux, len, baz;
 
@@ -226,11 +242,11 @@ void gzwrite_loop (void *fp, char *str)
   baz = strlen (str);
   for (;;)
     {
-      len = gzwrite (fp, (str+quux), 
-		     (((quux + BUFLEN) < baz) ? BUFLEN : (baz - quux)));
+      len = gzwrite (fp, (str + quux),
+                     (((quux + BUFLEN) < baz) ? BUFLEN : (baz - quux)));
       quux += len;
       if (quux == baz)
-	break;
+        break;
     }
 }
 
@@ -238,7 +254,8 @@ void gzwrite_loop (void *fp, char *str)
 
 #ifdef HAVE_LIBBZ2
 
-void bzwrite_loop (void *fp, char *str)
+void
+bzwrite_loop (void *fp, char *str)
 {
   int quux, len, baz;
 
@@ -246,11 +263,11 @@ void bzwrite_loop (void *fp, char *str)
   baz = strlen (str);
   for (;;)
     {
-      len = BZ2_bzwrite (fp, (str+quux), 
-			 (((quux + BUFLEN) < baz) ? BUFLEN : (baz - quux)));
+      len = BZ2_bzwrite (fp, (str + quux),
+                         (((quux + BUFLEN) < baz) ? BUFLEN : (baz - quux)));
       quux += len;
       if (quux == baz)
-	break;
+        break;
     }
 }
 

src/wrap.h

@@ -1,6 +1,6 @@
-/* -*- C -*- 
+/*
   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,63 +15,71 @@
   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: wrap.h,v 1.12 2006-01-20 03:00:39 dspiljar Exp $ */
+*/
 
 /* This file is part of mboxgrep. */
 
 /* wrappers around certain std functions */
 
 #ifndef WRAP_H
-#define WRAP_H
+#  define WRAP_H
 
-#include <config.h>
-#include <stdio.h>
-#include <sys/types.h>
+#  include <config.h>
+#  include <stdio.h>
+#  include <sys/types.h>
 
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
-#ifdef HAVE_LIBZ
-#include <zlib.h>
-#endif /* HAVE_LIBZ */
+#  ifdef HAVE_DIRENT_H
+#    include <dirent.h>
+#  else
+#    ifdef HAVE_SYS_NDIR_H
+#      include <sys/ndir.h>
+#    endif
+       /* HAVE_SYS_NDIR_H */
+#    ifdef HAVE_SYS_DIR_H
+#      include <sys/dir.h>
+#    endif
+       /* HAVE_SYS_DIR_H */
+#    ifdef HAVE_NDIR_H
+#      include <ndir.h>
+#    endif
+       /* HAVE_NDIR_H */
+#  endif
+       /* HAVE_DIRENT_H */
+#  ifdef HAVE_LIBZ
+#    include <zlib.h>
+#  endif
+       /* HAVE_LIBZ */
 
-#include <stdlib.h>
+#  include <stdlib.h>
 
-#ifdef HAVE_LIBDMALLOC
-# include <dmalloc.h>
-#endif /* HAVE_LIBDMALLOC */
+#  ifdef HAVE_LIBDMALLOC
+#    include <dmalloc.h>
+#  endif
+       /* HAVE_LIBDMALLOC */
 
 int m_open (const char *pathname, int flags, mode_t mode);
 
 FILE *m_fopen (const char *path, const char *mode);
 FILE *m_fdopen (int fildes, const char *mode);
-#ifdef HAVE_LIBZ
-gzFile *m_gzdopen (int fildes, const char *mode);
+#  ifdef HAVE_LIBZ
+gzFile m_gzdopen (int fildes, const char *mode);
 void gzwrite_loop (void *fp, char *str);
-#endif /* HAVE_LIBZ */
-#ifdef HAVE_LIBBZ2
+#  endif
+       /* HAVE_LIBZ */
+#  ifdef HAVE_LIBBZ2
 void bzwrite_loop (void *fp, char *str);
-#endif /* HAVE_LIBBZ2 */
+#  endif
+       /* HAVE_LIBBZ2 */
 
 DIR *m_opendir (const char *name);
 
-#ifndef HAVE_LIBDMALLOC
+#  ifndef HAVE_LIBDMALLOC
 void *xmalloc (size_t size);
 void *xrealloc (void *ptr, size_t size);
 void *xcalloc (size_t nmemb, size_t size);
 char *xstrdup (const char *s);
-#endif /* HAVE_LIBDMALLOC */
+#  endif
+       /* HAVE_LIBDMALLOC */
 
 int m_unlink (const char *pathname);