On today's systems fork() will hardly fail, thus removed the fork retry loops.

[mmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index e05dddf..fe9a626 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -45,9 +45,6 @@ char *formsw = NULL;
 pid_t xpid = 0;
 
 
-/* termsbr.c */
-int SOprintf(char *, ...);
-
 /* mhparse.c */
 int pidcheck(int);
 
@@ -189,7 +186,7 @@ static void
 DisplayMsgHeader(CT ct, char *form)
 {
        pid_t child_id;
-       int i, vecp;
+       int vecp;
        char *vec[8];
 
        vecp = 0;
@@ -208,10 +205,7 @@ DisplayMsgHeader(CT ct, char *form)
 
        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 */
@@ -522,7 +516,6 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked,
        char *buffer, int fd, int xlist, int xstdin, int xtty)
 {
        pid_t child_id;
-       int i;
        char *vec[4], exec[BUFSIZ + sizeof "exec "];
 
        if (debugsw || cracked) {
@@ -562,9 +555,7 @@ show_content_aux2(CT ct, int serial, int alternate, char *cracked,
 
        fflush(stdout);
 
-       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");
                (*ct->c_ceclosefnx) (ct);
@@ -625,8 +616,7 @@ show_text(CT ct, int serial, int alternate)
        */
        if (!alternate || ct->c_subtype == TEXT_PLAIN) {
                snprintf(buffer, sizeof(buffer), "%%p%s '%%F'",
-                               progsw ? progsw : moreproc && *moreproc ?
-                               moreproc : "more");
+                               progsw ? progsw : moreproc);
                cp = (ct->c_showproc = getcpy(buffer));
                return show_content_aux(ct, serial, alternate, cp, NULL);
        }