projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add some gcc hint defines
[mmh]
/
uip
/
packf.c
diff --git
a/uip/packf.c
b/uip/packf.c
index
23ee335
..
b2726f4
100644
(file)
--- a/
uip/packf.c
+++ b/
uip/packf.c
@@
-11,15
+11,19
@@
#include <h/dropsbr.h>
#include <h/utils.h>
#include <errno.h>
#include <h/dropsbr.h>
#include <h/utils.h>
#include <errno.h>
+#include <unistd.h>
+#include <locale.h>
+#include <sysexits.h>
static struct swit switches[] = {
#define VERSIONSW 0
static struct swit switches[] = {
#define VERSIONSW 0
- { "version", 0 },
+ { "Version", 0 },
#define HELPSW 1
{ "help", 0 },
{ NULL, 0 }
};
#define HELPSW 1
{ "help", 0 },
{ NULL, 0 }
};
+char *version=VERSION;
int
main(int argc, char **argv)
int
main(int argc, char **argv)
@@
-30,9
+34,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 */
@@
-49,23
+51,23
@@
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 (folder)
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
- adios(NULL, "only one folder at a time!");
- folder = getcpy(expandfol(cp));
+ adios(EX_USAGE, NULL, "only one folder at a time!");
+ folder = mh_xstrdup(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
} else
app_msgarg(&msgs, cp);
}
@@
-79,21
+81,20
@@
main(int argc, char **argv)
maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
maildir = toabsdir(folder);
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);
/* check for empty folder */
if (mp->nummsg == 0)
/* check for empty folder */
if (mp->nummsg == 0)
- adios(NULL, "no messages in %s", folder);
+ 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]))
/* 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);
- seq_setprev(mp); /* set the previous-sequence */
+ exit(EX_USAGE);
/* copy all the SELECTED messages to stdout */
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
/* copy all the SELECTED messages to stdout */
for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@
-104,7
+105,7
@@
main(int argc, char **argv)
break;
}
if (mbox_copy(fileno(stdout), fd) == NOTOK) {
break;
}
if (mbox_copy(fileno(stdout), fd) == NOTOK) {
- adios(NULL, "error writing to stdout");
+ adios(EX_IOERR, NULL, "error writing to stdout");
}
close(fd);
}
}
close(fd);
}
@@
-115,6
+116,5
@@
main(int argc, char **argv)
seq_save(mp);
context_save();
folder_free(mp);
seq_save(mp);
context_save();
folder_free(mp);
- done(0);
- return 1;
+ return 0;
}
}