64bit and glibc 2.2.2 fixes.

diff --git a/CHANGES b/CHANGES
index 77d25eb49846177dbb0bfb2ef87e341c5479785a..13ac337e70afd443d3d8762e0d4c1733d789969f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.103 2001/02/21 16:16:00 stelian Exp $
+$Id: CHANGES,v 1.104 2001/02/22 10:57:39 stelian Exp $

 
 Changes between versions 0.4b21 and 0.4b22 (released ????????????????)
 ======================================================================
 
 Changes between versions 0.4b21 and 0.4b22 (released ????????????????)
 ======================================================================


@@ -12,7 +12,7 @@ Changes between versions 0.4b21 and 0.4b22 (released ????????????????)
        bug and providing a patch.
 
 3.     Added a compression option to dump, contributed by Jerry
        bug and providing a patch.
 
 3.     Added a compression option to dump, contributed by Jerry

-       <gapeters@worldnet.att.net>.
+       Peters <gapeters@worldnet.att.net>.

 
        WARNING: the compression works only on drives supporting
        variable block size.
 
        WARNING: the compression works only on drives supporting
        variable block size.


@@ -21,6 +21,11 @@ Changes between versions 0.4b21 and 0.4b22 (released ????????????????)
        incompatible with the standard dump tape format, and a
        version of restore >= 0.4b22 will be needed for extraction.
 
        incompatible with the standard dump tape format, and a
        version of restore >= 0.4b22 will be needed for extraction.
 

+4.     Fixed some compilation problems for glibc 2.2.2 and 64 bit 
+       architectures. Thanks to Paul Slootman <paul@debian.org> for
+       the patch and to Bdale Garbee <bdale@gag.com> for forwarding
+       it upstream.
+

 Changes between versions 0.4b20 and 0.4b21 (released January 13, 2001)
 ======================================================================
 
 Changes between versions 0.4b20 and 0.4b21 (released January 13, 2001)
 ======================================================================
 

diff --git a/THANKS b/THANKS
index 6468211bd3e18070f6a57d6d858e93b983ffea7e..368b7719aefce3d5c62076e3554b34c880d1ba19 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.42 2000/12/21 11:14:52 stelian Exp $
+$Id: THANKS,v 1.43 2001/02/22 10:57:39 stelian Exp $

 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.
 
 Dump and restore were written by the people of the CSRG at the University
 of California, Berkeley.


@@ -56,13 +56,16 @@ Dejan Muhamedagic   dejan@quant-x.com
 Lukas Nellen           L.Nellen@ThPhys.Uni-Heidelberg.DE
 Nuno Oliveira          nuno@eq.uc.pt
 Brent Olson            night@halcyon.com
 Lukas Nellen           L.Nellen@ThPhys.Uni-Heidelberg.DE
 Nuno Oliveira          nuno@eq.uc.pt
 Brent Olson            night@halcyon.com

+Jerry Peters           gapeters@worldnet.att.net

 Dave Platt             dplatt@snulbug.mtview.ca.us
 Kenneth Porter         shiva@well.com
 Dave Platt             dplatt@snulbug.mtview.ca.us
 Kenneth Porter         shiva@well.com

+Graham Reed            greed@users.sourceforge.net

 Bernhard Sadlowski     sadlowsk@Mathematik.Uni-Bielefeld.DE
 Jan Sanislo            oystr@cs.washington.edu
 Patrik Schindler       poc@pocnet.net
 Gunther Schlegel       schlegel@riege.de
 Chris Siebenmann       cks@utcc.utoronto.ca
 Bernhard Sadlowski     sadlowsk@Mathematik.Uni-Bielefeld.DE
 Jan Sanislo            oystr@cs.washington.edu
 Patrik Schindler       poc@pocnet.net
 Gunther Schlegel       schlegel@riege.de
 Chris Siebenmann       cks@utcc.utoronto.ca

+Paul Slootman          paul@debian.org

 Bob Snyder             rsnyder@janet.advsys.com
 Gabriel Somlo          somlo@cs.colostate.edu
 Matti Taskinen         mkt@rni.helsinki.fi
 Bob Snyder             rsnyder@janet.advsys.com
 Gabriel Somlo          somlo@cs.colostate.edu
 Matti Taskinen         mkt@rni.helsinki.fi

diff --git a/common/dumprmt.c b/common/dumprmt.c
index 31eb63fc8b550ccd27202848398d834e9d6181f9..503b933162538f513e1fd2f2d42f3f1cfee3da70 100644 (file)
--- a/common/dumprmt.c
+++ b/common/dumprmt.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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.16 2001/02/22 10:57:39 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -318,7 +318,7 @@ rmtwrite(const char *buf, size_t count)
 {
        char line[30];
 
 {
        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"));
        write(tormtape, line, strlen(line));
        write(tormtape, buf, count);
        return (rmtreply("write"));

diff --git a/dump/itime.c b/dump/itime.c
index 20aa69a2b6f6cb55a2de6d1abb06c1f34339b311..6eebd2c524b00343234328e505f56a747eef4355 100644 (file)
--- a/dump/itime.c
+++ b/dump/itime.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: itime.c,v 1.14 2000/12/21 11:14:54 stelian Exp $";
+       "$Id: itime.c,v 1.15 2001/02/22 10:57:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -49,6 +49,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>
 #include <sys/time.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>

+#include <time.h>

 #include <bsdcompat.h>
 #include <sys/file.h>
 #include <unistd.h>
 #include <bsdcompat.h>
 #include <sys/file.h>
 #include <unistd.h>

diff --git a/dump/main.c b/dump/main.c
index eaf5457318acd9ee0e925ced293bd47f73dad101..b2922223de3d51b433602f9f1c30127e8f79903e 100644 (file)
--- a/dump/main.c
+++ b/dump/main.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: main.c,v 1.33 2001/02/21 16:13:05 stelian Exp $";
+       "$Id: main.c,v 1.34 2001/02/22 10:57:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -49,6 +49,7 @@ static const char rcsid[] =
 #include <sys/time.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>
 #include <sys/time.h>
 #ifdef __linux__
 #include <linux/ext2_fs.h>

+#include <time.h>

 #include <sys/stat.h>
 #include <bsdcompat.h>
 #else
 #include <sys/stat.h>
 #include <bsdcompat.h>
 #else


@@ -224,7 +225,7 @@ main(int argc, char *argv[])
                        }
                        iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
                        if (iexclude_list[iexclude_num-1] <= ROOTINO) {
                        }
                        iexclude_list[iexclude_num++] = numarg("inode to exclude",0L,0L);
                        if (iexclude_list[iexclude_num-1] <= ROOTINO) {

-                               (void)fprintf(stderr, "Cannot exclude inode %ld\n", iexclude_list[iexclude_num-1]);
+                               (void)fprintf(stderr, "Cannot exclude inode %ld\n", (long)iexclude_list[iexclude_num-1]);

                                exit(X_STARTUP);
                        }
                        msg("Added %d to exclude list\n",
                                exit(X_STARTUP);
                        }
                        msg("Added %d to exclude list\n",

diff --git a/dump/optr.c b/dump/optr.c
index 9383cf6b69614f1378bc9daadb5e67859004adf0..f0be80bc263c59ae0f3c779049e6226b897052ed 100644 (file)
--- a/dump/optr.c
+++ b/dump/optr.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: optr.c,v 1.19 2001/02/21 16:13:05 stelian Exp $";
+       "$Id: optr.c,v 1.20 2001/02/22 10:57:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -65,6 +65,7 @@ static const char rcsid[] =
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <signal.h>
 #include <ext2fs/ext2fs.h>
 #include <bsdcompat.h>
 #include <signal.h>

+#include <time.h>

 #endif
 
 #include "dump.h"
 #endif
 
 #include "dump.h"

diff --git a/dump/tape.c b/dump/tape.c
index ea2faa062262657d5cc99fd57a0444a03b127871..54961a9a1b93dc92c7eef4d177b8e5a881be8b80 100644 (file)
--- a/dump/tape.c
+++ b/dump/tape.c
@@ -41,12 +41,13 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.31 2001/02/21 16:13:05 stelian Exp $";
+       "$Id: tape.c,v 1.32 2001/02/22 10:57:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #ifdef __linux__
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <config.h>
 #ifdef __linux__
 #include <sys/types.h>

+#include <time.h>

 #include <linux/types.h>
 #endif
 #include <sys/param.h>
 #include <linux/types.h>
 #endif
 #include <sys/param.h>

diff --git a/restore/tape.c b/restore/tape.c
index ae0c725439238086c32a5c4734a8bed010e7977f..45d19d22aa8234a12480f424459aeb8e5a513961 100644 (file)
--- a/restore/tape.c
+++ b/restore/tape.c
@@ -46,7 +46,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: tape.c,v 1.24 2001/02/21 16:13:05 stelian Exp $";
+       "$Id: tape.c,v 1.25 2001/02/22 10:57:40 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -57,6 +57,7 @@ static const char rcsid[] =
 
 #ifdef __linux__
 #include <sys/time.h>
 
 #ifdef __linux__
 #include <sys/time.h>

+#include <time.h>

 #include <linux/ext2_fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */
 #include <linux/ext2_fs.h>
 #include <bsdcompat.h>
 #else  /* __linux__ */