X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=common%2Fdumprmt.c;h=69ada17ac0980df2139c6f6a1ccfa7604db4af89;hb=4095abc031a4b91bd6d056ff2b6cf9e7cd568afc;hp=0444343d558b2cb9a531058f7247aa340d8cc6b9;hpb=0a99352128efc4af44160eee69e8990686bf9ad5;p=dump.git

diff --git a/common/dumprmt.c b/common/dumprmt.c
index 0444343..69ada17 100644
--- a/common/dumprmt.c
+++ b/common/dumprmt.c
@@ -2,8 +2,8 @@
  *	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-2000
- *	Stelian Pop <pop@cybercable.fr> - Alcôve <www.alcove.fr>, 2000
+ *	Stelian Pop <stelian@popies.net>, 1999-2000
+ *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  */
 
 /*-
@@ -41,30 +41,30 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.13 2000/11/10 14:42:24 stelian Exp $";
+	"$Id: dumprmt.c,v 1.22 2002/07/19 14:57:39 stelian Exp $";
 #endif /* not lint */
 
-#ifdef __linux__
-#include <sys/types.h>
-#include <linux/types.h>
-#endif
+#include <config.h>
 #include <sys/param.h>
 #include <sys/mtio.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #ifdef __linux__
+#include <sys/types.h>
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <bsdcompat.h>
 #include <signal.h>
-#else
-#ifdef sunos
+#elif defined sunos
 #include <sys/vnode.h>
 
 #include <ufs/inode.h>
 #else
 #include <ufs/ufs/dinode.h>
 #endif
-#endif
 
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
@@ -89,8 +89,8 @@ static const char rcsid[] =
 #include <ext2fs/ext2fs.h>
 #endif
 
-#include "pathnames.h"
-#include "dump.h"
+#include <pathnames.h>
+#include "dump.h"	/* for X_STARTUP, X_ABORT etc */
 
 #define	TS_CLOSED	0
 #define	TS_OPEN		1
@@ -132,7 +132,7 @@ rmthost(const char *host)
 }
 
 static void
-rmtconnaborted(int signo)
+rmtconnaborted(UNUSED(int signo))
 {
 	msg("Lost connection to remote host.\n");
 	if (errfd != -1) {
@@ -161,8 +161,8 @@ rmtconnaborted(int signo)
 static int
 rmtgetconn(void)
 {
-	register char *cp;
-	register const char *rmt;
+	char *cp;
+	const char *rmt;
 	static struct servent *sp = NULL;
 	static struct passwd *pwd = NULL;
 	const char *tuser;
@@ -259,8 +259,8 @@ rmtgetconn(void)
 static int
 okname(const char *cp0)
 {
-	register const char *cp;
-	register int c;
+	const char *cp;
+	int c;
 
 	for (cp = cp0; *cp; cp++) {
 		c = *cp;
@@ -273,11 +273,11 @@ okname(const char *cp0)
 }
 
 int
-rmtopen(const char *tape, int mode)
+rmtopen(const char *tape, const char *mode)
 {
 	char buf[MAXPATHLEN];
 
-	(void)snprintf(buf, sizeof (buf), "O%s\n%d\n", tape, mode);
+	(void)snprintf(buf, sizeof (buf), "O%s\n%s\n", tape, mode);
 	rmtstate = TS_OPEN;
 	return (rmtcall(tape, buf));
 }
@@ -317,7 +317,7 @@ rmtwrite(const char *buf, size_t count)
 {
 	char line[30];
 
-	(void)snprintf(line, sizeof (line), "W%d\n", count);
+	(void)snprintf(line, sizeof (line), "W%ld\n", (long)count);
 	write(tormtape, line, strlen(line));
 	write(tormtape, buf, count);
 	return (rmtreply("write"));
@@ -337,13 +337,13 @@ struct	mtget mts;
 struct mtget *
 rmtstatus(void)
 {
-	register int i;
-	register char *cp;
+	int i;
+	char *cp;
 
 	if (rmtstate != TS_OPEN)
 		return (NULL);
 	rmtcall("status", "S\n");
-	for (i = 0, cp = (char *)&mts; i < sizeof(mts); i++)
+	for (i = 0, cp = (char *)&mts; i < (int)sizeof(mts); i++)
 		*cp++ = rmtgetb();
 	return (&mts);
 }
@@ -363,7 +363,7 @@ static int
 rmtcall(const char *cmd, const char *buf)
 {
 
-	if (write(tormtape, buf, strlen(buf)) != strlen(buf))
+	if (write(tormtape, buf, strlen(buf)) != (ssize_t)strlen(buf))
 		rmtconnaborted(0);
 	return (rmtreply(cmd));
 }
@@ -371,7 +371,7 @@ rmtcall(const char *cmd, const char *buf)
 static int
 rmtreply(const char *cmd)
 {
-	register char *cp;
+	char *cp;
 	char code[30], emsg[BUFSIZ];
 
 	rmtgets(code, sizeof (code));
@@ -410,7 +410,7 @@ rmtgetb(void)
 static void
 rmtgets(char *line, size_t len)
 {
-	register char *cp = line;
+	char *cp = line;
 
 	while (len > 1) {
 		*cp = rmtgetb();