projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make -volume switch actually work (it always got overridden).
[mmh]
/
uip
/
mhparse.c
diff --git
a/uip/mhparse.c
b/uip/mhparse.c
index
86c16a9
..
d38f251
100644
(file)
--- a/
uip/mhparse.c
+++ b/
uip/mhparse.c
@@
-18,11
+18,6
@@
#include <h/mhparse.h>
#include <h/utils.h>
#include <h/mhparse.h>
#include <h/utils.h>
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
-
extern int debugsw;
extern int endian; /* mhmisc.c */
extern int debugsw;
extern int endian; /* mhmisc.c */
@@
-2472,7
+2467,7
@@
openFTP(CT ct, char **file)
CE ce;
static char *username = NULL;
static char *password = NULL;
CE ce;
static char *username = NULL;
static char *password = NULL;
- int child_id, i, vecp;
+ int child_id, vecp;
char *vec[9];
e = ct->c_ctexbody;
char *vec[9];
e = ct->c_ctexbody;
@@
-2598,9
+2593,7
@@
openFTP(CT ct, char **file)
fflush(stdout);
fflush(stdout);
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep(5);
- switch (child_id) {
+ switch (child_id = fork()) {
case NOTOK:
adios("fork", "unable to");
/* NOTREACHED */
case NOTOK:
adios("fork", "unable to");
/* NOTREACHED */
@@
-2674,7
+2667,7
@@
InitMail(CT ct)
static int
openMail(CT ct, char **file)
{
static int
openMail(CT ct, char **file)
{
- int child_id, fd, i, vecp;
+ int child_id, fd, vecp;
int len, buflen;
char *bp, buffer[BUFSIZ], *vec[7];
struct exbody *e = ct->c_ctexbody;
int len, buflen;
char *bp, buffer[BUFSIZ], *vec[7];
struct exbody *e = ct->c_ctexbody;
@@
-2726,7
+2719,7
@@
openMail(CT ct, char **file)
return NOTOK;
vecp = 0;
return NOTOK;
vecp = 0;
- vec[vecp++] = mhbasename(mailproc);
+ vec[vecp++] = "mhmail";
vec[vecp++] = e->eb_server;
vec[vecp++] = "-subject";
vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";
vec[vecp++] = e->eb_server;
vec[vecp++] = "-subject";
vec[vecp++] = e->eb_subject ? e->eb_subject : "mail-server request";
@@
-2734,17
+2727,15
@@
openMail(CT ct, char **file)
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
vec[vecp++] = e->eb_body;
vec[vecp] = NULL;
- for (i = 0; (child_id = fork()) == NOTOK && i < 5; i++)
- sleep(5);
- switch (child_id) {
+ switch (child_id = fork()) {
case NOTOK:
advise("fork", "unable to");
return NOTOK;
case OK:
case NOTOK:
advise("fork", "unable to");
return NOTOK;
case OK:
- execvp(mailproc, vec);
+ execvp(*vec, vec);
fprintf(stderr, "unable to exec ");
fprintf(stderr, "unable to exec ");
- perror(mailproc);
+ perror(*vec);
_exit(-1);
/* NOTREACHED */
_exit(-1);
/* NOTREACHED */