From 125958ce05ef5bcb9e7b6070c210bd98058bf615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Sch=C3=B6pflin?= Date: Tue, 24 Aug 2004 11:13:14 +0000 Subject: [PATCH] Added support for reading compressed archives found on Tru64 V5 and later. [SVN r24706] --- historic/jam/src/fileunix.c | 9 +++++++-- jam_src/fileunix.c | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/historic/jam/src/fileunix.c b/historic/jam/src/fileunix.c index 05ef415a6..344abca09 100644 --- a/historic/jam/src/fileunix.c +++ b/historic/jam/src/fileunix.c @@ -236,8 +236,13 @@ file_archscan( if( DEBUG_BINDSCAN ) printf( "scan archive %s\n", archive ); - while( read( fd, &ar_hdr, SARHDR ) == SARHDR && - !memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) ) + while( read( fd, &ar_hdr, SARHDR ) == SARHDR + && ! ( memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) +#ifdef ARFZMAG + /* OSF also has a compressed format */ + && memcmp( ar_hdr.ar_fmag, ARFZMAG, SARFMAG ) +#endif + ) ) { char lar_name_[257]; char* lar_name = lar_name_ + 1; diff --git a/jam_src/fileunix.c b/jam_src/fileunix.c index 05ef415a6..344abca09 100644 --- a/jam_src/fileunix.c +++ b/jam_src/fileunix.c @@ -236,8 +236,13 @@ file_archscan( if( DEBUG_BINDSCAN ) printf( "scan archive %s\n", archive ); - while( read( fd, &ar_hdr, SARHDR ) == SARHDR && - !memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) ) + while( read( fd, &ar_hdr, SARHDR ) == SARHDR + && ! ( memcmp( ar_hdr.ar_fmag, ARFMAG, SARFMAG ) +#ifdef ARFZMAG + /* OSF also has a compressed format */ + && memcmp( ar_hdr.ar_fmag, ARFZMAG, SARFMAG ) +#endif + ) ) { char lar_name_[257]; char* lar_name = lar_name_ + 1;