projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated message, as `install-mh' had been replaced by `mmh'.
[mmh]
/
uip
/
whatnow.c
diff --git
a/uip/whatnow.c
b/uip/whatnow.c
index
761fea1
..
168384f
100644
(file)
--- a/
uip/whatnow.c
+++ b/
uip/whatnow.c
@@
-220,7
+220,7
@@
main(int argc, char **argv)
/* display the msg being replied to or distributed */
if (msgnam) {
snprintf(buf, sizeof buf, "%s '%s'",
/* display the msg being replied to or distributed */
if (msgnam) {
snprintf(buf, sizeof buf, "%s '%s'",
- lproc, msgnam);
+ listproc, msgnam);
system(buf);
} else {
advise(NULL, "no alternate message to display");
system(buf);
} else {
advise(NULL, "no alternate message to display");
@@
-238,7
+238,7
@@
main(int argc, char **argv)
case LISTSW:
/* display the draft file */
case LISTSW:
/* display the draft file */
- snprintf(buf, sizeof buf, "%s '%s'", lproc, drft);
+ snprintf(buf, sizeof buf, "%s '%s'", listproc, drft);
system(buf);
break;
system(buf);
break;
@@
-622,10
+622,9
@@
editfile(char **ed, char **arg, char *file, int use, struct msgs *mp,
if ((cp = context_find(cp)) != NULL)
*ed = cp;
}
if ((cp = context_find(cp)) != NULL)
*ed = cp;
}
- } else {
+ } else if (!*ed) {
/* set initial editor */
/* set initial editor */
- if (*ed == NULL && (*ed = context_find("editor")) == NULL)
- *ed = defaulteditor;
+ *ed = defaulteditor;
}
if (altmsg) {
}
if (altmsg) {
@@
-770,15
+769,13
@@
static int
sendfile(char **arg, char *file, int pushsw)
{
pid_t child_id;
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);
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 */
case NOTOK:
advise(NULL, "unable to fork, so sending directly...");
/* fall */
@@
-793,9
+790,9
@@
sendfile(char **arg, char *file, int pushsw)
vec[vecp++] = file;
vec[vecp] = NULL;
vec[vecp++] = file;
vec[vecp] = NULL;
- execvp(sendproc, vec);
+ execvp("send", vec);
fprintf(stderr, "unable to exec ");
fprintf(stderr, "unable to exec ");
- perror(sendproc);
+ perror("send");
_exit(-1);
default:
_exit(-1);
default: