-
-/*
- * 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
*
* complete copyright information.
*/
-#include <h/mh.h>
-#include <h/crawl_folders.h>
-#include <h/utils.h>
+#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) \
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 */
* Function for printing error message if folder does not exist with
* -nocreate.
*/
-static
-void
-nonexistent_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'.
*/
- all = HasSuffixC(argv[0], 's');
+ all = has_suffix_c(argv[0], 's');
arguments = getarguments (invo_name, argc, argv, 1);
argp = arguments;
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]",
done (0);
case ALLSW:
- all = 1;
+ all = true;
continue;
case NALLSW:
- all = 0;
+ all = false;
continue;
case CREATSW:
continue;
case FASTSW:
- fshort++;
+ fshort = true;
continue;
case NFASTSW:
- fshort = 0;
+ fshort = false;
continue;
case HDRSW:
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:
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;
}
}
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) {
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 */
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 = 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 */
/* Listing the folder stack */
if (listsw) {
- printf ("%s", argfolder ? argfolder : getfolder (1));
+ fputs(argfolder ? argfolder : getfolder (1), stdout);
if ((cp = context_find (stack))) {
dp = mh_xstrdup(cp);
for (ap = brkstring (dp, " ", "\n"); *ap; ap++)
*/
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));
/*
* Print out folder information
*/
- print_folders();
+ if (printsw)
+ print_folders();
context_save (); /* save the context file */
done (0);
}
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;
* 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;
}
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 */
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);
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);
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;
/* check for empty folders */
if (fi[i].nummsg == 0)
- hasempty = 1;
+ hasempty = true;
}
nummsgdigits = num_digits (maxnummsg);
lowmsgdigits = num_digits (maxlowmsg);
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 (ftotal > 0 || (all && !fshort && ftotal >= 0)) {
if (all)
putchar('\n');
- printf ("TOTAL = %d message%c in %d folder%s.\n",
- total_msgs, total_msgs != 1 ? 's' : ' ',
- total_folders, total_folders != 1 ? "s" : "");
+ 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
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 */
projects / nmh / blobdiff