From fe1b5cdbd0055949c8204d7770efe53edb48a843 Mon Sep 17 00:00:00 2001 From: Daniel Spiljar Date: Fri, 3 Mar 2023 22:49:48 +0100 Subject: [PATCH] Code cleanup and indentation. --- src/scan.c | 173 ++++++++++++++++++++++++++--------------------------- 1 file changed, 85 insertions(+), 88 deletions(-) diff --git a/src/scan.c b/src/scan.c index 0a66978..a2d9681 100644 --- a/src/scan.c +++ b/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 @@ -70,7 +69,6 @@ #endif /* HAVE_LIBDMALLOC */ void scan_mailbox (char path[]) - /* {{{ */ { static FILE *outf; static mbox_t *mbox, *out; @@ -84,16 +82,17 @@ void scan_mailbox (char path[]) { 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; @@ -107,7 +106,7 @@ void scan_mailbox (char path[]) if (mbox == NULL) return; } else if ((config.format == MH) || (config.format == NNMH) || - (config.format == NNML)) + (config.format == NNML)) { boxd = mh_open (path); if (boxd == NULL) return; @@ -115,7 +114,9 @@ void scan_mailbox (char path[]) else if (config.format == MAILDIR) { maildird = maildir_open (path); - if (maildird == NULL) return; + + if (maildird == NULL) + return; } for (;;) @@ -124,13 +125,13 @@ void scan_mailbox (char path[]) config.res2 = 1; if ((config.format == MBOX) || (config.format == ZMBOX) || - (config.format == BZ2MBOX)) - msg = (message_t *) mbox_read_message (mbox); + (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); + (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; @@ -138,87 +139,85 @@ void scan_mailbox (char path[]) #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); + } + + 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)) + (config.format == NNML)) mh_close(boxd); } -/* }}} */ void recursive_scan (char path[]) - /* {{{ */ - { #ifdef HAVE_FTS_OPEN FTS *ftsfoo; @@ -251,34 +250,32 @@ void recursive_scan (char path[]) #endif /* HAVE_FTS_OPEN */ } -/* }}} */ - 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); for (i = 0; i < chksum->n; i++) { if (0 == strncmp ((char *)chksum->md5[i], b, 16)) - return 1; + 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; } -/* }}} */