if (*shell == '/')
annotate(drft, attach_hdr,
shell, 0,
- -2, 1);
+ -2, 1, 0);
else {
sprintf(file, "%s/%s", cwd,
shell);
annotate(drft, attach_hdr,
file, 0,
- -2, 1);
+ -2, 1, 0);
}
}
n = atoi(*arguments);
annotate(drft, attach_hdr,
NULL, 0,
- n, 1);
+ n, 1, 0);
for (argp = arguments + 1; *argp != NULL; argp++) {
if (atoi(*argp) > n) {
!= NULL) {
*(strchr(shell, '\n')) = '\0';
annotate(drft, attach_hdr, shell,
- 0, 0, 1);
+ 0, 0, 1, 0);
}
pclose(f);
} else {
if ((cp = context_find(cp)) != NULL)
*ed = cp;
}
- } else {
+ } else if (!*ed) {
/* set initial editor */
- if (*ed == NULL && (*ed = context_find("editor")) == NULL)
- *ed = defaulteditor;
+ *ed = defaulteditor;
}
if (altmsg) {
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 */