mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#89303# don't bother with extra data or comments as we don't use either

Browse Source
This commit is contained in:
Martin Gallwey
2001-09-14 14:01:22 +00:00
parent 380290c0db
commit bcd6b5ee31
1 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
package/source/zipapi/ZipOutputStream.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: ZipOutputStream.cxx,v $ * $RCSfile: ZipOutputStream.cxx,v $
* *
* $Revision: 1.30 $ * $Revision: 1.31 $
* *
* last change: $Author: mtg $ $Date: 2001-09-05 18:54:28 $ * last change: $Author: mtg $ $Date: 2001-09-14 15:01:22 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -79,7 +79,9 @@
#ifndef _PACKAGE_CONSTANTS_HXX_ #ifndef _PACKAGE_CONSTANTS_HXX_
#include <PackageConstants.hxx> #include <PackageConstants.hxx>
#endif #endif
#ifndef _ZIP_ENTRY_HXX_
#include <ZipEntry.hxx>
#endif
using namespace rtl; using namespace rtl;
using namespace com::sun::star::io; using namespace com::sun::star::io;
using namespace com::sun::star::uno; using namespace com::sun::star::uno;
@@ -171,8 +173,6 @@ void SAL_CALL ZipOutputStream::putNextEntry( ZipEntry& rEntry,
xCurrentEncryptData = xEncryptData; xCurrentEncryptData = xEncryptData;
} }
sal_Int32 nLOCLength = writeLOC(rEntry); sal_Int32 nLOCLength = writeLOC(rEntry);
// After writeLOC we know which disk we're stored on and also the offset
rEntry.nDiskNumber = nCurrentDiskNumber;
rEntry.nOffset = static_cast < sal_Int32 > (aChucker.getPosition()) - nLOCLength; rEntry.nOffset = static_cast < sal_Int32 > (aChucker.getPosition()) - nLOCLength;
aZipList.push_back( &rEntry ); aZipList.push_back( &rEntry );
pCurrentEntry = &rEntry; pCurrentEntry = &rEntry;
@@ -341,16 +341,6 @@ void ZipOutputStream::doDeflate()
void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength) void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
throw(IOException, RuntimeException) throw(IOException, RuntimeException)
{ {
sal_Int16 nCommentLength = static_cast < sal_Int16 > (sComment.getLength());
Sequence < sal_Int8 > aSequence (nCommentLength);
sal_Int8 *pArray = aSequence.getArray();
const sal_Unicode *pChar = sComment.getStr();
for ( sal_Int16 i = 0; i < nCommentLength; i++)
{
VOS_ENSURE ( Impl_IsValidChar ( pChar[i], sal_True), "Non US ASCII character in zipfile comment!");
pArray[i] = static_cast < const sal_Int8 > (pChar[i]);
}
aChucker << ENDSIG; aChucker << ENDSIG;
aChucker << static_cast < sal_Int16 > ( 0 ); aChucker << static_cast < sal_Int16 > ( 0 );
aChucker << static_cast < sal_Int16 > ( 0 ); aChucker << static_cast < sal_Int16 > ( 0 );
@@ -358,16 +348,12 @@ void ZipOutputStream::writeEND(sal_uInt32 nOffset, sal_uInt32 nLength)
aChucker << static_cast < sal_Int16 > ( aZipList.size() ); aChucker << static_cast < sal_Int16 > ( aZipList.size() );
aChucker << nLength; aChucker << nLength;
aChucker << nOffset; aChucker << nOffset;
aChucker << nCommentLength; aChucker << static_cast < sal_Int16 > ( 0 );
if (nCommentLength)
aChucker.writeBytes( aSequence, nCommentLength, pArray );
} }
void ZipOutputStream::writeCEN( const ZipEntry &rEntry ) void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
throw(IOException, RuntimeException) throw(IOException, RuntimeException)
{ {
sal_Int16 nNameLength = static_cast < sal_Int16 > ( rEntry.sName.getLength() ) , sal_Int16 nNameLength = static_cast < sal_Int16 > ( rEntry.sName.getLength() );
nCommentLength = static_cast < sal_Int16 > ( rEntry.sComment.getLength() ) ,
nExtraLength = static_cast < sal_Int16 > ( rEntry.extra.getLength() );
aChucker << CENSIG; aChucker << CENSIG;
aChucker << rEntry.nVersion; aChucker << rEntry.nVersion;
@@ -390,8 +376,8 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
aChucker << rEntry.nCompressedSize; aChucker << rEntry.nCompressedSize;
aChucker << rEntry.nSize; aChucker << rEntry.nSize;
aChucker << nNameLength; aChucker << nNameLength;
aChucker << nExtraLength; aChucker << static_cast < sal_Int16> (0);
aChucker << nCommentLength; aChucker << static_cast < sal_Int16> (0);
aChucker << static_cast < sal_Int16> (0); aChucker << static_cast < sal_Int16> (0);
aChucker << static_cast < sal_Int16> (0); aChucker << static_cast < sal_Int16> (0);
aChucker << static_cast < sal_Int32> (0); aChucker << static_cast < sal_Int32> (0);
@@ -401,29 +387,11 @@ void ZipOutputStream::writeCEN( const ZipEntry &rEntry )
Sequence < sal_Int8 > aSequence (nNameLength); Sequence < sal_Int8 > aSequence (nNameLength);
sal_Int8 *pArray = aSequence.getArray(); sal_Int8 *pArray = aSequence.getArray();
VOS_ENSURE ( Impl_IsValidChar ( pChar, nNameLength, sal_True ), "Non US ASCII character in zipentry name!");
for ( sal_Int16 i = 0; i < nNameLength; i++) for ( sal_Int16 i = 0; i < nNameLength; i++)
{
VOS_ENSURE ( Impl_IsValidChar ( pChar[i], sal_True ), "Non US ASCII character in zipentry name!");
pArray[i] = static_cast < const sal_Int8 > (pChar[i]); pArray[i] = static_cast < const sal_Int8 > (pChar[i]);
}
aChucker.writeBytes( aSequence, nNameLength, pArray ); aChucker.writeBytes( aSequence, nNameLength, pArray );
if (nExtraLength)
aChucker.writeBytes( rEntry.extra );
if (nCommentLength)
{
if (nNameLength != nCommentLength)
{
aSequence.realloc (nCommentLength);
pArray = aSequence.getArray();
}
for (i=0, pChar = rEntry.sComment.getStr(); i < nCommentLength; i++)
{
VOS_ENSURE ( Impl_IsValidChar ( pChar[i], sal_True ), "Non US ASCII character in zipentry comment!");
pArray[i] = static_cast < const sal_Int8 > (pChar[i]);
}
aChucker.writeBytes( aSequence, nCommentLength, pArray );
}
} }
void ZipOutputStream::writeEXT( const ZipEntry &rEntry ) void ZipOutputStream::writeEXT( const ZipEntry &rEntry )
throw(IOException, RuntimeException) throw(IOException, RuntimeException)
@@ -437,8 +405,7 @@ void ZipOutputStream::writeEXT( const ZipEntry &rEntry )
sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry ) sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry )
throw(IOException, RuntimeException) throw(IOException, RuntimeException)
{ {
sal_Int16 nNameLength = static_cast < sal_Int16 > (rEntry.sName.getLength()), sal_Int16 nNameLength = static_cast < sal_Int16 > (rEntry.sName.getLength());
nExtraLength = static_cast < sal_Int16 > (rEntry.extra.getLength());
Sequence < sal_Int8 > aSequence(nNameLength); Sequence < sal_Int8 > aSequence(nNameLength);
sal_Int8 *pArray = aSequence.getArray(); sal_Int8 *pArray = aSequence.getArray();
@@ -473,18 +440,14 @@ sal_Int32 ZipOutputStream::writeLOC( const ZipEntry &rEntry )
aChucker << rEntry.nSize; aChucker << rEntry.nSize;
} }
aChucker << nNameLength; aChucker << nNameLength;
aChucker << nExtraLength; aChucker << static_cast < sal_Int16 > (0);
const sal_Unicode *pChar = rEntry.sName.getStr(); const sal_Unicode *pChar = rEntry.sName.getStr();
VOS_ENSURE ( Impl_IsValidChar ( pChar, nNameLength, sal_True ), "Non US ASCII character in zipentry name!");
for ( sal_Int16 i = 0; i < nNameLength; i++) for ( sal_Int16 i = 0; i < nNameLength; i++)
{
VOS_ENSURE ( Impl_IsValidChar ( pChar[i], sal_True ), "Non US ASCII character in zipentry name!");
pArray[i] = static_cast < const sal_Int8 > (pChar[i]); pArray[i] = static_cast < const sal_Int8 > (pChar[i]);
}
aChucker.writeBytes( aSequence, nNameLength, pArray ); aChucker.writeBytes( aSequence, nNameLength, pArray );
if ( nExtraLength ) return LOCHDR + nNameLength;
aChucker.writeBytes( rEntry.extra );
return LOCHDR + nNameLength + nExtraLength;
} }
sal_uInt32 ZipOutputStream::getCurrentDosTime( ) sal_uInt32 ZipOutputStream::getCurrentDosTime( )
{ {