fmt_scan(): Avoid undefined behaviour from overlapping strncpy(3).

[nmh] / sbr / push.c

diff --git a/sbr/push.c b/sbr/push.c
index b4e3f4983f2297540f5494f797377bbdb22c3775..5417f39047dbb4ee37e0b93cce31f41020981eec 100644 (file)
--- a/sbr/push.c
+++ b/sbr/push.c
@@ -1,29 +1,28 @@
-
-/*
- * push.c -- push a fork into the background
+/* push.c -- push a fork into the background

  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
  */
 

-#include <h/mh.h>
-#include <h/signals.h>
+#include "h/mh.h"
+#include "push.h"
+#include "error.h"
+#include "h/signals.h"
+#include "h/done.h"
+#include "m_mktemp.h"

 
 
 void
 push(void)
 {
     pid_t pid;
 
 
 void
 push(void)
 {
     pid_t pid;

-    int i;
-
-    for (i = 0; (pid = fork()) == -1 && i < 5; i++)
-       sleep (5);

 
 

+    pid = fork();

     switch (pid) {
        case -1:
            /* fork error */
     switch (pid) {
        case -1:
            /* fork error */

-           advise (NULL, "unable to fork, so can't push...");
+           inform("unable to fork, so can't push...");

            break;
 
        case 0:
            break;
 
        case 0:


@@ -37,8 +36,15 @@ push(void)
            SIGNAL (SIGTTIN, SIG_IGN);
            SIGNAL (SIGTTOU, SIG_IGN);
 #endif
            SIGNAL (SIGTTIN, SIG_IGN);
            SIGNAL (SIGTTOU, SIG_IGN);
 #endif

-           freopen ("/dev/null", "r", stdin);
-           freopen ("/dev/null", "w", stdout);
+
+           unregister_for_removal(0);
+
+           if (freopen ("/dev/null", "r", stdin) == NULL) {
+               advise ("stdin", "freopen");
+            }
+           if (freopen ("/dev/null", "w", stdout) == NULL) {
+               advise ("stdout", "freopen");
+            }

            break;
 
        default:
            break;
 
        default:


@@ -46,4 +52,3 @@ push(void)
            done (0);
     }
 }
            done (0);
     }
 }

-