-
-/*
- * 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
*
#include <h/mh.h>
#include <h/crawl_folders.h>
#include <h/utils.h>
+#include "sbr/m_maildir.h"
#define FOLDER_SWITCHES \
X("all", 0, ALLSW) \
X("list", 0, LISTSW) \
X("nolist", 0, NLISTSW) \
X("print", 0, PRNTSW) \
- X("noprint", -4, NPRNTSW) \
+ X("noprint", 0, NPRNTSW) \
X("push", 0, PUSHSW) \
X("pop", 0, POPSW) \
X("version", 0, VERSIONSW) \
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);
+ adios (NULL, "folder %s does not exist", folder);
+}
+
int
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 = r1bindex (argv[0], '/');
-
- /* read user profile/context */
- context_read();
+ if (nmh_init(argv[0], 1)) { 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;
if (*cp == '+' || *cp == '@') {
if (argfolder)
adios (NULL, "only one folder at a time!");
- else
- argfolder = pluspath (cp);
+ argfolder = pluspath (cp);
} else {
if (msg)
adios (NULL, "only one (current) message at a time!");
- else
- msg = cp;
+ msg = cp;
}
}
/* 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 {
if (argfolder)
adios (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++);
} else {
/* 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);
*/
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, 1))) {
- 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);
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);
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;
}
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) {
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