projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhmail: Don't invoke inc when called without arguments.
[mmh]
/
uip
/
whatnow.c
diff --git
a/uip/whatnow.c
b/uip/whatnow.c
index
761fea1
..
bd1a3d5
100644
(file)
--- a/
uip/whatnow.c
+++ b/
uip/whatnow.c
@@
-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 */