projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix configure.ac warning
[mmh]
/
uip
/
mhpath.c
diff --git
a/uip/mhpath.c
b/uip/mhpath.c
index
605d13c
..
c400fa6
100644
(file)
--- a/
uip/mhpath.c
+++ b/
uip/mhpath.c
@@
-8,6
+8,9
@@
#include <h/mh.h>
#include <h/utils.h>
#include <h/mh.h>
#include <h/utils.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define VERSIONSW 0
static struct swit switches[] = {
#define VERSIONSW 0
@@
-27,9
+30,7
@@
main(int argc, char **argv)
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
struct msgs_array msgs = { 0, 0, NULL };
struct msgs *mp;
-#ifdef LOCALE
setlocale(LC_ALL, "");
setlocale(LC_ALL, "");
-#endif
invo_name = mhbasename(argv[0]);
/* read user profile/context */
invo_name = mhbasename(argv[0]);
/* read user profile/context */
@@
-46,26
+47,28
@@
main(int argc, char **argv)
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
switch (smatch(++cp, switches)) {
case AMBIGSW:
ambigsw(cp, switches);
- done(1);
+ exit(EX_USAGE);
case UNKWNSW:
case UNKWNSW:
- adios(NULL, "-%s unknown", cp);
+ adios(EX_USAGE, NULL, "-%s unknown", cp);
case HELPSW:
snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
print_help(buf, switches, 1);
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);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(argc == 2 ? EX_OK : EX_USAGE);
}
}
if (*cp == '+' || *cp == '@') {
}
}
if (*cp == '+' || *cp == '@') {
- if (folder)
- adios(NULL, "only one folder at a time!");
- else
+ if (folder) {
+ adios(EX_USAGE, NULL, "only one folder at a time!");
+ } else {
folder = getcpy(expandfol(cp));
folder = getcpy(expandfol(cp));
- } else
+ }
+ } else {
app_msgarg(&msgs, cp);
app_msgarg(&msgs, cp);
+ }
}
if (!folder)
}
if (!folder)
@@
-75,15
+78,15
@@
main(int argc, char **argv)
/* If no messages are given, print folder pathname */
if (!msgs.size) {
printf("%s\n", maildir);
/* If no messages are given, print folder pathname */
if (!msgs.size) {
printf("%s\n", maildir);
- done(0);
+ exit(EX_OK);
}
if (chdir(maildir) == NOTOK)
}
if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
+ adios(EX_OSERR, maildir, "unable to change directory to");
/* read folder and create message structure */
if (!(mp = folder_read(folder)))
/* read folder and create message structure */
if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
+ adios(EX_IOERR, NULL, "unable to read folder %s", folder);
/*
** We need to make sure there is message status space
/*
** We need to make sure there is message status space
@@
-92,11
+95,13
@@
main(int argc, char **argv)
** space at the end, we go ahead and add 10 slots.
*/
if (mp->hghmsg >= mp->hghoff) {
** space at the end, we go ahead and add 10 slots.
*/
if (mp->hghmsg >= mp->hghoff) {
- if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10)))
- adios(NULL, "unable to allocate folder storage");
+ if (!(mp = folder_realloc(mp, 1, mp->hghmsg + 10))) {
+ adios(EX_OSERR, NULL, "unable to allocate folder storage");
+ }
} else if (mp->lowoff > 1) {
} else if (mp->lowoff > 1) {
- if (!(mp = folder_realloc(mp, 1, mp->hghoff)))
- adios(NULL, "unable to allocate folder storage");
+ if (!(mp = folder_realloc(mp, 1, mp->hghoff))) {
+ adios(EX_OSERR, NULL, "unable to allocate folder storage");
+ }
}
/*
** TODO: As folder_realloc() checks itself if the realloc
}
/*
** TODO: As folder_realloc() checks itself if the realloc
@@
-110,9
+115,11
@@
main(int argc, char **argv)
mp->msgflags |= ALLOW_BEYOND; /* allow the beyond sequence */
/* parse all the message ranges/sequences and set SELECTED */
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(EX_SOFTWARE);
+ }
+ }
seq_setprev(mp); /* set the previous-sequence */
seq_setprev(mp); /* set the previous-sequence */
@@
-124,6
+131,5
@@
main(int argc, char **argv)
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
seq_save(mp); /* synchronize message sequences */
context_save(); /* save the context file */
folder_free(mp); /* free folder/message structure */
- done(0);
- return 1;
+ return EX_OK;
}
}