Discard newline when reading the tape path entered by the operator in restore.

[dump.git] / restore / tape.c

diff --git a/restore/tape.c b/restore/tape.c
index d7e8ed635be54041c6872d5512e64eca52d861ea..f7a8a10211379408d6e58d4b5d2f5668b911fd78 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: tape.c,v 1.39 2001/05/26 11:04:46 stelian Exp $";
+       "$Id: tape.c,v 1.41 2001/07/18 11:46:31 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -67,7 +67,11 @@ static const char rcsid[] =
 #ifdef __linux__
 #include <sys/time.h>
 #include <time.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */
@@ -448,8 +452,11 @@ again:
                        return;
                }
                if (buf[0] != '\n') {
+                       char *pos;
                        (void) strncpy(magtape, buf, sizeof(magtape));
                        magtape[sizeof(magtape) - 1] = '\0';
+                       if ((pos = strchr(magtape, '\n'))) 
+                               magtape[pos - magtape] = '\0';
                }
        }
 #ifdef RRESTORE