X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=common%2Fdumprmt.c;h=941f7dd74163b2fad6d670dc3c2a6815bad8d1d8;hp=31eb63fc8b550ccd27202848398d834e9d6181f9;hb=e46507f206f7adcb8d2e218963d2115236e86604;hpb=d6967896bc4e18f9b4359a2ef5be5c0f1bcc456a

diff --git a/common/dumprmt.c b/common/dumprmt.c
index 31eb63f..941f7dd 100644
--- a/common/dumprmt.c
+++ b/common/dumprmt.c
@@ -41,31 +41,30 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.15 2000/12/21 11:14:53 stelian Exp $";
+	"$Id: dumprmt.c,v 1.18 2001/08/13 16:17:52 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
-#ifdef __linux__
-#include <sys/types.h>
-#include <linux/types.h>
-#endif
 #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>
@@ -90,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
@@ -318,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"));