#include <h/crawl_folders.h>
#include <h/utils.h>
#include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define ALLSW 0
{ "all", 0 },
#define NALLSW 1
- { "noall", 0 },
+ { "noall", 2 },
#define CREATSW 2
{ "create", 0 },
#define NCREATSW 3
- { "nocreate", 0 },
+ { "nocreate", 2 },
#define FASTSW 4
{ "fast", 0 },
#define NFASTSW 5
- { "nofast", 0 },
-#define HDRSW 6
- { "header", 0 },
-#define NHDRSW 7
- { "noheader", 0 },
-#define PACKSW 8
+ { "nofast", 2 },
+#define PACKSW 6
{ "pack", 0 },
-#define NPACKSW 9
- { "nopack", 0 },
-#define VERBSW 10
+#define NPACKSW 7
+ { "nopack", 2 },
+#define VERBSW 8
{ "verbose", 0 },
-#define NVERBSW 11
- { "noverbose", 0 },
-#define RECURSW 12
+#define NVERBSW 9
+ { "noverbose", 2 },
+#define RECURSW 10
{ "recurse", 0 },
-#define NRECRSW 13
- { "norecurse", 0 },
-#define TOTALSW 14
+#define NRECRSW 11
+ { "norecurse", 2 },
+#define TOTALSW 12
{ "total", 0 },
-#define NTOTLSW 15
- { "nototal", 0 },
-#define LISTSW 16
+#define NTOTLSW 13
+ { "nototal", 2 },
+#define LISTSW 14
{ "list", 0 },
-#define NLISTSW 17
- { "nolist", 0 },
-#define PRNTSW 18
+#define NLISTSW 15
+ { "nolist", 2 },
+#define PRNTSW 16
{ "print", 0 },
-#define NPRNTSW 19
+#define NPRNTSW 17
{ "noprint", -4 },
-#define PUSHSW 20
+#define PUSHSW 18
{ "push", 0 },
-#define POPSW 21
+#define POPSW 19
{ "pop", 0 },
-#define VERSIONSW 22
- { "version", 0 },
-#define HELPSW 23
+#define VERSIONSW 20
+ { "Version", 0 },
+#define HELPSW 21
{ "help", 0 },
{ NULL, 0 }
};
static int fcreat = 0; /* should we ask to create new folders? */
static int fpack = 0; /* are we packing the folder? */
static int fverb = 0; /* print actions taken while packing folder */
-static int fheader = 0; /* should we output a header? */
static int frecurse = 0; /* recurse through subfolders */
static int ftotal = 0; /* should we output the totals? */
static int all = 0; /* should we output all folders */
char *cp, *dp, *msg = NULL, *argfolder = NULL;
char **ap, **argp, buf[BUFSIZ], **arguments;
-#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 [+folder] [msg] [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 ALLSW:
all = 1;
fshort = 0;
continue;
- case HDRSW:
- fheader = 1;
- continue;
- case NHDRSW:
- fheader = -1;
- continue;
-
case PACKSW:
fpack++;
continue;
}
if (*cp == '+' || *cp == '@') {
if (argfolder)
- adios(NULL, "only one folder at a time!");
+ adios(EX_USAGE, NULL, "only one folder at a time!");
else
argfolder = getcpy(expandfol(cp));
} else {
if (msg)
- adios(NULL, "only one (current) message at a time!");
+ adios(EX_USAGE, NULL, "only one (current) message at a time!");
else
msg = cp;
}
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
- adios(NULL, "no other folder");
+ adios(EX_USAGE, NULL, "no other folder");
}
for (cp = getcpy(getcurfol()); *ap; ap++)
cp = add(*ap, add(" ", cp));
/* Popping a folder off of the folder stack */
if (popsw) {
if (argfolder)
- adios(NULL, "sorry, no folders allowed with -pop");
+ adios(EX_USAGE, NULL, "sorry, no folders allowed with -pop");
if ((cp = context_find(stack))) {
dp = getcpy(cp);
ap = brkstring(dp, " ", "\n");
argfolder = getcpy(*ap++);
} else {
- adios(NULL, "folder stack empty");
+ adios(EX_DATAERR, NULL, "folder stack empty");
}
if (*ap) {
/* if there's anything left in the stack */
if (pushsw || popsw) {
cp = toabsdir(argfolder);
if (access(cp, F_OK) == NOTOK)
- adios(cp, "unable to find folder");
+ adios(EX_DATAERR, cp, "unable to find folder");
/* update current folder */
context_replace(curfolder, argfolder);
context_save(); /* save the context file */
}
printf("\n");
- if (!printsw)
- done(0);
+ if (!printsw) {
+ exit(EX_OK);
+ }
}
/* Allocate initial space to record folder information */
/*
** Scan the folders
*/
+ /*
+ ** change directory to base of nmh directory for
+ ** crawl_folders
+ */
+ if (chdir(nmhdir) == NOTOK) {
+ adios(EX_OSERR, nmhdir, "unable to change directory to");
+ }
if (all || ftotal > 0) {
/*
** If no folder is given, do them all
*/
- /*
- ** change directory to base of nmh directory for
- ** crawl_folders
- */
- if (chdir(nmhdir) == NOTOK)
- adios(nmhdir, "unable to change directory to");
if (!argfolder) {
if (msg)
admonish(NULL, "no folder given for message %s", msg);
** Check if folder exists. If not, then see if
** we should create it, or just exit.
*/
- create_folder(toabsdir(folder), fcreat, done);
+ create_folder(toabsdir(folder), fcreat, exit);
if (get_folder_info(folder, msg) && argfolder) {
/* update current folder */
print_folders();
context_save();
- done(0);
- return 1;
+ return EX_OK;
}
static int
retval = 0;
if (fpack) {
- if (folder_pack(&mp, fverb) == -1)
- done(1);
+ if (folder_pack(&mp, fverb) == -1) {
+ exit(EX_OK);
+ }
seq_save(mp); /* synchronize the sequences */
context_save(); /* save the context file */
}
nummsgdigits = 2;
/*
- ** Print the header
- */
- if (fheader > 0 || (all && !fshort && fheader >= 0))
- printf("%-*s %*s %-*s; %-*s %*s\n",
- maxlen+1, "FOLDER",
- nummsgdigits + 13, "# MESSAGES",
- lowmsgdigits + hghmsgdigits + 4, " RANGE",
- curmsgdigits + 4, "CUR",
- 9, "(OTHERS)");
-
- /*
** Print folder information
*/
if (all || fshort || ftotal < 1) {
if (fi[i].others)
printf(";%*s (others)", curprinted ?
0 : curmsgdigits + 6, "");
- printf(".\n");
+ printf("\n");
}
}
if (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
if (all)
printf("\n");
- printf("TOTAL = %d message%c in %d folder%s.\n",
+ printf("TOTAL = %d message%c in %d folder%s\n",
total_msgs, total_msgs != 1 ? 's' : ' ',
total_folders, total_folders != 1 ? "s" : "");
}
{
int atrlen;
char atrcur[BUFSIZ];
- register struct node *np;
+ struct node *np;
snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur);
atrlen = strlen(atrcur);
projects / mmh / blobdiff