X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Ffolder.c;h=b7cdfe54d132448fed24aa48c50324e1689155c2;hp=616f57b90c37b025538f4bdf9224de7a9fda461f;hb=6e9577f324bef90765a5edc02044eb111ec48072;hpb=69b07982861716d278845f962c2f2c1365a3153f diff --git a/uip/folder.c b/uip/folder.c index 616f57b..b7cdfe5 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -12,64 +12,64 @@ #include #include #include +#include +#include +#include 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 } }; +char *version=VERSION; + static int fshort = 0; /* output only folder names */ 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 */ @@ -120,9 +120,7 @@ main(int argc, char **argv) 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 */ @@ -143,17 +141,17 @@ main(int argc, char **argv) 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; @@ -177,13 +175,6 @@ main(int argc, char **argv) fshort = 0; continue; - case HDRSW: - fheader = 1; - continue; - case NHDRSW: - fheader = -1; - continue; - case PACKSW: fpack++; continue; @@ -240,12 +231,12 @@ main(int argc, char **argv) } 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)); + argfolder = mh_xstrdup(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; } @@ -266,38 +257,38 @@ main(int argc, char **argv) /* If no folder is given, the current folder and */ /* the top of the folder stack are swapped. */ if ((cp = context_find(stack))) { - dp = getcpy(cp); + dp = mh_xstrdup(cp); ap = brkstring(dp, " ", "\n"); - argfolder = getcpy(*ap++); + argfolder = mh_xstrdup(*ap++); } else { - adios(NULL, "no other folder"); + adios(EX_USAGE, NULL, "no other folder"); } - for (cp = getcpy(getcurfol()); *ap; ap++) + for (cp = mh_xstrdup(getcurfol()); *ap; ap++) cp = add(*ap, add(" ", cp)); - free(dp); + mh_free0(&dp); context_replace(stack, cp); /* update folder stack */ } else { /* update folder stack */ context_replace(stack, (cp = context_find (stack)) ? concat(getcurfol(), " ", cp, NULL) : - getcpy(getcurfol())); + mh_xstrdup(getcurfol())); } } /* 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); + dp = mh_xstrdup(cp); ap = brkstring(dp, " ", "\n"); - argfolder = getcpy(*ap++); + argfolder = mh_xstrdup(*ap++); } else { - adios(NULL, "folder stack empty"); + adios(EX_DATAERR, NULL, "folder stack empty"); } if (*ap) { /* if there's anything left in the stack */ - cp = getcpy(*ap++); + cp = mh_xstrdup(*ap++); for (; *ap; ap++) cp = add(*ap, add(" ", cp)); context_replace(stack, cp); /* update folder stack */ @@ -305,12 +296,12 @@ main(int argc, char **argv) /* delete folder stack entry from context */ context_del(stack); } - free(dp); + mh_free0(&dp); } 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 */ @@ -321,34 +312,36 @@ main(int argc, char **argv) if (listsw) { printf("%s", argfolder ? argfolder : getcurfol()); if ((cp = context_find(stack))) { - dp = getcpy(cp); + dp = mh_xstrdup(cp); for (ap = brkstring(dp, " ", "\n"); *ap; ap++) printf(" %s", *ap); - free(dp); + mh_free0(&dp); } printf("\n"); - if (!printsw) - done(0); + if (!printsw) { + exit(EX_OK); + } } /* Allocate initial space to record folder information */ maxFolderInfo = CRAWL_NUMFOLDERS; - fi = mh_xmalloc(maxFolderInfo * sizeof(*fi)); + fi = mh_xcalloc(maxFolderInfo, sizeof(*fi)); /* ** 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); @@ -379,7 +372,7 @@ main(int argc, char **argv) ** 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 */ @@ -393,8 +386,7 @@ main(int argc, char **argv) print_folders(); context_save(); - done(0); - return 1; + return EX_OK; } static int @@ -436,8 +428,9 @@ get_folder_info_body(char *fold, char *msg, boolean *crawl_children) 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 */ } @@ -544,17 +537,6 @@ print_folders(void) 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) { @@ -600,7 +582,7 @@ print_folders(void) if (fi[i].others) printf(";%*s (others)", curprinted ? 0 : curmsgdigits + 6, ""); - printf(".\n"); + printf("\n"); } } @@ -610,7 +592,7 @@ print_folders(void) 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" : ""); } @@ -651,7 +633,7 @@ readonly_folders(void) { int atrlen; char atrcur[BUFSIZ]; - register struct node *np; + struct node *np; snprintf(atrcur, sizeof(atrcur), "atr-%s-", seq_cur); atrlen = strlen(atrcur);