#include <h/mh.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define ADDSW 0
#define PUBLSW 4
{ "public", 0 },
#define NPUBLSW 5
- { "nopublic", 0 },
+ { "nopublic", 2 },
#define ZEROSW 6
{ "zero", 0 },
#define NZEROSW 7
- { "nozero", 0 },
+ { "nozero", 2 },
#define VERSIONSW 8
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 9
{ "help", 0 },
#define DEBUGSW 10
{ NULL, 0 }
};
+char *version=VERSION;
+
/*
** static prototypes
*/
main(int argc, char **argv)
{
int addsw = 0, deletesw = 0, debugsw = 0;
- int listsw = 0, publicsw = -1, zerosw = 0;
- int seqp = 0, msgnum;
+ int listsw = 0, publicsw = -1, zerosw = 0, msgnum;
+ unsigned int seqp = 0;
char *cp, *maildir, *folder = NULL, buf[BUFSIZ];
char **argp, **arguments;
char *seqs[NUMATTRS + 1];
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
- adios(NULL, "-%s unknown\n", cp);
+ adios(EX_USAGE, NULL, "-%s unknown\n", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [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 ADDSW:
addsw++;
continue;
case SEQSW:
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
+ if (!(cp = *argp++) || *cp == '-') {
+ adios(EX_USAGE, NULL, "missing argument to %s",
argp[-2]);
+ }
/* check if too many sequences specified */
- if (seqp >= NUMATTRS)
- adios(NULL, "too many sequences (more than %d) specified", NUMATTRS);
+ if (seqp >= NUMATTRS) {
+ adios(EX_USAGE, NULL, "too many sequences (more than %d) specified", NUMATTRS);
+ }
seqs[seqp++] = cp;
continue;
}
}
if (*cp == '+' || *cp == '@') {
- if (folder)
- adios(NULL, "only one folder at a time!");
- else
- folder = pluspath(cp);
- } else
- app_msgarg(&msgs, cp);
+ if (folder) {
+ adios(EX_USAGE, NULL, "only one folder at a time!");
+ } else {
+ folder = mh_xstrdup(expandfol(cp));
+ }
+ } else {
+ app_msgarg(&msgs, cp);
+ }
}
/*
listsw++;
}
- if (!context_find("path"))
- free(path("./", TFOLDER));
if (!msgs.size)
- app_msgarg(&msgs, listsw ? "all" :"cur");
+ app_msgarg(&msgs, listsw ? seq_all : seq_cur);
if (!folder)
- folder = getfolder(1);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
- if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
+ if (chdir(maildir) == NOTOK) {
+ adios(EX_OSERR, maildir, "unable to change directory to");
+ }
/* read folder and create message structure */
- if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
+ if (!(mp = folder_read(folder))) {
+ adios(EX_IOERR, NULL, "unable to read folder %s", folder);
+ }
/* print some general debugging info */
if (debugsw)
print_debug(mp);
/* check for empty folder */
- if (mp->nummsg == 0)
- adios(NULL, "no messages in %s", folder);
+ if (mp->nummsg == 0) {
+ adios(EX_DATAERR, NULL, "no messages in %s", folder);
+ }
/* parse all the message ranges/sequences and set SELECTED */
- for (msgnum = 0; msgnum < msgs.size; msgnum++)
- if (!m_convert(mp, msgs.msgs[msgnum]))
- done(1);
+ for (msgnum = 0; msgnum < msgs.size; msgnum++) {
+ if (!m_convert(mp, msgs.msgs[msgnum])) {
+ exit(EX_USAGE);
+ }
+ }
- if (publicsw == 1 && is_readonly(mp))
- adios(NULL, "folder %s is read-only, so -public not allowed",
+ if (publicsw == 1 && is_readonly(mp)) {
+ adios(EX_NOPERM, NULL, "folder %s is read-only, so -public not allowed",
folder);
+ }
/*
** Make sure at least one sequence has been
** specified if we are adding or deleting.
*/
- if (seqp == 0 && (addsw || deletesw))
- adios(NULL, "-%s requires at least one -sequence argument",
+ if (seqp == 0 && (addsw || deletesw)) {
+ adios(EX_USAGE, NULL, "-%s requires at least one -sequence argument",
addsw ? "add" : "delete");
+ }
seqs[seqp] = NULL;
/* Adding messages to sequences */
if (addsw) {
- for (seqp = 0; seqs[seqp]; seqp++)
- if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw))
- done(1);
+ for (seqp = 0; seqs[seqp]; seqp++) {
+ if (!seq_addsel(mp, seqs[seqp], publicsw, zerosw)) {
+ exit(EX_SOFTWARE);
+ }
+ }
}
/* Deleting messages from sequences */
if (deletesw) {
- for (seqp = 0; seqs[seqp]; seqp++)
- if (!seq_delsel(mp, seqs[seqp], publicsw, zerosw))
- done(1);
+ for (seqp = 0; seqs[seqp]; seqp++) {
+ if (!seq_delsel(mp, seqs[seqp], publicsw, zerosw)) {
+ exit(EX_SOFTWARE);
+ }
+ }
}
/* Listing messages in sequences */
}
seq_save(mp); /* synchronize message sequences */
- context_replace(pfolder, folder); /* update current folder */
+ context_replace(curfolder, folder); /* update current folder */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
- done(0);
- return 1;
+ return EX_OK;
}
projects / mmh / blobdiff