Minor code cleanup and indentation.
This commit is contained in:
parent
7dd6f3d69d
commit
af7c6c8ced
GPG Key ID:
A32CE9C59D8003B5
29
src/main.c
29
src/main.c
@ -48,8 +48,6 @@ runtime_t runtime;
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
/* {{{ */
|
||||
|
||||
{
|
||||
int havemailbox = 0;
|
||||
int singlefile = 0;
|
||||
@ -57,8 +55,6 @@ main (int argc, char **argv)
|
||||
runtime.maildir_count = 0;
|
||||
|
||||
static struct option long_options[] =
|
||||
/* {{{ */
|
||||
|
||||
{
|
||||
{"count", 0, 0, 'c'},
|
||||
{"delete", 0, 0, 'd'},
|
||||
@ -85,8 +81,6 @@ main (int argc, char **argv)
|
||||
{0, 0, 0, 0}
|
||||
};
|
||||
|
||||
/* }}} */
|
||||
|
||||
set_default_options ();
|
||||
|
||||
get_runtime_options (&argc, argv, long_options);
|
||||
@ -112,7 +106,7 @@ main (int argc, char **argv)
|
||||
config.regex_s = xstrdup (argv[optind]);
|
||||
config.haveregex = 1;
|
||||
++optind;
|
||||
} /* if */
|
||||
}
|
||||
|
||||
if (config.haveregex)
|
||||
{
|
||||
@ -122,7 +116,7 @@ main (int argc, char **argv)
|
||||
else
|
||||
#endif /* HAVE_LIBPCRE */
|
||||
regex_init ();
|
||||
} /* if */
|
||||
}
|
||||
else
|
||||
usage ();
|
||||
|
||||
@ -130,10 +124,9 @@ main (int argc, char **argv)
|
||||
singlefile = 1;
|
||||
|
||||
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");
|
||||
}
|
||||
@ -144,7 +137,9 @@ main (int argc, char **argv)
|
||||
recursive_scan (argv[optind]);
|
||||
else
|
||||
scan_mailbox (argv[optind]);
|
||||
|
||||
havemailbox = 1;
|
||||
|
||||
if (config.action == COUNT)
|
||||
{
|
||||
if (singlefile)
|
||||
@ -163,13 +158,9 @@ main (int argc, char **argv)
|
||||
rename (config.tmpfilename, argv[optind]);
|
||||
}
|
||||
++optind;
|
||||
} /* while */
|
||||
|
||||
/* }}} */
|
||||
}
|
||||
|
||||
if (! havemailbox)
|
||||
/* {{{ */
|
||||
|
||||
{
|
||||
config.format = MBOX;
|
||||
scan_mailbox ("-");
|
||||
@ -177,9 +168,5 @@ main (int argc, char **argv)
|
||||
fprintf (stdout, "%i\n", runtime.count);
|
||||
}
|
||||
|
||||
/* }}} */
|
||||
|
||||
return 0;
|
||||
} /* main */
|
||||
|
||||
/* }}} */
|
||||
}
|
||||
|
||||
63
src/misc.c
63
src/misc.c
@ -1,6 +1,6 @@
|
||||
/* -*- C -*-
|
||||
/*
|
||||
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
|
||||
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: misc.c,v 1.17 2006-07-06 10:53:49 dspiljar Exp $ */
|
||||
*/
|
||||
|
||||
#define _XOPEN_SOURCE /* Pull in strptime(3) from time.h */
|
||||
#define _BSD_SOURCE /* Compensate for _XOPEN_SOURCE to pull in strdup(3)
|
||||
@ -38,7 +37,6 @@
|
||||
|
||||
format_t
|
||||
folder_format (const char *name)
|
||||
/* {{{ */
|
||||
{
|
||||
format_t f;
|
||||
|
||||
@ -69,10 +67,8 @@ folder_format (const char *name)
|
||||
|
||||
return f;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
lockmethod_t lock_method (const char *name)
|
||||
/* {{{ */
|
||||
{
|
||||
lockmethod_t l;
|
||||
|
||||
@ -97,38 +93,36 @@ lockmethod_t lock_method (const char *name)
|
||||
|
||||
return l;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
/* time_t parse_date(char *datestr) */
|
||||
/* {{{ */
|
||||
/* { */
|
||||
/* time_t t; */
|
||||
/* const char *fmt = "%d%n%b%n%Y%n%T"; */
|
||||
/* int h, m; */
|
||||
/* struct tm tm; */
|
||||
/* char *str2, str1[BUFSIZ]; */
|
||||
/*
|
||||
time_t parse_date(char *datestr)
|
||||
{
|
||||
time_t t;
|
||||
const char *fmt = "%d%n%b%n%Y%n%T";
|
||||
int h, m;
|
||||
struct tm tm;
|
||||
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); */
|
||||
/* if (str2 == NULL) */
|
||||
/* str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm); */
|
||||
/* if (str2 == NULL) */
|
||||
/* return (time_t) 0; */
|
||||
str2 = (char *) strptime (str1, "%d%n%b%n%Y%n%T", &tm);
|
||||
if (str2 == NULL)
|
||||
str2 = (char *) strptime (str1, "%a, %d%n%b%n%Y%n%T", &tm);
|
||||
if (str2 == NULL)
|
||||
return (time_t) 0;
|
||||
|
||||
/* if (sscanf (str2, "%3d%2d", &h, &m) == 2) */
|
||||
/* { */
|
||||
/* tm.tm_hour -= h; */
|
||||
/* tm.tm_min -= (h >= 0 ? m : -m); */
|
||||
/* t = (time_t) mktime (&tm); */
|
||||
/* } */
|
||||
if (sscanf (str2, "%3d%2d", &h, &m) == 2)
|
||||
{
|
||||
tm.tm_hour -= h;
|
||||
tm.tm_min -= (h >= 0 ? m : -m);
|
||||
t = (time_t) mktime (&tm);
|
||||
}
|
||||
|
||||
/* return t; */
|
||||
/* } */
|
||||
/* }}} */
|
||||
return t;
|
||||
}
|
||||
*/
|
||||
|
||||
char * parse_return_path(char *rpath)
|
||||
/* {{{ */
|
||||
{
|
||||
char *blah1, blah2[BUFSIZ];
|
||||
|
||||
@ -137,7 +131,6 @@ char * parse_return_path(char *rpath)
|
||||
|
||||
return blah1;
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
void * allocate_message (void)
|
||||
{
|
||||
@ -204,8 +197,6 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
|
||||
break;
|
||||
|
||||
switch (c)
|
||||
/* {{{ */
|
||||
|
||||
{
|
||||
case '?':
|
||||
usage();
|
||||
@ -297,7 +288,5 @@ get_runtime_options (int *argc, char **argv, struct option *long_options)
|
||||
}
|
||||
}
|
||||
} /* switch */
|
||||
|
||||
/* }}} */
|
||||
} /* while */
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user