From ed7c25a371480f96746518a4c4d4bb932ae16b77 Mon Sep 17 00:00:00 2001 From: Stelian Pop Date: Tue, 25 Jun 2002 19:00:37 +0000 Subject: [PATCH] Fixed a problem when reading tapes written with ancient dump versions on big endian machines. --- CHANGES | 6 +++++- THANKS | 3 ++- restore/dirs.c | 4 +++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index a4d1b44..678487d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,4 @@ -$Id: CHANGES,v 1.181 2002/06/10 14:04:59 stelian Exp $ +$Id: CHANGES,v 1.182 2002/06/25 19:00:37 stelian Exp $ Changes between versions 0.4b29 and 0.4b30 (released ????????????????) ====================================================================== @@ -7,6 +7,10 @@ Changes between versions 0.4b29 and 0.4b30 (released ????????????????) error, which can be given as an argument to debugfs' ncheck command, in order to find out the affected inode. Added note about this usage in dump's man page. + +2. Fixed a problem in restore when reading tapes written on big + endian machines with very old versions of dump. The patch was + contributed by George Helffrich . Changes between versions 0.4b28 and 0.4b29 (released June 8, 2002) ================================================================== diff --git a/THANKS b/THANKS index 7ad8f54..4b20e69 100644 --- a/THANKS +++ b/THANKS @@ -1,4 +1,4 @@ -$Id: THANKS,v 1.60 2002/06/08 07:10:37 stelian Exp $ +$Id: THANKS,v 1.61 2002/06/25 19:00:37 stelian Exp $ Dump and restore were written by the people of the CSRG at the University of California, Berkeley. @@ -47,6 +47,7 @@ Ian Gordon iangordon@users.sourceforge.net Ted Grzesik tedgyz@roostme.com Andreas Hasenack andreas@conectiva.com.br Christian Haul haul@informatik.tu-darmstadt.de +George Helffrich george@geology.bristol.ac.uk Kjetil Torgrim Homme kjetilho@ifi.uio.no Jean-Paul van der Jagt jeanpaul@dutepp0.et.tudelft.nl Helmut Jarausch jarausch@igpm.rwth-aachen.de diff --git a/restore/dirs.c b/restore/dirs.c index 4a0a2bc..bf1583b 100644 --- a/restore/dirs.c +++ b/restore/dirs.c @@ -46,7 +46,7 @@ #ifndef lint static const char rcsid[] = - "$Id: dirs.c,v 1.19 2002/06/08 07:10:37 stelian Exp $"; + "$Id: dirs.c,v 1.20 2002/06/25 19:00:38 stelian Exp $"; #endif /* not lint */ #include @@ -397,6 +397,8 @@ putdir(char *buf, size_t size) if (!Bcvt) dp->d_namlen = dp->d_type; # endif + if (dp->d_namlen == 0 && dp->d_type != 0) + dp->d_namlen = dp->d_type; dp->d_type = DT_UNKNOWN; } #ifdef DIRDEBUG -- 2.39.5