X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhpath.c;h=a8de5cb2c4695960670f0d574826cbfa3bb2b292;hb=10e03b3fba3e01052baf92c963c46a2a5529b4e0;hp=5009a2fe7e96d5d4c93a750ac0767725fe96ccd0;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0;p=mmh diff --git a/uip/mhpath.c b/uip/mhpath.c index 5009a2f..a8de5cb 100644 --- a/uip/mhpath.c +++ b/uip/mhpath.c @@ -11,7 +11,7 @@ static struct swit switches[] = { #define VERSIONSW 0 - { "version", 0 }, + { "Version", 0 }, #define HELPSW 1 { "help", 0 }, { NULL, 0 } @@ -27,9 +27,7 @@ main(int argc, char **argv) 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 */ @@ -44,19 +42,19 @@ main(int argc, char **argv) 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); + 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); } } if (*cp == '+' || *cp == '@') { @@ -87,7 +85,7 @@ main(int argc, char **argv) /* ** 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. */ @@ -98,8 +96,16 @@ main(int argc, char **argv) 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++)