static struct swit switches[] = {
#define VERSIONSW 0
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 1
{ "help", 0 },
{ NULL, 0 }
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
-#ifdef LOCALE
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
while ((cp = *argp++)) {
if (*cp == '-') {
switch (smatch(++cp, switches)) {
- case AMBIGSW:
- ambigsw(cp, switches);
- done(1);
- case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
-
- case HELPSW:
- snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
- print_help(buf, switches, 1);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ exit(1); //sysexits.h EX_TEMPFAIL
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+ print_help(buf, switches, 1);
+ exit(0); //sysexits.h EX_OK
+ case VERSIONSW:
+ print_version(invo_name);
+ exit(0); //sysexits.h EX_OK
}
}
if (*cp == '+' || *cp == '@') {
/* If no messages are given, print folder pathname */
if (!msgs.size) {
printf("%s\n", maildir);
- done(0);
+ exit(0); //sysexits.h EX_OK
}
if (chdir(maildir) == NOTOK)
/*
** We need to make sure there is message status space
- ** for all the message numbers from 1 to "new" since
+ ** for all the message numbers from 1 to one beyond last since
** mhpath can select empty slots. If we are adding
** space at the end, we go ahead and add 10 slots.
*/
if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
adios(NULL, "unable to allocate folder storage");
}
+ /*
+ ** TODO: As folder_realloc() checks itself if the realloc
+ ** really is necesary, why don't we then:
+ ** if (!(mp = folder_realloc (mp, 1, mp->hghmsg+1)))
+ ** adios (NULL, "unable to allocate folder storage");
+ ** ? This at least appears most clear to me. -- meillo
+ */
+
- mp->msgflags |= ALLOW_NEW; /* allow the "new" sequence */
+ mp->msgflags |= ALLOW_BEYOND; /* allow the beyond sequence */
/* parse all the message ranges/sequences and set SELECTED */
- for (i = 0; i < msgs.size; i++)
- if (!m_convert(mp, msgs.msgs[i]))
- done(1);
+ for (i = 0; i < msgs.size; i++) {
+ if (!m_convert(mp, msgs.msgs[i])) {
+ exit(1); //sysexits.h EX_USAGE
+ }
+ }
seq_setprev(mp); /* set the previous-sequence */
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
- done(0);
- return 1;
+ return 0;
}