From 401a4d13e4c30d46074531c6c26efefcaf3bbdaf Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Thu, 22 Feb 2001 10:57:39 +0000 Subject: [PATCH] 64bit and glibc 2.2.2 fixes. --- CHANGES | 9 +++++++-- THANKS | 5 ++++- common/dumprmt.c | 4 ++-- dump/itime.c | 3 ++- dump/main.c | 5 +++-- dump/optr.c | 3 ++- dump/tape.c | 3 ++- restore/tape.c | 3 ++- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/CHANGES b/CHANGES index 77d25eb..13ac337 100644 --- 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 ????????????????) ====================================================================== @@ -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 - . + Peters . 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. +4. Fixed some compilation problems for glibc 2.2.2 and 64 bit + architectures. Thanks to Paul Slootman for + the patch and to Bdale Garbee for forwarding + it upstream. + Changes between versions 0.4b20 and 0.4b21 (released January 13, 2001) ====================================================================== diff --git a/THANKS b/THANKS index 6468211..368b771 100644 --- 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. @@ -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 +Jerry Peters gapeters@worldnet.att.net 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 +Paul Slootman paul@debian.org 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 31eb63f..503b933 100644 --- a/common/dumprmt.c +++ b/common/dumprmt.c @@ -41,7 +41,7 @@ #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 @@ -318,7 +318,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")); diff --git a/dump/itime.c b/dump/itime.c index 20aa69a..6eebd2c 100644 --- a/dump/itime.c +++ b/dump/itime.c @@ -41,7 +41,7 @@ #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 @@ -49,6 +49,7 @@ static const char rcsid[] = #include #ifdef __linux__ #include +#include #include #include #include diff --git a/dump/main.c b/dump/main.c index eaf5457..b292222 100644 --- a/dump/main.c +++ b/dump/main.c @@ -41,7 +41,7 @@ #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 @@ -49,6 +49,7 @@ static const char rcsid[] = #include #ifdef __linux__ #include +#include #include #include #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) { - (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", diff --git a/dump/optr.c b/dump/optr.c index 9383cf6..f0be80b 100644 --- a/dump/optr.c +++ b/dump/optr.c @@ -41,7 +41,7 @@ #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 @@ -65,6 +65,7 @@ static const char rcsid[] = #include #include #include +#include #endif #include "dump.h" diff --git a/dump/tape.c b/dump/tape.c index ea2faa0..54961a9 100644 --- a/dump/tape.c +++ b/dump/tape.c @@ -41,12 +41,13 @@ #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 #ifdef __linux__ #include +#include #include #endif #include diff --git a/restore/tape.c b/restore/tape.c index ae0c725..45d19d2 100644 --- a/restore/tape.c +++ b/restore/tape.c @@ -46,7 +46,7 @@ #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 @@ -57,6 +57,7 @@ static const char rcsid[] = #ifdef __linux__ #include +#include #include #include #else /* __linux__ */ -- 2.39.2