#include <h/dropsbr.h>
#include <h/rcvmail.h>
#include <h/tws.h>
-#include <h/mts.h>
static struct swit switches[] = {
-#define MBOXSW 0
- { "mbox", 0 },
-#define MMDFSW 1
- { "mmdf", 0 },
-#define VERSIONSW 2
+#define VERSIONSW 0
{ "version", 0 },
-#define HELPSW 3
+#define HELPSW 1
{ "help", 0 },
{ NULL, 0 }
};
-/*
-** default format in which to save messages
-*/
-static int mbx_style = MBOX_FORMAT;
-
int
main(int argc, char **argv)
#ifdef LOCALE
setlocale(LC_ALL, "");
#endif
- invo_name = r1bindex(argv[0], '/');
+ invo_name = mhbasename(argv[0]);
/* read user profile/context */
context_read();
- mts_init(invo_name);
arguments = getarguments(invo_name, argc, argv, 1);
argp = arguments;
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 [switches] file",
- invo_name);
- print_help(buf, switches, 1);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
-
- case MBOXSW:
- mbx_style = MBOX_FORMAT;
- continue;
- case MMDFSW:
- mbx_style = MMDF_FORMAT;
- continue;
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ done(1);
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf),
+ "%s [switches] file",
+ invo_name);
+ print_help(buf, switches, 1);
+ done(1);
+ case VERSIONSW:
+ print_version(invo_name);
+ done(1);
}
}
if (file)
rewind(stdin);
/* open and lock the file */
- if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
+ if ((md = mbx_open(file, getuid(), getgid(), m_gmprot()))
== NOTOK)
done(RCV_MBX);
/* append the message */
- if (mbx_copy(file, mbx_style, md, fileno(stdin), 1, NULL, 0)
- == NOTOK) {
+ if (mbx_copy(file, md, fileno(stdin), 0) == NOTOK) {
mbx_close(file, md);
done(RCV_MBX);
}