-
-/*
- * 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 <errno.h>
-
-static struct swit switches[] = {
-#define ALLSW 0
- { "all", 0 },
-#define NALLSW 1
- { "noall", 0 },
-#define CREATSW 2
- { "create", 0 },
-#define NCREATSW 3
- { "nocreate", 0 },
-#define FASTSW 4
- { "fast", 0 },
-#define NFASTSW 5
- { "nofast", 0 },
-#define HDRSW 6
- { "header", 0 },
-#define NHDRSW 7
- { "noheader", 0 },
-#define PACKSW 8
- { "pack", 0 },
-#define NPACKSW 9
- { "nopack", 0 },
-#define VERBSW 10
- { "verbose", 0 },
-#define NVERBSW 11
- { "noverbose", 0 },
-#define RECURSW 12
- { "recurse", 0 },
-#define NRECRSW 13
- { "norecurse", 0 },
-#define TOTALSW 14
- { "total", 0 },
-#define NTOTLSW 15
- { "nototal", 0 },
-#define LISTSW 16
- { "list", 0 },
-#define NLISTSW 17
- { "nolist", 0 },
-#define PRNTSW 18
- { "print", 0 },
-#define NPRNTSW 19
- { "noprint", -4 },
-#define PUSHSW 20
- { "push", 0 },
-#define POPSW 21
- { "pop", 0 },
-#define VERSIONSW 22
- { "version", 0 },
-#define HELPSW 23
- { "help", 0 },
- { NULL, 0 }
-};
-
-static int fshort = 0; /* output only folder names */
+#include "h/mh.h"
+#include "sbr/path.h"
+#include "sbr/print_version.h"
+#include "sbr/print_help.h"
+#include "sbr/error.h"
+#include "h/crawl_folders.h"
+#include "h/done.h"
+#include "h/utils.h"
+#include "sbr/m_maildir.h"
+
+#define FOLDER_SWITCHES \
+ X("all", 0, ALLSW) \
+ X("noall", 0, NALLSW) \
+ X("create", 0, CREATSW) \
+ X("nocreate", 0, NCREATSW) \
+ X("fast", 0, FASTSW) \
+ X("nofast", 0, NFASTSW) \
+ X("header", 0, HDRSW) \
+ X("noheader", 0, NHDRSW) \
+ X("pack", 0, PACKSW) \
+ X("nopack", 0, NPACKSW) \
+ X("verbose", 0, VERBSW) \
+ X("noverbose", 0, NVERBSW) \
+ X("recurse", 0, RECURSW) \
+ X("norecurse", 0, NRECRSW) \
+ X("total", 0, TOTALSW) \
+ X("nototal", 0, NTOTLSW) \
+ X("list", 0, LISTSW) \
+ X("nolist", 0, NLISTSW) \
+ X("print", 0, PRNTSW) \
+ X("noprint", 0, NPRNTSW) \
+ X("push", 0, PUSHSW) \
+ X("pop", 0, POPSW) \
+ X("version", 0, VERSIONSW) \
+ X("help", 0, HELPSW) \
+
+#define X(sw, minchars, id) id,
+DEFINE_SWITCH_ENUM(FOLDER);
+#undef X
+
+#define X(sw, minchars, id) { sw, minchars, id },
+DEFINE_SWITCH_ARRAY(FOLDER, switches);
+#undef X
+
+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 */
static int sfold (struct msgs *, char *);
static void readonly_folders (void);
+/*
+ * Function for printing error message if folder does not exist with
+ * -nocreate.
+ */
+static void
+nonexistent_folder (int status)
+{
+ NMH_UNUSED (status);
+ die("folder %s does not exist", folder);
+}
+
int
main (int argc, char **argv)
{
- int printsw = 0, listsw = 0;
- int pushsw = 0, popsw = 0;
+ bool printsw = false;
+ bool listsw = false;
+ bool pushsw = false;
+ bool popsw = false;
char *cp, *dp, *msg = NULL, *argfolder = NULL;
char **ap, **argp, buf[BUFSIZ], **arguments;
-#ifdef LOCALE
- setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ 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;
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]",
invo_name);
print_help (buf, switches, 1);
- done (1);
+ done (0);
case VERSIONSW:
print_version(invo_name);
- done (1);
+ 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 PRNTSW:
- printsw = 1;
+ printsw = true;
continue;
case NPRNTSW:
- printsw = 0;
+ printsw = false;
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;
}
}
* If we aren't working with the folder stack
* (-push, -pop, -list) then the default is to print.
*/
- if (pushsw == 0 && popsw == 0 && listsw == 0)
- printsw++;
+ if (!pushsw && !popsw && !listsw)
+ printsw = true;
/* Pushing a folder onto the folder stack */
if (pushsw) {
/* 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 */
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 */
/* 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);
/*
* Scan the folders
*/
+ /* change directory to base of nmh directory for crawl_folders */
+ if (chdir (nmhdir) == NOTOK)
+ adios (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);
+ 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));
* Check if folder exists. If not, then see if
* we should create it, or just exit.
*/
- create_folder (m_maildir (folder), fcreat, done);
+ create_folder (m_maildir (folder), fcreat, nonexistent_folder);
if (get_folder_info (folder, msg) && argfolder) {
/* update current folder */
}
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))) {
- admonish (NULL, "unable to read folder %s", fold);
+ if (!(mp = folder_read (fold, fpack))) {
+ inform("unable to read folder %s, continuing...", fold);
+ *crawl_children = false;
return 0;
}
retval = 0;
if (fpack) {
- if (folder_pack (&mp, fverb) == -1)
+ if (folder_pack (&mp, fverb) == -1) {
+ *crawl_children = false; /* to please clang static analyzer */
done (1);
+ }
seq_save (mp); /* synchronize the sequences */
context_save (); /* save the context file */
}
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);
fflush (stdout);
return 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);
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;
}
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(".");
}
}
*/
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
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 */
{
int atrlen;
char atrcur[BUFSIZ];
- register struct node *np;
+ struct node *np;
snprintf (atrcur, sizeof(atrcur), "atr-%s-", current);
atrlen = strlen (atrcur);
projects / nmh / blobdiff