Bump to version 0.7.10 and import of changes that have been made between

2003 and 2006 and haven't been tracked by any SCM.

The changes are the following, in reverse order:

* 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.

* src/mboxgrep.h, src/main.c, src/maildir.c, src/scan.c:
Got rid off tmpp and maildir_count global variables (code
cleanup).

* 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).

* 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).

* 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().

* 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).

* 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).

* src/mbox.c, src/mbox.h:
File mode and ownership-altering code has been moved to a separate
function, tmpfile_mod_own (code cleanup).

* src/mbox.c, src/mbox.h:
Portions of the code from tmpfile_open moved to a new function,
tmpfile_name (code cleanup).

* src/maildir.c, src/mh.c:
Removed some unused variables (have_return_path).

* 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.

* src/scan.c, src/misc.c, src/misc.h:
Created postmark_print() to unclutter scan_mailbox().

* src/misc.c, src/misc.h, src/mbox.c, src/maildir.c, src/mh.c:
Some repetitive code moved to malloc_message().

* src/mbox.c:
Cleanup of mbox_write_message(); use of gzwrite_loop() and
bzwrite_loop().

* src/scan.c, src/wrap.h, src/wrap.c:
Wrote gzwrite_loop() and bzwrite_loop() to remove some repetitive
code from scan.c.

* src/scan.c:
md5_check_message(): array b and cast in strncmp are no longer
unsigned.

* src/info.c, src/mboxgrep.h:
Updated copyright information, changed author's email address
to the one at Panix.

* src/mbox.h, src/mbox.c, src/scan.c, src/main.c:
mbox_write_message(); further fixes of message deletion code.

* src/scan.c:
Fixed deleting messages from mbox folders compressed with
bzip2.

* src/main.c, src/mbox.c:
Moved James P. Dugal's ownership-preserving code from main()
to tmpfile_open().

* src/info.c:
If bzip2 support is compiled in, `--help' command should list
`bz2mbox' as a valid option to `--mailbox-format='.
This commit is contained in:
2018-10-04 22:07:27 +02:00
parent bd80cfbb4d
commit 0649ac9320
33 changed files with 1379 additions and 762 deletions

View File

@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# $Id: Makefile.in,v 1.1 2001/10/26 13:07:55 dspiljar Exp $
# $Id: Makefile.in,v 1.1 2001-10-26 13:07:55 dspiljar Exp $
MANPAGE = mboxgrep.1
INSTALL = @INSTALL@

View File

@@ -1,4 +1,4 @@
.Id $Id: mboxgrep.1,v 1.15 2003/08/24 19:51:14 dspiljar Exp $
.Id $Id: mboxgrep.1,v 1.16 2006-01-18 00:09:58 dspiljar Exp $
.TH MBOXGREP 1 "24 Aug 2003"
.SH NAME
mboxgrep \- displays email messages matching a pattern
@@ -119,4 +119,4 @@ well, little friend.
.SH URL
http://www.mboxgrep.org/
.SH AUTHOR
Daniel Spiljar <dspiljar@world.std.com>
Daniel Spiljar <dspiljar@panix.com>

View File

@@ -1,4 +1,4 @@
This is mboxgrep.info, produced by makeinfo version 4.3 from
This is mboxgrep.info, produced by makeinfo version 4.6 from
mboxgrep.texi.
INFO-DIR-SECTION Mail
@@ -29,8 +29,8 @@ File: mboxgrep.info, Node: Introduction, Next: Invoking, Up: Top
Introduction
************
`mboxgrep' is a small, non-interactive utility that scans mail
folders for messages matching regular expressions.
`mboxgrep' is a small, non-interactive utility that scans mail folders
for messages matching regular expressions.
It supports basic and extended POSIX regular expressions.
`Perl'-style regular expressions are supported as well, if `mboxgrep'
@@ -59,7 +59,7 @@ File: mboxgrep.info, Node: Invoking, Next: Examples, Prev: Introduction, Up:
Command-Line Arguments
**********************
The syntax of `mboxgrep' invocation is:
The syntax of `mboxgrep' invocation is:
mboxgrep [OPTIONS] PATTERN [MAILBOX]
@@ -87,6 +87,7 @@ File: mboxgrep.info, Node: Miscellaneous, Next: File locking, Up: Invoking
`-r'
Descend into directories recursively.

File: mboxgrep.info, Node: File locking, Next: Regexp selection, Prev: Miscellaneous, Up: Invoking
@@ -105,6 +106,7 @@ without locking.
`-nl'
Do not attempt to lock mbox folder files.

File: mboxgrep.info, Node: Regexp selection, Next: Output control, Prev: File locking, Up: Invoking
@@ -133,6 +135,7 @@ File: mboxgrep.info, Node: Regexp selection, Next: Output control, Prev: File
Invert the sense of matching, i.e. select only non-matching
messages.

File: mboxgrep.info, Node: Output control, Next: Search scope selection, Prev: Regexp selection, Up: Invoking
@@ -172,6 +175,7 @@ The options below change such behavior.
`-s'
Suppress error messages.

File: mboxgrep.info, Node: Search scope selection, Next: Mailbox type selection, Prev: Output control, Up: Invoking
@@ -183,22 +187,24 @@ File: mboxgrep.info, Node: Search scope selection, Next: Mailbox type selectio
`-B'
Match PATTERN against message body.

File: mboxgrep.info, Node: Mailbox type selection, Prev: Search scope selection, Up: Invoking
`--mailbox-format=FORMAT'
`-m FORMAT'
Specify mailbox FORMAT. Supported formats are `mbox' (default),
`zmbox' (gzip compressed mbox), `bzmbox' (bzip2 compressed mbox)
`zmbox' (gzip compressed mbox), `bz2mbox' (bzip2 compressed mbox)
`mh', `nnml', `nnmh', and `maildir'.

File: mboxgrep.info, Node: Examples, Next: Bugs, Prev: Invoking, Up: Top
Examples
********
Scan `$MAIL' for messages from Dirty Harry:
Scan `$MAIL' for messages from Dirty Harry:
mboxgrep -H '^From:.*callahan@homicide\.SFPD\.gov' $MAIL
@@ -226,10 +232,10 @@ File: mboxgrep.info, Node: Bugs, Next: To Vicky, Prev: Examples, Up: Top
Detecting Vermin
****************
Shortly, if `mboxgrep' crashes and/or works differently than
described in this manual, you've found a bug.
Shortly, if `mboxgrep' crashes and/or works differently than described
in this manual, you've found a bug.
Please report bugs to <dspiljar@world.std.com>. Instructions how to
Please report bugs to <dspiljar@panix.com>. Instructions how to
reproduce the bug or output from a debugger would be highly
appreciated. Don't, however, send any coredumps.
@@ -239,8 +245,8 @@ File: mboxgrep.info, Node: To Vicky, Prev: Bugs, Up: Top
Author's Dedication
*******************
`Mboxgrep' is dedicated in loving memory of Vicky, my cat who died
of tumor on Sep 12, 2002.
`Mboxgrep' is dedicated in loving memory of Vicky, my cat who died of
tumor on Sep 12, 2002.
You haven't been long with us, but you gave us a lot of joy and all
your big heart that stopped ticking too early. I will never forget you.
@@ -251,15 +257,15 @@ Sleep well, little friend.
Tag Table:
Node: Top197
Node: Introduction598
Node: Invoking1469
Node: Miscellaneous1830
Node: File locking2115
Node: Regexp selection2756
Node: Output control3307
Node: Search scope selection4300
Node: Mailbox type selection4541
Node: Examples4862
Node: Bugs5681
Node: To Vicky6089
Node: Invoking1466
Node: Miscellaneous1824
Node: File locking2110
Node: Regexp selection2752
Node: Output control3304
Node: Search scope selection4298
Node: Mailbox type selection4540
Node: Examples4863
Node: Bugs5679
Node: To Vicky6080

End Tag Table

View File

@@ -1,5 +1,5 @@
\input texinfo @c -*-texinfo-*-
@c $Id: mboxgrep.texi,v 1.19 2003/08/24 19:51:14 dspiljar Exp $
@c $Id: mboxgrep.texi,v 1.20 2006-01-18 00:09:58 dspiljar Exp $
@setfilename mboxgrep.info
@settitle Grep through mailboxes
@finalout
@@ -260,7 +260,7 @@ mboxgrep -nd -c . spam
Shortly, if @code{mboxgrep} crashes and/or works differently than described
in this manual, you've found a bug.
Please report bugs to @email{dspiljar@@world.std.com}.
Please report bugs to @email{dspiljar@@panix.com}.
Instructions how to reproduce the bug or output from a debugger would be
highly appreciated. Don't, however, send any coredumps.