X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/efa36b8cb2aae4cf57dde5118888ae2d4f78e2cd..248c3a452003bc95088d9a1c4dec988696be2d7d:/uip/folder.c?ds=sidebyside diff --git a/uip/folder.c b/uip/folder.c index 4f36ed0e..8ab6528b 100644 --- a/uip/folder.c +++ b/uip/folder.c @@ -1,6 +1,4 @@ - -/* - * folder(s).c -- set/list the current message and/or folder +/* folder.c -- set/list the current message and/or folder * -- push/pop a folder onto/from the folder stack * -- list the folder stack * @@ -9,9 +7,34 @@ * complete copyright information. */ -#include -#include -#include +#include "h/mh.h" +#include "sbr/getarguments.h" +#include "sbr/concat.h" +#include "sbr/seq_setprev.h" +#include "sbr/seq_setcur.h" +#include "sbr/seq_save.h" +#include "sbr/smatch.h" +#include "sbr/ssequal.h" +#include "sbr/getcpy.h" +#include "sbr/m_convert.h" +#include "sbr/getfolder.h" +#include "sbr/folder_read.h" +#include "sbr/folder_pack.h" +#include "sbr/folder_free.h" +#include "sbr/context_save.h" +#include "sbr/context_replace.h" +#include "sbr/context_del.h" +#include "sbr/context_find.h" +#include "sbr/brkstring.h" +#include "sbr/ambigsw.h" +#include "sbr/path.h" +#include "sbr/print_version.h" +#include "sbr/print_help.h" +#include "sbr/error.h" +#include "sbr/crawl_folders.h" +#include "h/done.h" +#include "h/utils.h" +#include "sbr/m_maildir.h" #define FOLDER_SWITCHES \ X("all", 0, ALLSW) \ @@ -47,14 +70,14 @@ DEFINE_SWITCH_ENUM(FOLDER); DEFINE_SWITCH_ARRAY(FOLDER, switches); #undef X -static int fshort = 0; /* output only folder names */ +static bool fshort; /* 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 bool fpack; /* are we packing the folder? */ +static bool fverb; /* print actions taken while packing folder */ static int fheader = 0; /* should we output a header? */ -static int frecurse = 0; /* recurse through subfolders */ +static bool frecurse; /* recurse through subfolders */ static int ftotal = 0; /* should we output the totals? */ -static int all = 0; /* should we output all folders */ +static bool all; /* should we output all folders */ static int total_folders = 0; /* total number of folders */ @@ -96,29 +119,31 @@ static void readonly_folders (void); * Function for printing error message if folder does not exist with * -nocreate. */ -void -nonexistant_folder (int status) { +static void +nonexistent_folder (int status) +{ NMH_UNUSED (status); - adios (NULL, "folder %s does not exist", folder); + die("folder %s does not exist", folder); } int main (int argc, char **argv) { - int printsw = 0, listsw = 0; - int pushsw = 0, popsw = 0; + int printsw = -1; + bool listsw = false; + bool pushsw = false; + bool popsw = false; char *cp, *dp, *msg = NULL, *argfolder = NULL; char **ap, **argp, buf[BUFSIZ], **arguments; - if (nmh_init(argv[0], 1)) { return 1; } + if (nmh_init(argv[0], true, true)) { return 1; } /* * If program was invoked with name ending * in `s', then add switch `-all'. */ - if (argv[0][strlen (argv[0]) - 1] == 's') - all = 1; + all = has_suffix_c(argv[0], 's'); arguments = getarguments (invo_name, argc, argv, 1); argp = arguments; @@ -130,7 +155,7 @@ main (int argc, char **argv) ambigsw (cp, switches); done (1); case UNKWNSW: - adios (NULL, "-%s unknown", cp); + die("-%s unknown", cp); case HELPSW: snprintf (buf, sizeof(buf), "%s [+folder] [msg] [switches]", @@ -142,11 +167,11 @@ main (int argc, char **argv) done (0); case ALLSW: - all = 1; + all = true; continue; case NALLSW: - all = 0; + all = false; continue; case CREATSW: @@ -157,10 +182,10 @@ main (int argc, char **argv) continue; case FASTSW: - fshort++; + fshort = true; continue; case NFASTSW: - fshort = 0; + fshort = false; continue; case HDRSW: @@ -171,24 +196,24 @@ main (int argc, char **argv) continue; case PACKSW: - fpack++; + fpack = true; continue; case NPACKSW: - fpack = 0; + fpack = false; continue; case VERBSW: - fverb++; + fverb = true; continue; case NVERBSW: - fverb = 0; + fverb = false; continue; case RECURSW: - frecurse++; + frecurse = true; continue; case NRECRSW: - frecurse = 0; + frecurse = false; continue; case TOTALSW: @@ -206,34 +231,32 @@ main (int argc, char **argv) continue; case LISTSW: - listsw = 1; + listsw = true; continue; case NLISTSW: - listsw = 0; + listsw = false; continue; case PUSHSW: - pushsw = 1; - listsw = 1; - popsw = 0; + pushsw = true; + listsw = true; + popsw = false; continue; case POPSW: - popsw = 1; - listsw = 1; - pushsw = 0; + popsw = true; + listsw = true; + pushsw = false; continue; } } if (*cp == '+' || *cp == '@') { if (argfolder) - adios (NULL, "only one folder at a time!"); - else - argfolder = pluspath (cp); + die("only one folder at a time!"); + argfolder = pluspath (cp); } else { if (msg) - adios (NULL, "only one (current) message at a time!"); - else - msg = cp; + die("only one (current) message at a time!"); + msg = cp; } } @@ -242,11 +265,13 @@ main (int argc, char **argv) nmhdir = concat (m_maildir (""), "/", NULL); /* - * If we aren't working with the folder stack - * (-push, -pop, -list) then the default is to print. + * If not directed via -print/-noprint, we print folder summary + * info unless if we're working with the folder stack (i.e., + * -push, -pop, or -list). */ - if (pushsw == 0 && popsw == 0 && listsw == 0) - printsw++; + if (printsw == -1) { + printsw = !(pushsw || popsw || listsw); + } /* Pushing a folder onto the folder stack */ if (pushsw) { @@ -254,13 +279,13 @@ 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++); } else { - adios (NULL, "no other folder"); + die("no other folder"); } - for (cp = getcpy (getfolder (1)); *ap; ap++) + for (cp = mh_xstrdup(getfolder(1)); *ap; ap++) cp = add (*ap, add (" ", cp)); free (dp); context_replace (stack, cp); /* update folder stack */ @@ -269,20 +294,20 @@ main (int argc, char **argv) context_replace (stack, (cp = context_find (stack)) ? concat (getfolder (1), " ", cp, NULL) - : getcpy (getfolder (1))); + : mh_xstrdup(getfolder(1))); } } /* Popping a folder off of the folder stack */ if (popsw) { if (argfolder) - adios (NULL, "sorry, no folders allowed with -pop"); + die("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++); } else { - adios (NULL, "folder stack empty"); + die("folder stack empty"); } if (*ap) { /* if there's anything left in the stack */ @@ -306,14 +331,14 @@ main (int argc, char **argv) /* Listing the folder stack */ if (listsw) { - printf ("%s", argfolder ? argfolder : getfolder (1)); + fputs(argfolder ? argfolder : getfolder (1), stdout); if ((cp = context_find (stack))) { - dp = getcpy (cp); + dp = mh_xstrdup(cp); for (ap = brkstring (dp, " ", "\n"); *ap; ap++) printf (" %s", *ap); free (dp); } - printf ("\n"); + putchar('\n'); if (!printsw) done (0); @@ -335,9 +360,10 @@ main (int argc, char **argv) */ if (!argfolder) { if (msg) - admonish (NULL, "no folder given for message %s", msg); + inform("no folder given for message %s, continuing...", msg); readonly_folders (); /* do any readonly folders */ - strncpy (folder, (cp = context_find (pfolder)) ? cp : "", sizeof(folder)); + cp = context_find(pfolder); + strncpy (folder, FENDNULL(cp), sizeof(folder)); crawl_folders (".", get_folder_info_callback, NULL); } else { strncpy (folder, argfolder, sizeof(folder)); @@ -359,7 +385,7 @@ main (int argc, char **argv) * Check if folder exists. If not, then see if * we should create it, or just exit. */ - create_folder (m_maildir (folder), fcreat, nonexistant_folder); + create_folder (m_maildir (folder), fcreat, nonexistent_folder); if (get_folder_info (folder, msg) && argfolder) { /* update current folder */ @@ -370,7 +396,8 @@ main (int argc, char **argv) /* * Print out folder information */ - print_folders(); + if (printsw) + print_folders(); context_save (); /* save the context file */ done (0); @@ -378,7 +405,7 @@ main (int argc, char **argv) } static int -get_folder_info_body (char *fold, char *msg, boolean *crawl_children) +get_folder_info_body (char *fold, char *msg, bool *crawl_children) { int i, retval = 1; struct msgs *mp = NULL; @@ -407,8 +434,8 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children) * create message structure and get folder info */ if (!(mp = folder_read (fold, fpack))) { - admonish (NULL, "unable to read folder %s", fold); - *crawl_children = FALSE; + inform("unable to read folder %s, continuing...", fold); + *crawl_children = false; return 0; } @@ -418,7 +445,7 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children) if (fpack) { if (folder_pack (&mp, fverb) == -1) { - *crawl_children = FALSE; /* to please clang static analyzer */ + *crawl_children = false; /* to please clang static analyzer */ done (1); } seq_save (mp); /* synchronize the sequences */ @@ -442,10 +469,10 @@ get_folder_info_body (char *fold, char *msg, boolean *crawl_children) return retval; } -static boolean +static bool get_folder_info_callback (char *fold, void *baton) { - boolean crawl_children; + bool crawl_children; NMH_UNUSED (baton); get_folder_info_body (fold, NULL, &crawl_children); @@ -456,7 +483,7 @@ get_folder_info_callback (char *fold, void *baton) static int get_folder_info (char *fold, char *msg) { - boolean crawl_children; + bool crawl_children; int retval; retval = get_folder_info_body (fold, msg, &crawl_children); @@ -475,7 +502,9 @@ get_folder_info (char *fold, char *msg) static void print_folders (void) { - int i, len, hasempty = 0, curprinted; + int i, len; + bool hasempty = false; + bool curprinted; int maxlen = 0, maxnummsg = 0, maxlowmsg = 0; int maxhghmsg = 0, maxcurmsg = 0, total_msgs = 0; int nummsgdigits, lowmsgdigits; @@ -519,7 +548,7 @@ print_folders (void) /* check for empty folders */ if (fi[i].nummsg == 0) - hasempty = 1; + hasempty = true; } nummsgdigits = num_digits (maxnummsg); lowmsgdigits = num_digits (maxlowmsg); @@ -546,7 +575,7 @@ print_folders (void) if (all || fshort || ftotal < 1) { for (i = 0; i < total_folders; i++) { if (fshort) { - printf ("%s\n", fi[i].name); + puts(fi[i].name); continue; } @@ -563,26 +592,26 @@ print_folders (void) printf ("%-*s ", maxlen+1, tmpname); - curprinted = 0; /* remember if we print cur */ + curprinted = false; /* remember if we print cur */ if (fi[i].nummsg == 0) { printf ("has %*s messages%*s", nummsgdigits, "no", fi[i].others ? lowmsgdigits + hghmsgdigits + 5 : 0, ""); } else { - printf ("has %*d message%s (%*d-%*d)", + printf ("has %*d message%1s (%*d-%*d)", nummsgdigits, fi[i].nummsg, - (fi[i].nummsg == 1) ? " " : "s", + PLURALS(fi[i].nummsg), lowmsgdigits, fi[i].lowmsg, hghmsgdigits, fi[i].hghmsg); if (fi[i].curmsg >= fi[i].lowmsg && fi[i].curmsg <= fi[i].hghmsg) { - curprinted = 1; + curprinted = true; printf ("; cur=%*d", curmsgdigits, fi[i].curmsg); } } if (fi[i].others) printf (";%*s (others)", curprinted ? 0 : curmsgdigits + 6, ""); - printf (".\n"); + puts("."); } } @@ -591,17 +620,17 @@ print_folders (void) */ if (ftotal > 0 || (all && !fshort && ftotal >= 0)) { if (all) - printf ("\n"); - printf ("TOTAL = %d message%c in %d folder%s.\n", - total_msgs, total_msgs != 1 ? 's' : ' ', - total_folders, total_folders != 1 ? "s" : ""); + putchar('\n'); + printf ("TOTAL = %d message%s in %d folder%s.\n", + total_msgs, PLURALS(total_msgs), + total_folders, PLURALS(total_folders)); } fflush (stdout); } /* - * Set the current message and sychronize sequences + * Set the current message and synchronize sequences */ static int @@ -612,7 +641,7 @@ sfold (struct msgs *mp, char *msg) return 0; if (mp->numsel > 1) { - admonish (NULL, "only one message at a time!"); + inform("only one message at a time!, continuing..."); return 0; } seq_setprev (mp); /* set the previous-sequence */ @@ -633,7 +662,7 @@ readonly_folders (void) { int atrlen; char atrcur[BUFSIZ]; - register struct node *np; + struct node *np; snprintf (atrcur, sizeof(atrcur), "atr-%s-", current); atrlen = strlen (atrcur);