dspiljar/mboxgrep
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 5 Wiki Activity

Minor code cleanup and indentation.

Browse Source
This commit is contained in:
Daniel Spiljar 2023-02-17 20:55:52 +01:00
parent 7dd6f3d69d
commit af7c6c8ced
Signed by: dspiljar
GPG Key ID: A32CE9C59D8003B5
2 changed files with 151 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main.c
View File

@ -48,8 +48,6 @@ runtime_t runtime;
int int
main (int argc, char **argv) main (int argc, char **argv)
/* {{{ */
{ {
int havemailbox = 0; int havemailbox = 0;
int singlefile = 0; int singlefile = 0;
@ -57,8 +55,6 @@ main (int argc, char **argv)
runtime.maildir_count = 0; runtime.maildir_count = 0;
static struct option long_options[] = static struct option long_options[] =
/* {{{ */
{ {
{"count", 0, 0, 'c'}, {"count", 0, 0, 'c'},
{"delete", 0, 0, 'd'}, {"delete", 0, 0, 'd'},
@ -85,8 +81,6 @@ main (int argc, char **argv)
{0, 0, 0, 0} {0, 0, 0, 0}
}; };
/* }}} */
set_default_options (); set_default_options ();
get_runtime_options (&argc, argv, long_options); get_runtime_options (&argc, argv, long_options);
@ -112,17 +106,17 @@ main (int argc, char **argv)
config.regex_s = xstrdup (argv[optind]); config.regex_s = xstrdup (argv[optind]);
config.haveregex = 1; config.haveregex = 1;
++optind; ++optind;
} /* if */ }
if (config.haveregex) if (config.haveregex)
{ {
#ifdef HAVE_LIBPCRE #ifdef HAVE_LIBPCRE
if (config.perl) if (config.perl)
pcre_init (); pcre_init ();
else else
#endif /* HAVE_LIBPCRE */ #endif /* HAVE_LIBPCRE */
regex_init (); regex_init ();
} /* if */ }
else else
usage (); usage ();
@ -130,56 +124,49 @@ main (int argc, char **argv)
singlefile = 1; singlefile = 1;
while (optind < argc) while (optind < argc)
/* {{{ */
{ {
if (config.action == DELETE) { if (config.action == DELETE)
tmpmbox_create (argv[optind]); {
runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w"); tmpmbox_create (argv[optind]);
} runtime.tmp_mbox = (mbox_t *) mbox_open (config.tmpfilename, "w");
}
config.boxname = xstrdup (argv[optind]); config.boxname = xstrdup (argv[optind]);
if (config.recursive) if (config.recursive)
recursive_scan (argv[optind]); recursive_scan (argv[optind]);
else 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 (config.action == DELETE)
{
mbox_close (runtime.tmp_mbox);
rename (config.tmpfilename, argv[optind]);
}
++optind;
} /* while */
/* }}} */ 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 (config.action == DELETE)
{
mbox_close (runtime.tmp_mbox);
rename (config.tmpfilename, argv[optind]);
}
++optind;
}
if (! havemailbox) if (! havemailbox)
/* {{{ */
{ {
config.format = MBOX; config.format = MBOX;
scan_mailbox ("-"); scan_mailbox ("-");
if (config.action == COUNT) if (config.action == COUNT)
fprintf (stdout, "%i\n", runtime.count); fprintf (stdout, "%i\n", runtime.count);
} }
/* }}} */
return 0; return 0;
} /* main */ }
/* }}} */

243
src/misc.c
View File

@ -1,6 +1,6 @@
/* -*- C -*- /*
mboxgrep - scan mailbox for messages matching a regular expression 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 Mboxgrep is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by 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 You should have received a copy of the GNU General Public License
along with mboxgrep; if not, write to the Free Software Foundation, along with mboxgrep; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 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 _XOPEN_SOURCE /* Pull in strptime(3) from time.h */
#define _BSD_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3) #define _BSD_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
@ -38,7 +37,6 @@
format_t format_t
folder_format (const char *name) folder_format (const char *name)
/* {{{ */
{ {
format_t f; format_t f;
@ -63,16 +61,14 @@ folder_format (const char *name)
else else
{ {
if (config.merr) if (config.merr)
fprintf (stderr, "mboxgrep: %s: unknown folder type\n", name); fprintf (stderr, "mboxgrep: %s: unknown folder type\n", name);
exit (2); exit (2);
} }
return f; return f;
} }
/* }}} */
lockmethod_t lock_method (const char *name) lockmethod_t lock_method (const char *name)
/* {{{ */
{ {
lockmethod_t l; lockmethod_t l;
@ -97,38 +93,36 @@ lockmethod_t lock_method (const char *name)
return l; return l;
} }
/* }}} */
/* time_t parse_date(char *datestr) */ /*
/* {{{ */ time_t parse_date(char *datestr)
/* { */ {
/* time_t t; */ time_t t;
/* const char *fmt = "%d%n%b%n%Y%n%T"; */ const char *fmt = "%d%n%b%n%Y%n%T";
/* int h, m; */ int h, m;
/* struct tm tm; */ struct tm tm;
/* char *str2, str1[BUFSIZ]; */ 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); */ str2 = (char *) strptime (str1, "%d%n%b%n%Y%n%T", &tm);
/* if (str2 == NULL) */ if (str2 == NULL)
/* str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm); */ str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm);
/* if (str2 == NULL) */ if (str2 == NULL)
/* return (time_t) 0; */ return (time_t) 0;
/* if (sscanf (str2, "%3d%2d", &h, &m) == 2) */ if (sscanf (str2, "%3d%2d", &h, &m) == 2)
/* { */ {
/* tm.tm_hour -= h; */ tm.tm_hour -= h;
/* tm.tm_min -= (h >= 0 ? m : -m); */ tm.tm_min -= (h >= 0 ? m : -m);
/* t = (time_t) mktime (&tm); */ t = (time_t) mktime (&tm);
/* } */ }
/* return t; */ return t;
/* } */ }
/* }}} */ */
char * parse_return_path(char *rpath) char * parse_return_path(char *rpath)
/* {{{ */
{ {
char *blah1, blah2[BUFSIZ]; char *blah1, blah2[BUFSIZ];
@ -137,7 +131,6 @@ char * parse_return_path(char *rpath)
return blah1; return blah1;
} }
/* }}} */
void * allocate_message (void) void * allocate_message (void)
{ {
@ -201,103 +194,99 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
&option_index); &option_index);
if (c == -1) if (c == -1)
break; break;
switch (c) switch (c)
/* {{{ */ {
case '?':
{ usage();
case '?': case 'c':
usage(); config.action = COUNT;
case 'c': break;
config.action = COUNT; case 'd':
break; config.action = DELETE;
case 'd': break;
config.action = DELETE; case 'e':
break; config.regex_s = xstrdup (optarg);
case 'e': config.haveregex = 1;
config.regex_s = xstrdup (optarg); break;
config.haveregex = 1; case 'o':
break; config.outboxname = xstrdup (optarg);
case 'o': config.action = WRITE;
config.outboxname = xstrdup (optarg); break;
config.action = WRITE; case 'E':
break; config.extended = 1;
case 'E': break;
config.extended = 1; case 'G':
break; config.extended = 0;
case 'G': break;
config.extended = 0; case 'P':
break;
case 'P':
#ifdef HAVE_LIBPCRE #ifdef HAVE_LIBPCRE
config.extended = 0; config.extended = 0;
config.perl = 1; config.perl = 1;
#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");
exit(2); exit(2);
#endif /* HAVE_LIBPCRE */ #endif /* HAVE_LIBPCRE */
break; break;
case 'h': case 'h':
help (); help ();
break; break;
case 'i': case 'i':
config.ignorecase = 1; config.ignorecase = 1;
break; break;
case 'm': case 'm':
config.format = folder_format (optarg); config.format = folder_format (optarg);
break; break;
case 'l': case 'l':
config.lock = lock_method (optarg); config.lock = lock_method (optarg);
break; break;
case 'p': case 'p':
config.action = PIPE; config.action = PIPE;
config.pipecmd = xstrdup (optarg); config.pipecmd = xstrdup (optarg);
break; break;
case 'V': case 'V':
version (); version ();
break; break;
case 'v': case 'v':
config.invert = 1; config.invert = 1;
break; break;
case 'H': case 'H':
config.headers = 1; config.headers = 1;
break; break;
case 'B': case 'B':
config.body = 1; config.body = 1;
break; break;
case 's': case 's':
config.merr = 0; config.merr = 0;
break; break;
case 201: case 201:
config.lock = 0; config.lock = 0;
break; break;
case 'r': case 'r':
config.recursive = 1; config.recursive = 1;
break; break;
case 200: case 200:
config.dedup = 1; config.dedup = 1;
break; break;
case 'n': case 'n':
{ {
switch (optarg[0]) switch (optarg[0])
{ {
case 'd': case 'd':
config.dedup = 1; config.dedup = 1;
break; break;
case 'l': case 'l':
config.lock = 0; config.lock = 0;
break; break;
default: default:
fprintf(stderr, "%s: invalid option -- n%c\n", fprintf(stderr, "%s: invalid option -- n%c\n",
APPNAME, optarg[0]); APPNAME, optarg[0]);
exit(2); exit(2);
} }
} }
} /* switch */ } /* switch */
/* }}} */
} /* while */ } /* while */
} }