static struct swit whatnowswitches[] = {
#define EDITRSW 0
{ "editor editor", 0 },
-#define NEDITSW 1
- { "noedit", 0 },
-#define PRMPTSW 2
+#define PRMPTSW 1
{ "prompt string", 4 },
-#define VERSIONSW 3
- { "version", 0 },
-#define HELPSW 4
+#define VERSIONSW 2
+ { "Version", 0 },
+#define HELPSW 3
{ "help", 0 },
{ NULL, 0 }
};
{ "list", 0 },
#define SENDSW 4
{ "send [<switches>]", 0 },
-#define PUSHSW 5
- { "push [<switches>]", 0 },
-#define QUITSW 6
+#define QUITSW 5
{ "quit", 0 },
-#define DELETESW 7
+#define DELETESW 6
{ "delete", 0 },
-#define CDCMDSW 8
+#define CDCMDSW 7
{ "cd [directory]", 0 },
-#define PWDCMDSW 9
+#define PWDCMDSW 8
{ "pwd", 0 },
-#define LSCMDSW 10
+#define LSCMDSW 9
{ "ls", 0 },
-#define ATTACHCMDSW 11
+#define ATTACHCMDSW 10
{ "attach", 0 },
-#define DETACHCMDSW 12
+#define DETACHCMDSW 11
{ "detach [-n]", 0 },
-#define ALISTCMDSW 13
+#define ALISTCMDSW 12
{ "alist", 0 },
{ NULL, 0 }
};
** static prototypes
*/
static int editfile(char **, char **, char *, int, struct msgs *,
- char *, char *, int);
-static int sendfile(char **, char *, int);
+ char *, char *);
+static int sendfile(char **, char *);
+static int refile(char **, char *);
static int removefile(char *);
static void writelscmd(char *, int, char **);
static void writesomecmd(char *buf, int bufsz, char *cmd, char *trailcmd, char **argp);
int
main(int argc, char **argv)
{
- int nedit = 0, use = 0;
+ int use = 0;
char *cp;
char *ed = NULL, *drft = NULL, *msgnam = NULL;
char buf[BUFSIZ], prompt[BUFSIZ];
if (!(ed = *argp++) || *ed == '-')
adios(NULL, "missing argument to %s",
argp[-2]);
- nedit = 0;
- continue;
- case NEDITSW:
- nedit++;
continue;
case PRMPTSW:
if ((cp = getenv("mhuse")) && *cp)
use = atoi(cp);
- if (!ed && (!(ed = getenv("mheditor")) || !*ed)) {
- ed = NULL;
- nedit++;
+ if (!ed && !(ed = getenv("mheditor"))) {
+ ed = ""; /* Don't initially edit the draft */
}
- /* start editing the draft, unless -noedit was given */
- if (!nedit && editfile(&ed, NULL, drft, use, NULL, msgnam, NULL, 1)
- < 0)
- done(1);
+ /* start editing the draft, unless editor is the empty string */
+ if (*ed) {
+ if (editfile(&ed, NULL, drft, use, NULL, msgnam, NULL) <0) {
+ if (!use) {
+ unlink(drft);
+ }
+ advise(NULL, "Try again.");
+ done(1);
+ }
+ }
snprintf(prompt, sizeof(prompt), myprompt, invo_name);
for (;;) {
/* Call an editor on the draft file */
if (*++argp)
ed = *argp++;
- if (editfile(&ed, argp, drft, NOUSE, NULL,
- msgnam, NULL, 1) == NOTOK)
- done(1);
+ editfile(&ed, argp, drft, NOUSE, NULL, msgnam, NULL);
break;
case LISTSW:
removefile(drft);
done(1);
- case PUSHSW:
- /* Send draft in background */
- if (sendfile(++argp, drft, 1))
- done(1);
- break;
-
case SENDSW:
/* Send draft */
- sendfile(++argp, drft, 0);
+ sendfile(++argp, drft);
break;
case REFILEOPT:
/* Refile the draft */
- if (refile(++argp, drft) == 0)
+ if (refile(++argp, drft) == 0) {
done(0);
+ }
break;
case CDCMDSW:
** EDIT
*/
-static int reedit = 0; /* have we been here before? */
static char *edsave = NULL; /* the editor we used previously */
static int
editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
- char *altmsg, char *cwd, int save_editor)
+ char *altmsg, char *cwd)
{
int pid, status, vecp;
char altpath[BUFSIZ], linkpath[BUFSIZ];
int slinked = 0;
#endif /* HAVE_LSTAT */
- /* Was there a previous edit session? */
- if (reedit) {
- if (!*ed) { /* no explicit editor */
- *ed = edsave; /* so use the previous one */
+ if (!*ed || !**ed) {
+ /* We have no explicit editor. */
+ if (edsave) {
+ /* Use the previous editor ... */
+ *ed = edsave;
if (!(cp = mhbasename(*ed)))
cp = *ed;
- /* unless we've specified it via "editor-next" */
+ /* but prefer one specified via "editor-next" */
cp = concat(cp, "-next", NULL);
if ((cp = context_find(cp)))
*ed = cp;
+ } else {
+ /* set initial editor */
+ *ed = defaulteditor;
}
- } else if (!*ed) {
- /* set initial editor */
- *ed = defaulteditor;
}
if (altmsg) {
vec[vecp] = NULL;
execvp(*ed, vec);
- fprintf(stderr, "unable to exec ");
+ fprintf(stderr, "%s: unable to exec ", invo_name);
perror(*ed);
_exit(-1);
default:
if ((status = pidwait(pid, NOTOK))) {
- if (((status & 0xff00) != 0xff00) &&
- (!reedit || (status & 0x00ff))) {
- if (!use && (status & 0xff00) && (rename(file, cp = m_backup(file)) != NOTOK)) {
- advise(NULL, "problems with edit--draft left in %s", cp);
- } else {
- advise(NULL, "problems with edit--%s preserved", file);
- }
+ if ((status & 0xff00) == 0xff00) {
+ /* cmd not found or pidwait() failed */
+ status = -1;
+ break;
+ }
+ if (status & 0x00ff) {
+ /* terminated by signal */
+ advise(NULL, "%s terminated by signal %d",
+ *ed, status & 0x7f);
+ } else {
+ /* failure exit */
+ advise(NULL, "%s exited with return code %d",
+ *ed, (status & 0xff00) >> 8);
}
- status = -2; /* maybe "reedit ? -2 : -1"? */
+ status = -1;
break;
}
- reedit++;
#ifdef HAVE_LSTAT
if (altmsg && mp && !is_readonly(mp) && (slinked ?
lstat (linkpath, &st) != NOTOK &&
#endif /* HAVE_LSTAT */
}
- /* normally, we remember which editor we used */
- if (save_editor)
- edsave = getcpy(*ed);
+ /* remember which editor we used */
+ edsave = getcpy(*ed);
*ed = NULL;
- if (altmsg)
+ if (altmsg) {
unlink(linkpath);
+ }
return status;
}
*/
static int
-sendfile(char **arg, char *file, int pushsw)
+sendfile(char **arg, char *file)
{
pid_t child_id;
int vecp;
case OK:
vecp = 0;
vec[vecp++] = invo_name;
- if (pushsw)
- vec[vecp++] = "-push";
if (arg)
while (*arg)
vec[vecp++] = *arg++;
vec[vecp] = NULL;
execvp("send", vec);
- fprintf(stderr, "unable to exec ");
+ fprintf(stderr, "%s: unable to exec ", invo_name);
perror("send");
_exit(-1);
/*
+** refile msg into another folder
+*/
+static int
+refile(char **arg, char *file)
+{
+ pid_t pid;
+ register int vecp;
+ char *vec[MAXARGS];
+
+ vecp = 0;
+ vec[vecp++] = "refile";
+ vec[vecp++] = "-nolink"; /* override bad .mh_profile defaults */
+ vec[vecp++] = "-file";
+ vec[vecp++] = file;
+
+ while (arg && *arg) {
+ vec[vecp++] = *arg++;
+ }
+ vec[vecp] = NULL;
+
+ context_save(); /* save the context file */
+ fflush(stdout);
+
+ switch (pid = fork()) {
+ case -1:
+ advise("fork", "unable to");
+ return -1;
+
+ case 0:
+ execvp(*vec, vec);
+ fprintf(stderr, "%s: unable to exec ", invo_name);
+ perror(*vec);
+ _exit(-1);
+
+ default:
+ return (pidwait(pid, -1));
+ }
+}
+
+
+/*
** Remove the draft file
*/
projects / mmh / blobdiff