gcc/libjava/java/util/zip/natInflater.cc
Bryce McKinlay 1c02a3d964 re GNATS libgcj/226 (implicit __builtin_expect) and GNATS gcj/228 (compressed JAR files)
2000-05-20  Bryce McKinlay  <bryce@albatross.co.nz>

	Fix for PR libgcj/226:
	* java/lang/Class.h (_Jv_InitClass): Don't call __builtin_expect,
	since this is an installed header.

	Fix for PR libgcj/228:
	* java/util/zip/ZipFile (getInputStream): Create inflater with
	nowrapper option.

	* java/util/zip/natInflater.cc (inflate): Throw zlib's error message
	with DataFormatException.

From-SVN: r34064
2000-05-21 00:30:46 +01:00

207 lines
4.4 KiB
C++
Raw Blame History

This file contains invisible Unicode characters

This file contains invisible Unicode characters that are indistinguishable to humans but may be processed differently by a computer. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

// natInflater.cc - Implementation of Inflater native methods.
/* Copyright (C) 1999 Free Software Foundation
This file is part of libgcj.
This software is copyrighted work licensed under the terms of the
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
details. */
// Written by Tom Tromey <tromey@cygnus.com>
#include <config.h>
#include <zlib.h>
#include <stdlib.h>
#include <gcj/cni.h>
#include <jvm.h>
#include <java/util/zip/Inflater.h>
#include <java/util/zip/DataFormatException.h>
#include <java/lang/InternalError.h>
#include <java/lang/NullPointerException.h>
#include <java/lang/ArrayIndexOutOfBoundsException.h>
#include <java/lang/OutOfMemoryError.h>
// A couple of helper functions used to interface with zlib's
// allocation.
void *
_Jv_ZMalloc (void *, uInt nitems, uInt size)
{
return _Jv_Malloc (nitems * size);
}
void
_Jv_ZFree (void *, void *addr)
{
_Jv_Free (addr);
}
void
java::util::zip::Inflater::end ()
{
JvSynchronize sync (this);
// Just ignore errors.
inflateEnd ((z_streamp) zstream);
_Jv_Free (zstream);
zstream = NULL;
}
jint
java::util::zip::Inflater::getAdler ()
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
return s->adler;
}
jint
java::util::zip::Inflater::getRemaining ()
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
return s->avail_in;
}
jint
java::util::zip::Inflater::getTotalIn ()
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
return s->total_in;
}
jint
java::util::zip::Inflater::getTotalOut ()
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
return s->total_out;
}
jint
java::util::zip::Inflater::inflate (jbyteArray buf, jint off, jint len)
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
if (! buf)
_Jv_Throw (new java::lang::NullPointerException);
if (off < 0 || len < 0 || off + len > buf->length)
_Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException);
if (len == 0)
return 0;
s->next_out = (Bytef *) (elements (buf) + off);
s->avail_out = len;
switch (::inflate (s, Z_SYNC_FLUSH))
{
case Z_STREAM_END:
is_finished = true;
if (s->avail_out == (unsigned int) len)
return -1;
break;
case Z_NEED_DICT:
dict_needed = true;
break;
case Z_DATA_ERROR:
_Jv_Throw (new java::util::zip::DataFormatException
(s->msg == NULL ? NULL : JvNewStringLatin1 (s->msg)));
break;
case Z_MEM_ERROR:
_Jv_Throw (new java::lang::OutOfMemoryError);
break;
case Z_BUF_ERROR:
// FIXME?
_Jv_Throw (new java::lang::InternalError);
break;
case Z_OK:
break;
}
return len - s->avail_out;
}
void
java::util::zip::Inflater::reset ()
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
// Just ignore errors.
inflateReset (s);
}
void
java::util::zip::Inflater::setDictionary (jbyteArray buf, jint off, jint len)
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
if (! buf)
_Jv_Throw (new java::lang::NullPointerException);
if (off < 0 || len < 0 || off + len > buf->length)
_Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException);
// Ignore errors.
inflateSetDictionary (s, (Bytef *) (elements (buf) + off), len);
dict_needed = false;
}
void
java::util::zip::Inflater::setInput (jbyteArray buf, jint off, jint len)
{
JvSynchronize sync (this);
z_streamp s = (z_streamp) zstream;
if (! buf)
_Jv_Throw (new java::lang::NullPointerException);
if (off < 0 || len < 0 || off + len > buf->length)
_Jv_Throw (new java::lang::ArrayIndexOutOfBoundsException);
s->next_in = (Bytef *) (elements (buf) + off);
s->avail_in = len;
}
void
java::util::zip::Inflater::init (jboolean no_header)
{
z_stream_s *stream = (z_stream_s *) _Jv_Malloc (sizeof (z_stream_s));
stream->next_in = Z_NULL;
stream->avail_in = 0;
stream->zalloc = _Jv_ZMalloc;
stream->zfree = _Jv_ZFree;
stream->opaque = NULL;
// Handle NO_HEADER using undocumented zlib feature.
int wbits = MAX_WBITS;
if (no_header)
wbits = - wbits;
if (inflateInit2 (stream, wbits) != Z_OK)
{
jstring msg = NULL;
if (stream->msg != NULL)
msg = JvNewStringLatin1 (stream->msg);
_Jv_Throw (new java::lang::InternalError (msg));
}
zstream = reinterpret_cast<gnu::gcj::RawData *> (stream);
is_finished = false;
dict_needed = false;
}