Merge branch 'master' of github.com:dspiljar/mboxgrep

fix build c23

.gitattributes

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

.gitignore

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

Makefile.am

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

NEWS.md

@@ -1,5 +1,12 @@
 # Changes of mboxgrep
 
+## Changes in 0.7.13
+
+- Improve the readability of this file.
+- Failure to lock a file (mbox) is now a fatal error.
+- Fix Autoconf on Windows.
+- Code refactoring, mostly of mbox-related functions.
+
 ## Changes in 0.7.12a
 
 - Fix Automake macros to include the license file and others.

TODO.md

@@ -4,27 +4,27 @@
 
 - [x] use cryptographic hashes for detecting duplicate messages
 - [x] add checking for conflicting command-line options
-- [ ] support for deletion of messages after being matched and displayed
 - [x] ignore .overview when grepping Gnus folders
 - [x] inverted matching
 - [x] recursive search through directories
 - [x] writing selected messages to a new folder
 - [x] deleting selected messages
-- [ ] basic time and date matching
-- [ ] more advanced time and date matching, with strings such as "yesterday"
 - [x] reading messages from standard input
 - [x] run-time selection of file locking method
 - [x] add a debug function
+- [ ] support for deletion of messages after being matched and displayed
+- [ ] basic time and date matching
+- [ ] more advanced time and date matching, with strings such as "yesterday"
 - [ ] Remove the option to recursively traverse directories and instruct the users to run mboxgrep in conjuction with find(1) instead.
 
 ## File formats, encodings and standards
 
 - [x] migrate to pcre2, as pcre is obsolete
+- [x] support for compressed mbox folders
+- [x] support for bzip2 compression
 - [ ] use a more modern hash function than MD5
 - [ ] MIME support
 - [ ] support for GnuPG
-- [x] support for compressed mbox folders
-- [x] support for bzip2 compression
 - [ ] support for XZ-format compression
 - [ ] support for mail folder conversion
 - [ ] improve error detection when a directory is not a Maildir or MH folder
@@ -34,8 +34,8 @@
 ## Miscellaneous
 
 - [x] write Texinfo documentation
+- [x] provide possibility to use flock() instead of fcntl()
 - [ ] configuration files
 - [ ] make use of lockfile library
 - [ ] make use of Solaris' maillock library
-- [x] provide possibility to use flock() instead of fcntl()
 - [ ] provide national language support with gettext()

configure.ac

@@ -1,5 +1,5 @@
 #  mboxgrep - scan mailbox for messages matching a regular expression
-#  Copyright (C) 2000 - 2003, 2023  Daniel Spiljar
+#  Copyright (C) 2000 - 2003, 2023 - 2024  Daniel Spiljar
 #
 #  Mboxgrep is free software; you can redistribute it and/or modify it 
 #  under the terms of the GNU General Public License as published by
@@ -18,18 +18,16 @@
 # Process this file with autoconf to produce a configure script.
 
 # Yawn.
-AC_INIT([mboxgrep], [0.7.12a], [dspiljar@datatipp.se], [mboxgrep], [https://www.mboxgrep.org/])
+AC_INIT([mboxgrep],[0.7.13],[dspiljar@datatipp.se],[mboxgrep],[https://www.mboxgrep.org/])
 #AM_INIT_AUTOMAKE
 AM_INIT_AUTOMAKE([foreign])
 AC_LANG([C])
-AC_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADERS([src/config.h])
 
 # Checks for programs.
 AC_PROG_CC
 AC_PROG_INSTALL
 
-# Checks for standard (sp?) header files
-AC_HEADER_STDC
 AC_HEADER_DIRENT
 
 # Checks for libraries.

doc/mboxgrep.1

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

doc/mboxgrep.info

@@ -9,10 +9,10 @@ END-INFO-DIR-ENTRY
 
 File: mboxgrep.info,  Node: Top,  Up: (dir)
 
-This file documents 'mboxgrep' (version 0.7.12a), a mailbox scanning
+This file documents 'mboxgrep' (version 0.7.13), a mailbox scanning
 utility.
 
-   Copyright (C) 2000, 2001, 2002, 2003 Daniel Spiljar
+   Copyright (C) 2000 - 2003, 2024 Daniel Spiljar
 
 * Menu:
 
@@ -250,17 +250,17 @@ Sleep well, little friend.
 
 Tag Table:
 Node: Top197
-Node: Introduction597
+Node: Introduction591
-Node: Invoking1466
+Node: Invoking1460
-Node: Miscellaneous1828
+Node: Miscellaneous1822
-Node: File locking2113
+Node: File locking2107
-Node: Regexp selection2750
+Node: Regexp selection2744
-Node: Output control3302
+Node: Output control3296
-Node: Search scope selection4342
+Node: Search scope selection4336
-Node: Mailbox type selection4583
+Node: Mailbox type selection4577
-Node: Examples4904
+Node: Examples4898
-Node: Bugs5728
+Node: Bugs5722
-Node: To Vicky6146
+Node: To Vicky6140
 
 End Tag Table
 

doc/mboxgrep.texi

@@ -5,7 +5,7 @@
 @setchapternewpage odd
 
 @set EDITION 0.7
-@set VERSION 0.7.12a
+@set VERSION 0.7.13
 @set UPDATED 23 September 2024
 
 @dircategory Mail

src/getopt.c

@@ -52,6 +52,7 @@ char *alloca ();
 #endif
 
 #include <stdio.h>
+#include <string.h>
 
 /* Comment out all this code if we are using the GNU C Library, and are not
    actually compiling the library itself.  This code is part of the GNU C

src/info.c

@@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar
+  Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  Daniel Spiljar
 
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ void
 version (void)
 {
   fprintf (stdout, "%s %s\n\n"
-           "Copyright (C) 2000 - 2004, 2006, 2010, 2023  Daniel Spiljar\n"
+           "Copyright (C) 2000 - 2004, 2006, 2010, 2023 - 2024  Daniel Spiljar\n"
            "This program is free software; you can redistribute it and/or "
            "modify\nit under the terms of the GNU General Public License "
            "as published by\nthe Free Software Foundation; either version "

src/mboxgrep.h

@@ -1,6 +1,6 @@
 /*
   mboxgrep - scan mailbox for messages matching a regular expression
-  Copyright (C) 2000 - 2003, 2006, 2023  Daniel Spiljar
+  Copyright (C) 2000 - 2003, 2006, 2023 - 2024 Daniel Spiljar
 
   Mboxgrep is free software; you can redistribute it and/or modify it 
   under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #define MBOXGREP_H
 
 #define APPNAME "mboxgrep"
-#define VERSION "0.7.12a"
+#define VERSION "0.7.13"
-#define BUGREPORT_ADDR "dspiljar AT datatipp.se"
+#define BUGREPORT_ADDR "dspiljar@datatipp.se"
 
 #define HOST_NAME_SIZE 256
 

src/md5.c

@@ -24,19 +24,12 @@
 # include <config.h>
 #endif
 
-#include <sys/types.h>
-
-#if STDC_HEADERS || defined _LIBC
-# include <stdlib.h>
-# include <string.h>
-#else
-# ifndef HAVE_MEMCPY
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
-# endif
-#endif
-
 #include "md5.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+
 #ifdef _LIBC
 # include <endian.h>
 # if __BYTE_ORDER == __BIG_ENDIAN
@@ -69,8 +62,7 @@ static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ...  */ };
 /* Initialize structure containing state of computation.
    (RFC 1321, 3.3: Step 3)  */
 void
-md5_init_ctx (ctx)
+md5_init_ctx (struct md5_ctx *ctx)
-     struct md5_ctx *ctx;
 {
   ctx->A = 0x67452301;
   ctx->B = 0xefcdab89;
@@ -87,9 +79,7 @@ md5_init_ctx (ctx)
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
 void *
-md5_read_ctx (ctx, resbuf)
+md5_read_ctx (const struct md5_ctx *ctx, void *resbuf)
-     const struct md5_ctx *ctx;
-     void *resbuf;
 {
   ((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
   ((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
@@ -105,9 +95,7 @@ md5_read_ctx (ctx, resbuf)
    IMPORTANT: On some systems it is required that RESBUF is correctly
    aligned for a 32 bits value.  */
 void *
-md5_finish_ctx (ctx, resbuf)
+md5_finish_ctx (struct md5_ctx *ctx, void *resbuf)
-     struct md5_ctx *ctx;
-     void *resbuf;
 {
   /* Take yet unprocessed bytes into account.  */
   md5_uint32 bytes = ctx->buflen;
@@ -136,9 +124,7 @@ md5_finish_ctx (ctx, resbuf)
    resulting message digest number will be written into the 16 bytes
    beginning at RESBLOCK.  */
 int
-md5_stream (stream, resblock)
+md5_stream (FILE *stream, void *resblock)
-     FILE *stream;
-     void *resblock;
 {
   /* Important: BLOCKSIZE must be a multiple of 64.  */
 #define BLOCKSIZE 4096
@@ -193,10 +179,7 @@ md5_stream (stream, resblock)
    output yields to the wanted ASCII representation of the message
    digest.  */
 void *
-md5_buffer (buffer, len, resblock)
+md5_buffer (const char *buffer, size_t len, void *resblock)
-     const char *buffer;
-     size_t len;
-     void *resblock;
 {
   struct md5_ctx ctx;
 
@@ -212,10 +195,7 @@ md5_buffer (buffer, len, resblock)
 
 
 void
-md5_process_bytes (buffer, len, ctx)
+md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
-     const void *buffer;
-     size_t len;
-     struct md5_ctx *ctx;
 {
   //const void aligned_buffer = buffer;
 
@@ -285,10 +265,7 @@ md5_process_bytes (buffer, len, ctx)
    It is assumed that LEN % 64 == 0.  */
 
 void
-md5_process_block (buffer, len, ctx)
+md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx)
-     const void *buffer;
-     size_t len;
-     struct md5_ctx *ctx;
 {
   md5_uint32 correct_words[16];
   const md5_uint32 *words = buffer;

src/md5.h

@@ -22,10 +22,7 @@
 #define _MD5_H 1
 
 #include <stdio.h>
-
+#include <limits.h>
-#if defined HAVE_LIMITS_H || _LIBC
-# include <limits.h>
-#endif
 
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
@@ -38,20 +35,7 @@
 # include <sys/types.h>
 typedef u_int32_t md5_uint32;
 #else
-# if defined __STDC__ && __STDC__
+#define UINT_MAX_32_BITS 4294967295U
-#  define UINT_MAX_32_BITS 4294967295U
-# else
-#  define UINT_MAX_32_BITS 0xFFFFFFFF
-# endif
-
-/* If UINT_MAX isn't defined, assume it's a 32-bit type.
-   This should be valid for all systems GNU cares about because
-   that doesn't include 16-bit systems, and only modern systems
-   (that certainly have <limits.h>) have 64+-bit integral types.  */
-
-# ifndef UINT_MAX
-#  define UINT_MAX UINT_MAX_32_BITS
-# endif
 
 # if UINT_MAX == UINT_MAX_32_BITS
    typedef unsigned int md5_uint32;