static struct swit switches[] = {
#define FILESW 0
{ "file name", 0 },
-#define MBOXSW 1
- { "mbox", 0 },
-#define MMDFSW 2
- { "mmdf", 0 },
-#define VERSIONSW 3
+#define VERSIONSW 1
{ "version", 0 },
-#define HELPSW 4
+#define HELPSW 2
{ "help", 0 },
{ NULL, 0 }
};
static int md = NOTOK;
-static int mbx_style = MBOX_FORMAT;
-static int mapping = 0;
static void mbxclose_done(int) NORETURN;
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 [+folder] [msgs] [switches]", invo_name);
- print_help(buf, switches, 1);
- done(1);
- case VERSIONSW:
- print_version(invo_name);
- done(1);
-
- case FILESW:
- if (file)
- adios(NULL, "only one file at a time!");
- if (!(file = *argp++) || *file == '-')
- adios(NULL, "missing argument to %s", argp[-2]);
- continue;
-
- case MBOXSW:
- mbx_style = MBOX_FORMAT;
- mapping = 0;
- continue;
- case MMDFSW:
- mbx_style = MMDF_FORMAT;
- mapping = 1;
- continue;
+ case AMBIGSW:
+ ambigsw(cp, switches);
+ done(1);
+ case UNKWNSW:
+ adios(NULL, "-%s unknown", cp);
+
+ case HELPSW:
+ snprintf(buf, sizeof(buf), "%s [+folder] [msgs] [switches]", invo_name);
+ print_help(buf, switches, 1);
+ done(1);
+ case VERSIONSW:
+ print_version(invo_name);
+ done(1);
+
+ case FILESW:
+ if (file)
+ adios(NULL, "only one file at a time!");
+ if (!(file = *argp++) || *file == '-')
+ adios(NULL, "missing argument to %s",
+ argp[-2]);
+ continue;
}
}
if (*cp == '+' || *cp == '@') {
if (folder)
adios(NULL, "only one folder at a time!");
- folder = pluspath(cp);
+ folder = getcpy(expandfol(cp));
} else
app_msgarg(&msgs, cp);
}
if (!file)
file = "./msgbox";
- file = path(file, TFILE);
+ file = getcpy(expanddir(file));
/*
** Check if file to be created (or appended to)
/* default is to pack whole folder */
if (!msgs.size)
- app_msgarg(&msgs, "all");
+ app_msgarg(&msgs, seq_all);
if (!folder)
- folder = getfolder(FCUR);
- maildir = m_maildir(folder);
+ folder = getcurfol();
+ maildir = toabsdir(folder);
if (chdir(maildir) == NOTOK)
adios(maildir, "unable to change directory to ");
seq_setprev(mp); /* set the previous-sequence */
/* open and lock new maildrop file */
- if ((md = mbx_open(file, mbx_style, getuid(), getgid(), m_gmprot()))
+ if ((md = mbx_open(file, getuid(), getgid(), m_gmprot()))
== NOTOK)
adios(file, "unable to open");
break;
}
- if (mbx_copy(file, mbx_style, md, fd, mapping, NULL, 1)
- == NOTOK)
+ if (mbx_copy(file, md, fd, 1) == NOTOK)
adios(file, "error writing to file");
close(fd);
/* close and unlock maildrop file */
mbx_close(file, md);
- context_replace(pfolder, folder); /* update current folder */
+ context_replace(curfolder, folder); /* update current folder */
if (mp->hghsel != mp->curmsg)
seq_setcur(mp, mp->lowsel);
seq_save(mp);