#include <h/mh.h>
#include <h/utils.h>
-
-#define FALSE 0
-#define TRUE 1
+#include <unistd.h>
+#include <ctype.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <locale.h>
+#include <sysexits.h>
/*
** We allocate space to record the names of folders
#define ALLSW 1
{ "all", 0 },
#define NOALLSW 2
- { "noall", 0 },
+ { "noall", 2 },
#define RECURSE 3
{ "recurse", 0 },
#define NORECURSE 4
- { "norecurse", 0 },
+ { "norecurse", 2 },
#define SHOWZERO 5
{ "showzero", 0 },
#define NOSHOWZERO 6
- { "noshowzero", 0 },
+ { "noshowzero", 2 },
#define ALPHASW 7
{ "alpha", 0 },
#define NOALPHASW 8
- { "noalpha", 0 },
+ { "noalpha", 2 },
#define FASTSW 9
{ "fast", 0 },
#define NOFASTSW 10
- { "nofast", 0 },
-#define TOTALSW 11
- { "total", -5 },
-#define NOTOTALSW 12
- { "nototal", -7 },
-#define VERSIONSW 13
- { "version", 0 },
-#define HELPSW 14
+ { "nofast", 2 },
+#define VERSIONSW 11
+ { "Version", 0 },
+#define HELPSW 12
{ "help", 0 },
{ NULL, 0 }
};
+char *version=VERSION;
+
struct Folder {
char *name; /* name of folder */
int priority;
static int nOrders = 0;
static int nOrdersAlloced = 0;
static struct Folder *folders = NULL;
-static int nFolders = 0;
+static unsigned int nFolders = 0;
static int nFoldersAlloced = 0;
/* info on folders to search */
/* info on sequences to search for */
static char *sequencesToDo[NUMATTRS];
-static int numsequences;
+static unsigned int numsequences;
static int all = FALSE; /* scan all folders in top level? */
static int alphaOrder = FALSE; /* want alphabetical order only */
static int recurse = FALSE; /* show nested folders? */
static int showzero = TRUE; /* show folders even if no messages in seq? */
-static int Total = TRUE; /* display info on number of messages in
+static int fastsw = FALSE; /* display info on number of messages in
* sequence found, and total num messages */
static char curfol[BUFSIZ]; /* name of the current folder */
char **arguments;
char buf[BUFSIZ];
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
/* allocate the initial space to record the folder names */
numfolders = 0;
maxfolders = MAXFOLDERS;
- foldersToDo = (char **) mh_xmalloc((size_t)
- (maxfolders * sizeof(*foldersToDo)));
+ foldersToDo = mh_xcalloc(maxfolders, sizeof(*foldersToDo));
/* no sequences yet */
numsequences = 0;
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder1 [+folder2 ...]][switches]", invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
+
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
case SEQSW:
if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
/* check if too many sequences specified */
if (numsequences >= NUMATTRS)
- adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
+ adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
sequencesToDo[numsequences++] = cp;
break;
alphaOrder = FALSE;
break;
- case NOFASTSW:
- case TOTALSW:
- Total = TRUE;
- break;
-
case FASTSW:
- case NOTOTALSW:
- Total = FALSE;
+ fastsw = TRUE;
+ break;
+ case NOFASTSW:
+ fastsw = FALSE;
break;
case RECURSE:
*/
if (numfolders >= maxfolders) {
maxfolders += MAXFOLDERS;
- foldersToDo = (char **) mh_xrealloc(foldersToDo, (size_t) (maxfolders * sizeof(*foldersToDo)));
+ foldersToDo = mh_xrealloc(foldersToDo, maxfolders * sizeof(*foldersToDo));
}
if (*cp == '+' || *cp == '@') {
- foldersToDo[numfolders++] = getcpy(expandfol(cp));
+ foldersToDo[numfolders++] = mh_xstrdup(expandfol(cp));
} else
foldersToDo[numfolders++] = cp;
}
if ((cp = context_find(usequence))) {
if (!*cp) {
- adios(NULL, "profile entry %s set, but empty, and no sequence given", usequence);
+ adios(EX_CONFIG, NULL, "profile entry %s set, but empty, and no sequence given", usequence);
}
} else {
cp = seq_unseen; /* use default */
}
- dp = getcpy(cp);
+ dp = mh_xstrdup(cp);
ap = brkstring(dp, " ", "\n");
for (; ap && *ap; ap++) {
if (numsequences >= NUMATTRS) {
- adios(NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
+ adios(EX_USAGE, NULL, "too many sequences (more than %d) in %s profile entry", NUMATTRS, usequence);
} else {
sequencesToDo[numsequences++] = *ap;
}
qsort(folders, nFolders, sizeof(struct Folder),
(qsort_comp) CompareFolders);
PrintFolders();
- done(0);
- return 1;
+ return EX_OK;
}
/*
AllocFolders(&orders, &nOrdersAlloced, nOrders + 1);
o = &orders[nOrders++];
o->priority = priority++;
- o->name = (char *) mh_xmalloc(p - s + 1);
+ o->name = mh_xcalloc(p - s + 1, sizeof(char));
strncpy(o->name, s, p - s);
o->name[p - s] = 0;
} else
* change directory to base of nmh directory
*/
if (chdir(nmhdir) == NOTOK)
- adios(nmhdir, "unable to change directory to");
+ adios(EX_OSERR, nmhdir, "unable to change directory to");
if (numfolders > 0) {
/* Update context */
** If base directory, don't add it to the
** folder list. We just recurse into it.
*/
- if (!strcmp(dirName, ".")) {
+ if (strcmp(dirName, ".")==0) {
BuildFolderListRecurse(".", &st, 0);
return;
}
nlinks = s->st_nlink;
if (!(dir = opendir(dirName)))
- adios(dirName, "can't open directory");
+ adios(EX_IOERR, dirName, "can't open directory");
/*
** A hack so that we don't see a
** leading "./" in folder names.
*/
- base = strcmp(dirName, ".") ? dirName : dirName + 1;
+ base = (strcmp(dirName, ".")==0) ? dirName + 1 : dirName;
while (nlinks && (dp = readdir(dir))) {
- if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) {
+ if (strcmp(dp->d_name, ".")==0 ||
+ strcmp(dp->d_name, "..")==0) {
nlinks--;
continue;
}
int
AddFolder(char *name, int force)
{
- int i, msgnum, nonzero;
+ unsigned int i;
+ int msgnum, nonzero;
int seqnum[NUMATTRS], nSeq[NUMATTRS];
struct Folder *f;
struct msgs *mp;
/* Oops, error occurred. Record it and continue. */
AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
f = &folders[nFolders++];
- f->name = getcpy(name);
+ f->name = mh_xstrdup(name);
f->error = 1;
f->priority = AssignPriority(f->name);
return 0;
/* save general folder information */
AllocFolders(&folders, &nFoldersAlloced, nFolders + 1);
f = &folders[nFolders++];
- f->name = getcpy(name);
+ f->name = mh_xstrdup(name);
f->nMsgs = mp->nummsg;
f->error = 0;
f->priority = AssignPriority(f->name);
PrintFolders(void)
{
char tmpname[BUFSIZ];
- int i, j, len, has_private = 0;
- int maxfolderlen = 0, maxseqlen = 0;
+ unsigned int i, j, len, has_private = 0;
+ unsigned int maxfolderlen = 0, maxseqlen = 0;
int maxnum = 0, maxseq = 0;
- if (!Total) {
+ if (fastsw) {
for (i = 0; i < nFolders; i++)
printf("%s\n", folders[i].name);
return;
for (j = 0; j < numsequences; j++) {
if (folders[i].nSeq[j] > 0 || showzero) {
/* Add `+' to end of name of current folder */
- if (strcmp(curfol, folders[i].name))
+ if (strcmp(curfol, folders[i].name)!=0)
snprintf(tmpname, sizeof(tmpname),
"%s", folders[i].name);
else
return;
if (*f == NULL) {
*nfa = 10;
- *f = (struct Folder *) mh_xmalloc(
- *nfa * (sizeof(struct Folder)));
+ *f = mh_xcalloc(*nfa, sizeof(struct Folder));
} else {
*nfa *= 2;
- *f = (struct Folder *) mh_xrealloc(
- *f, *nfa * (sizeof(struct Folder)));
+ *f = mh_xrealloc(*f, *nfa * sizeof(struct Folder));
}
}
nl = strlen(name);
for (i = 0; i < nOrders; ++i) {
o = &orders[i];
- if (!strcmp(name, o->name))
+ if (strcmp(name, o->name)==0)
return o->priority;
ol = strlen(o->name);
if (nl < ol - 1)
continue;
if (ol < bestLen)
continue;
- if (o->name[0] == '*' && !strcmp(o->name + 1,
- name + (nl - ol + 1))) {
+ if (o->name[0] == '*' &&
+ strcmp(o->name + 1, name + (nl - ol + 1))==0) {
best = o->priority;
bestLen = ol;
} else if (o->name[ol - 1] == '*' &&
{
int atrlen;
char atrcur[BUFSIZ];
- register struct node *np;
+ struct node *np;
- snprintf(atrcur, sizeof(atrcur), "atr-%s-", current);
+ snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
atrlen = strlen(atrcur);
for (np = m_defs; np; np = np->n_next)
- if (isprefix(atrcur, np->n_name)
- && !isprefix(nmhdir, np->n_name + atrlen))
+ if (strncmp(np->n_name, atrcur, atrlen)==0
+ && strncmp(np->n_name+atrlen, nmhdir, strlen(nmhdir))!=0)
+ /* Why do we exclude absolute path names? --meillo */
BuildFolderList(np->n_name + atrlen, 0);
}
projects / mmh / blobdiff