#include <h/mh.h>
#include <h/utils.h>
+#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 }
};
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 */
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 ((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 */
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;
}
/*
* 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 */
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
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;
{
int atrlen;
char atrcur[BUFSIZ];
- register struct node *np;
+ struct node *np;
snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
atrlen = strlen(atrcur);