projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This is mmh-0.3
[mmh]
/
uip
/
rcvpack.c
diff --git
a/uip/rcvpack.c
b/uip/rcvpack.c
index
d6e1025
..
bd6bacb
100644
(file)
--- a/
uip/rcvpack.c
+++ b/
uip/rcvpack.c
@@
-10,10
+10,13
@@
#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/tws.h>
#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/tws.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 }
@@
-27,9
+30,7
@@
main(int argc, char **argv)
char *cp, *file = NULL, buf[BUFSIZ];
char **argp, **arguments;
char *cp, *file = NULL, buf[BUFSIZ];
char **argp, **arguments;
-#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 */
@@
-44,47
+45,51
@@
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 [switches] file",
invo_name);
print_help(buf, switches, 1);
case HELPSW:
snprintf(buf, sizeof(buf),
"%s [switches] file",
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 (file)
}
}
if (file)
- adios(NULL, "only one file at a time!");
+ adios(EX_USAGE, NULL, "only one file at a time!");
else
file = cp;
}
else
file = cp;
}
- if (!file)
- adios(NULL, "%s [switches] file", invo_name);
-
- rewind(stdin);
+ /* copy stdin to stdout, converting rfc822 message to mbox */
+ if (!file) {
+ if (mbox_copy(fileno(stdout), fileno(stdin)) == NOTOK) {
+ exit(RCV_MBX);
+ }
+ exit(RCV_MOK);
+ return 1;
+ }
/* open and lock the file */
/* open and lock the file */
- if ((md = mbx_open(file, getuid(), getgid(), m_gmprot()))
+ if ((md = mbox_open(file, getuid(), getgid(), m_gmprot()))
== NOTOK)
== NOTOK)
- done(RCV_MBX);
+ exit(RCV_MBX);
/* append the message */
/* append the message */
- if (mbx_copy(file, md, fileno(stdin), 0) == NOTOK) {
- mbx_close(file, md);
- done(RCV_MBX);
+ if (mbox_copy(md, fileno(stdin)) == NOTOK) {
+ mbox_close(file, md);
+ exit(RCV_MBX);
}
/* close and unlock the file */
}
/* close and unlock the file */
- if (mbx_close(file, md) == NOTOK)
- done(RCV_MBX);
+ if (mbox_close(file, md) == NOTOK)
+ exit(RCV_MBX);
- done(RCV_MOK);
+ exit(RCV_MOK);
return 1;
}
return 1;
}