X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=common%2Fdumprmt.c;h=12d60fca7408197dc3bec5d363e85d68a484ec0a;hb=5bbb0926a5e765575c199573ea3b3d0f5ecd99a2;hp=4f6b3c790e674f224362dd704e39be4631efdf2f;hpb=2c168f5fb53e1e1d3905bdd7fac64497e0ab3875;p=dump.git

diff --git a/common/dumprmt.c b/common/dumprmt.c
index 4f6b3c7..12d60fc 100644
--- a/common/dumprmt.c
+++ b/common/dumprmt.c
@@ -2,7 +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@noos.fr>, 1999-2000
+ *	Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
  */
 
 /*-
@@ -40,30 +41,30 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: dumprmt.c,v 1.12 2000/11/03 18:28:58 stelian Exp $";
+	"$Id: dumprmt.c,v 1.17 2001/06/18 10:58:28 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>
@@ -316,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"));