release/3.0.0

5 files changed, 30 insertions, 32 deletions

diff --git a/sbin/restore/dirs.c b/sbin/restore/dirs.c
index db68d66a470d3..15d7b067909e8 100644
--- a/sbin/restore/dirs.c
+++ b/sbin/restore/dirs.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)dirs.c	8.7 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: dirs.c,v 1.12 1998/07/28 06:20:05 charnier Exp $";
+	"$Id$";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -71,8 +71,8 @@ static const char rcsid[] =
 struct inotab {
 	struct	inotab *t_next;
 	ino_t	t_ino;
-	int32_t	t_seekpt;
-	int32_t	t_size;
+	long	t_seekpt;
+	long	t_size;
 };
 static struct inotab *inotab[HASHSIZE];
 
@@ -95,8 +95,8 @@ struct modeinfo {
 #define DIRBLKSIZ 1024
 struct rstdirdesc {
 	int	dd_fd;
-	int32_t	dd_loc;
-	int32_t	dd_size;
+	long	dd_loc;
+	long	dd_size;
 	char	dd_buf[DIRBLKSIZ];
 };
 
diff --git a/sbin/restore/interactive.c b/sbin/restore/interactive.c
index 1d6424db239a3..763ca13a3fee2 100644
--- a/sbin/restore/interactive.c
+++ b/sbin/restore/interactive.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)interactive.c	8.5 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: interactive.c,v 1.6 1998/09/17 20:18:11 imp Exp $";
+	"$Id: interactive.c,v 1.5 1998/07/28 06:20:08 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -343,8 +343,7 @@ getcmd(curdir, cmd, name, size, ap)
 	 * If no argument, use curdir as the default.
 	 */
 	if (*cp == '\0') {
-		(void) strncpy(name, curdir, size);
-		name[size - 1] = '\0';
+		(void) strcpy(name, curdir);
 		return;
 	}
 	nextarg = cp;
@@ -378,8 +377,7 @@ getnext:
 	ap->argcnt = ap->glob.gl_pathc;
 
 retnext:
-	strncpy(name, ap->glob.gl_pathv[ap->glob.gl_pathc - ap->argcnt], size);
-	name[size - 1] = '\0';
+	strcpy(name, ap->glob.gl_pathv[ap->glob.gl_pathc - ap->argcnt]);
 	if (--ap->argcnt == 0) {
 		ap->freeglob = 0;
 		globfree(&ap->glob);
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index 9c9159614227f..2bf0722058623 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)restore.8	8.4 (Berkeley) 5/1/95
-.\"	$Id: restore.8,v 1.14 1998/09/22 10:05:27 roberto Exp $
+.\"	$Id: restore.8,v 1.13 1998/07/28 06:20:11 charnier Exp $
 .\"
 .Dd May 1, 1995
 .Dt RESTORE 8
@@ -281,7 +281,7 @@ may be a special device file
 like
 .Pa /dev/rmt12
 (a tape drive),
-.Pa /dev/rda1c
+.Pa /dev/rsd1c
 (a disk drive),
 an ordinary file,
 or
diff --git a/sbin/restore/symtab.c b/sbin/restore/symtab.c
index 795669ca74e6d..f9a5422ab85b3 100644
--- a/sbin/restore/symtab.c
+++ b/sbin/restore/symtab.c
@@ -36,7 +36,7 @@
 static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif
 static const char rcsid[] =
-	"$Id: symtab.c,v 1.5 1998/07/28 06:20:13 charnier Exp $";
+	"$Id$";
 #endif /* not lint */
 
 /*
@@ -440,13 +440,13 @@ freename(name)
  * Useful quantities placed at the end of a dumped symbol table.
  */
 struct symtableheader {
-	int32_t	volno;
-	int32_t	stringsize;
-	int32_t	entrytblsize;
+	long	volno;
+	long	stringsize;
+	long	entrytblsize;
 	time_t	dumptime;
 	time_t	dumpdate;
 	ino_t	maxino;
-	int32_t	ntrec;
+	long	ntrec;
 };
 
 /*
diff --git a/sbin/restore/tape.c b/sbin/restore/tape.c
index 80a14a864e1a1..03ddd15aa2bc0 100644
--- a/sbin/restore/tape.c
+++ b/sbin/restore/tape.c
@@ -41,7 +41,7 @@
 static char sccsid[] = "@(#)tape.c	8.9 (Berkeley) 5/1/95";
 #endif
 static const char rcsid[] =
-	"$Id: tape.c,v 1.14 1998/07/28 18:50:01 imp Exp $";
+	"$Id: tape.c,v 1.13 1998/07/28 06:20:15 charnier Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1009,32 +1009,32 @@ gethead(buf)
 	long i;
 	union {
 		quad_t	qval;
-		int32_t	val[2];
+		long	val[2];
 	} qcvt;
 	union u_ospcl {
 		char dummy[TP_BSIZE];
 		struct	s_ospcl {
-			int32_t	c_type;
-			int32_t	c_date;
-			int32_t	c_ddate;
-			int32_t	c_volume;
-			int32_t	c_tapea;
+			long	c_type;
+			long	c_date;
+			long	c_ddate;
+			long	c_volume;
+			long	c_tapea;
 			u_short	c_inumber;
-			int32_t	c_magic;
-			int32_t	c_checksum;
+			long	c_magic;
+			long	c_checksum;
 			struct odinode {
 				unsigned short odi_mode;
 				u_short	odi_nlink;
 				u_short	odi_uid;
 				u_short	odi_gid;
-				int32_t	odi_size;
-				int32_t	odi_rdev;
+				long	odi_size;
+				long	odi_rdev;
 				char	odi_addr[36];
-				int32_t	odi_atime;
-				int32_t	odi_mtime;
-				int32_t	odi_ctime;
+				long	odi_atime;
+				long	odi_mtime;
+				long	odi_ctime;
 			} c_dinode;
-			int32_t	c_count;
+			long	c_count;
 			char	c_addr[256];
 		} s_ospcl;
 	} u_ospcl;