#define REFILEOPT 1
{ "refile [<switches>] +folder", 0 },
#define DISPSW 2
- { "display [<switches>]", 0 },
+ { "display", 0 },
#define LISTSW 3
- { "list [<switches>]", 0 },
+ { "list", 0 },
#define SENDSW 4
{ "send [<switches>]", 0 },
#define PUSHSW 5
switch (smatch(*argp, aleqs)) {
case DISPSW:
/* display the msg being replied to or distributed */
- if (msgnam)
- showfile(++argp, msgnam);
- else
+ if (msgnam) {
+ snprintf(buf, sizeof buf, "%s '%s'",
+ lproc, msgnam);
+ system(buf);
+ } else {
advise(NULL, "no alternate message to display");
+ }
break;
case EDITSW:
case LISTSW:
/* display the draft file */
- showfile(++argp, drft);
+ snprintf(buf, sizeof buf, "%s '%s'", lproc, drft);
+ system(buf);
break;
case QUITSW:
if (*shell == '/')
annotate(drft, attach_hdr,
- shell, 1, 0,
- -2, 1);
+ shell, 0,
+ -2, 1, 0);
else {
sprintf(file, "%s/%s", cwd,
shell);
annotate(drft, attach_hdr,
- file, 1, 0,
- -2, 1);
+ file, 0,
+ -2, 1, 0);
}
}
if (**arguments != '\0') {
n = atoi(*arguments);
annotate(drft, attach_hdr,
- NULL, 1, 0,
- n, 1);
+ NULL, 0,
+ n, 1, 0);
for (argp = arguments + 1; *argp != NULL; argp++) {
if (atoi(*argp) > n) {
!= NULL) {
*(strchr(shell, '\n')) = '\0';
annotate(drft, attach_hdr, shell,
- 1, 0, 0, 1);
+ 0, 0, 1, 0);
}
pclose(f);
} else {
sendfile(char **arg, char *file, int pushsw)
{
pid_t child_id;
- int i, vecp;
+ int vecp;
char *vec[MAXARGS];
context_save(); /* save the context file */
fflush(stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep(5);
- switch (child_id) {
+ switch (child_id = fork()) {
case NOTOK:
advise(NULL, "unable to fork, so sending directly...");
/* fall */