Implement a debug mode ("--debug").

This commit is contained in:
Daniel Spiljar 2023-02-17 22:19:36 +01:00
parent af7c6c8ced
commit 5cc84ca1bd
Signed by: dspiljar
GPG Key ID: A32CE9C59D8003B5
7 changed files with 29 additions and 11 deletions

View File

@ -1,5 +1,4 @@
.Id $Id: mboxgrep.1,v 1.16 2006-01-18 00:09:58 dspiljar Exp $ .TH MBOXGREP 1 "17 Feb 2023"
.TH MBOXGREP 1 "26 Jan 2023"
.SH NAME .SH NAME
mboxgrep \- displays email messages matching a pattern mboxgrep \- displays email messages matching a pattern
.SH SYNOPSIS .SH SYNOPSIS
@ -86,6 +85,10 @@ Ignore duplicate messages.
Select input and output mailbox TYPE. TYPE can be either `mbox' (default), Select input and output mailbox TYPE. TYPE can be either `mbox' (default),
`zmbox' (gzip compressed mbox), `bz2mbox' (bzip2 compressed mbox), `mh', `nnml', `zmbox' (gzip compressed mbox), `bz2mbox' (bzip2 compressed mbox), `mh', `nnml',
`nnmh' or `maildir'. `nnmh' or `maildir'.
.IP "-s, --no-messages"
Suppress most error messages.
.IP "--debug"
Print messages useful for debugging.
.SH EXAMPLES .SH EXAMPLES
.TP .TP
\(bu \(bu

View File

@ -169,6 +169,9 @@ options below change such behavior.
'-s' '-s'
Suppress error messages. 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 File: mboxgrep.info, Node: Search scope selection, Next: Mailbox type selection, Prev: Output control, Up: Invoking
@ -253,11 +256,11 @@ Node: Miscellaneous1827
Node: File locking2112 Node: File locking2112
Node: Regexp selection2749 Node: Regexp selection2749
Node: Output control3301 Node: Output control3301
Node: Search scope selection4292 Node: Search scope selection4345
Node: Mailbox type selection4533 Node: Mailbox type selection4586
Node: Examples4854 Node: Examples4907
Node: Bugs5678 Node: Bugs5731
Node: To Vicky6096 Node: To Vicky6149
 
End Tag Table End Tag Table

View File

@ -6,7 +6,7 @@
@set EDITION 0.7 @set EDITION 0.7
@set VERSION 0.7.10 @set VERSION 0.7.10
@set UPDATED 26 Jan 2023 @set UPDATED 17 Feb 2023
@dircategory Mail @dircategory Mail
@direntry @direntry
@ -188,6 +188,9 @@ instance of COMMAND.
@itemx -s @itemx -s
Suppress error messages. Suppress error messages.
@item --debug
Print messages useful for debugging.
@end table @end table
@node Search scope selection, Mailbox type selection, Output control, Invoking @node Search scope selection, Mailbox type selection, Output control, Invoking

View File

@ -120,7 +120,8 @@ help (void)
" -nd, --no-duplicates\t\tIgnore duplicate messages\n" " -nd, --no-duplicates\t\tIgnore duplicate messages\n"
" -o, --output=MAILBOX\t\tWrite messages to MAILBOX\n" " -o, --output=MAILBOX\t\tWrite messages to MAILBOX\n"
" -p, --pipe=COMMAND\t\tPipe each found message to COMMAND\n" " -p, --pipe=COMMAND\t\tPipe each found message to COMMAND\n"
" -s, --no-messages\t\tSuppress most error messages\n\n" " -s, --no-messages\t\tSuppress most error messages\n"
" --debug\t\t\tPrint messages useful for debugging\n\n"
"Matching criteria:\n\n" "Matching criteria:\n\n"
" -E, --extended-regexp\tPATTERN is an extended regular expression\n" " -E, --extended-regexp\tPATTERN is an extended regular expression\n"
" -G, --basic-regexp\t\tPATTERN is a basic regular expression\n"); " -G, --basic-regexp\t\tPATTERN is a basic regular expression\n");

View File

@ -76,6 +76,7 @@ main (int argc, char **argv)
{"output", 1, 0, 'o'}, {"output", 1, 0, 'o'},
{"no-duplicates", 0, 0, 200}, {"no-duplicates", 0, 0, 200},
{"no-file-lock", 0, 0, 201}, {"no-file-lock", 0, 0, 201},
{"debug", 0, 0, 202},
{"file-lock", 1, 0, 'l'}, {"file-lock", 1, 0, 'l'},
{"recursive", 0, 0, 'r'}, {"recursive", 0, 0, 'r'},
{0, 0, 0, 0} {0, 0, 0, 0}

View File

@ -107,6 +107,7 @@ typedef struct
int merr; int merr;
int pid; int pid;
int haveregex; int haveregex;
int debug;
char hostname[HOST_NAME_SIZE]; char hostname[HOST_NAME_SIZE];
char *boxname, *outboxname, *pipecmd, *tmpfilename, *regex_s; char *boxname, *outboxname, *pipecmd, *tmpfilename, *regex_s;

View File

@ -61,7 +61,7 @@ folder_format (const char *name)
else else
{ {
if (config.merr) if (config.merr)
fprintf (stderr, "mboxgrep: %s: unknown folder type\n", name); fprintf (stderr, "%s: %s: unknown folder type\n", APPNAME, name);
exit (2); exit (2);
} }
@ -181,6 +181,7 @@ set_default_options (void)
config.format = MBOX; /* default mailbox format */ config.format = MBOX; /* default mailbox format */
config.lock = FCNTL; /* default file locking method */ config.lock = FCNTL; /* default file locking method */
config.merr = 1; /* report errors by default */ config.merr = 1; /* report errors by default */
config.debug = 0;
} }
void void
@ -227,7 +228,7 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
#else #else
fprintf(stderr, fprintf(stderr,
"%s: Support for Perl regular expressions not " "%s: Support for Perl regular expressions not "
"compiled in\n"); "compiled in\n", APPNAME);
exit(2); exit(2);
#endif /* HAVE_LIBPCRE */ #endif /* HAVE_LIBPCRE */
break; break;
@ -265,6 +266,11 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
case 201: case 201:
config.lock = 0; config.lock = 0;
break; break;
case 202:
config.debug = 1;
fprintf (stderr, "%s: %s, line %d: enable debugging\n",
APPNAME, __FILE__, __LINE__);
break;
case 'r': case 'r':
config.recursive = 1; config.recursive = 1;
break; break;