projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh
[mmh]
/
uip
/
rcvpack.c
diff --git
a/uip/rcvpack.c
b/uip/rcvpack.c
index
85de619
..
352f785
100644
(file)
--- a/
uip/rcvpack.c
+++ b/
uip/rcvpack.c
@@
-10,11
+10,10
@@
#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 <h/mts.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 }
@@
-28,15
+27,12
@@
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 */
context_read();
invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
@@
-46,7
+42,7
@@
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(1);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
case UNKWNSW:
adios(NULL, "-%s unknown", cp);
@@
-55,10
+51,10
@@
main(int argc, char **argv)
"%s [switches] file",
invo_name);
print_help(buf, switches, 1);
"%s [switches] file",
invo_name);
print_help(buf, switches, 1);
- done(1);
+ exit(0);
case VERSIONSW:
print_version(invo_name);
case VERSIONSW:
print_version(invo_name);
- done(1);
+ exit(0);
}
}
if (file)
}
}
if (file)
@@
-67,26
+63,30
@@
main(int argc, char **argv)
file = cp;
}
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;
}