{ "version", 0 },
#define HELPSW 8
{ "help", 0 },
-#define FILESW 9
- { "file file", -4 }, /* interface from msh */
{ NULL, 0 }
};
int anot = 0, nedit = 0;
int nwhat = 0, in, out;
char *cp, *cwd, *maildir, *msgnam;
- char *ed = NULL, *file = NULL, *folder = NULL;
+ char *ed = NULL, *folder = NULL;
char *form = NULL, *msg = NULL, buf[BUFSIZ], drft[BUFSIZ];
char **argp, **arguments;
struct msgs *mp = NULL;
- char *nfs;
+ char *fmtstr;
#ifdef LOCALE
setlocale(LC_ALL, "");
nwhat++;
continue;
- case FILESW:
- if (file)
- adios(NULL, "only one file at a time!");
- if (!(cp = *argp++) || *cp == '-')
- adios(NULL, "missing argument to %s",
- argp[-2]);
- file = getcpy(expanddir(cp));
- continue;
case FORMSW:
if (!(form = *argp++) || *form == '-')
adios(NULL, "missing argument to %s",
cwd = getcpy(pwd());
- if (file && (msg || folder))
- adios(NULL, "can't mix files and folders/msgs");
-
strncpy(drft, m_draft(seq_beyond), sizeof(drft));
if ((out = creat(drft, m_gmprot())) == NOTOK)
adios(drft, "unable to create");
- nfs = new_fs(form, distcomps);
- if (write(out, nfs, strlen(nfs)) != strlen(nfs)) {
+ fmtstr = new_fs(form, distcomps);
+ if (write(out, fmtstr, strlen(fmtstr)) != strlen(fmtstr)) {
adios(drft, "error writing");
}
close(out);
- if (file) {
- /*
- ** Dist a file
- */
- anot = 0; /* don't want to annotate a file */
- } else {
- /*
- ** Dist a message
- */
- if (!msg)
- msg = seq_cur;
- if (!folder)
- folder = getcurfol();
- maildir = toabsdir(folder);
-
- if (chdir(maildir) == NOTOK)
- adios(maildir, "unable to change directory to");
-
- /* read folder and create message structure */
- if (!(mp = folder_read(folder)))
- adios(NULL, "unable to read folder %s", folder);
-
- /* check for empty folder */
- if (mp->nummsg == 0)
- adios(NULL, "no messages in %s", folder);
-
- /* parse the message range/sequence/name and set SELECTED */
- if (!m_convert(mp, msg))
- done(1);
- seq_setprev(mp); /* set the previous-sequence */
-
- if (mp->numsel > 1)
- adios(NULL, "only one message at a time!");
- }
+ if (!msg)
+ msg = seq_cur;
+ if (!folder)
+ folder = getcurfol();
+ maildir = toabsdir(folder);
+
+ if (chdir(maildir) == NOTOK)
+ adios(maildir, "unable to change directory to");
- msgnam = file ? file : getcpy(m_name(mp->lowsel));
+ if (!(mp = folder_read(folder)))
+ adios(NULL, "unable to read folder %s", folder);
+
+ /* check for empty folder */
+ if (mp->nummsg == 0)
+ adios(NULL, "no messages in %s", folder);
+
+ /* parse the message range/sequence/name and set SELECTED */
+ if (!m_convert(mp, msg))
+ done(1);
+ seq_setprev(mp);
+
+ if (mp->numsel > 1)
+ adios(NULL, "only one message at a time!");
+
+ msgnam = getcpy(m_name(mp->lowsel));
if ((in = open(msgnam, O_RDONLY)) == NOTOK)
adios(msgnam, "unable to open message");
- if (!file) {
- context_replace(curfolder, folder); /* update current folder */
- seq_setcur(mp, mp->lowsel); /* update current message */
- seq_save(mp); /* synchronize sequences */
- context_save(); /* save the context file */
- }
+ context_replace(curfolder, folder);
+ seq_setcur(mp, mp->lowsel);
+ seq_save(mp); /* synchronize sequences */
+ context_save();
if (nwhat)
done(0);
- what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp, anot ? "Resent" : NULL,
- cwd);
+ what_now(ed, nedit, NOUSE, drft, msgnam, 1, mp,
+ anot ? "Resent" : NULL, cwd);
done(1);
return 1;
}