Waitpid problem with external RSH.

[dump.git] / dump / tape.c

diff --git a/dump/tape.c b/dump/tape.c
index 4aaffb3271e62e17b76a76c6aefe20ef5ba314f1..1b28c41e6e6307a9a9f662d36fc243c0b28045c3 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -2,8 +2,7 @@
  *     Ported to Linux's Second Extended File System as part of the
  *     dump and restore backup suit
  *     Remy Card <card@Linux.EU.Org>, 1994-1997
- *      Stelian Pop <pop@cybercable.fr>, 1999 
- *
+ *     Stelian Pop <pop@cybercable.fr>, 1999 
  */
 
 /*-
@@ -37,10 +36,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $Id: tape.c,v 1.5 1999/10/11 13:31:11 stelian Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+       "$Id: tape.c,v 1.7 1999/11/02 09:35:56 tiniou Exp $";
+#endif /* not lint */
+
 #ifdef __linux__
 #include <sys/types.h>
 #include <linux/types.h>
@@ -93,6 +95,7 @@ extern        int ntrec;              /* blocking factor on tape */
 extern int cartridge;
 extern char *host;
 char   *nexttape;
+extern  pid_t rshpid;
 
 static ssize_t atomic_read __P((int, void *, size_t));
 static ssize_t atomic_write __P((int, const void *, size_t));
@@ -659,7 +662,8 @@ restore_check_point:
                        tapeno+1, parentpid, childpid);
 #endif /* TDEBUG */
                while ((waitpid = wait(&status)) != childpid)
-                       msg("Parent %d waiting for child %d has another child %d return\n",
+                       if (waitpid != rshpid)
+                               msg("Parent %d waiting for child %d has another child %d return\n",
                                parentpid, childpid, waitpid);
                if (status & 0xFF) {
                        msg("Child %d returns LOB status %o\n",