
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
782 lines
21 KiB
Java
782 lines
21 KiB
Java
/* ZipFile.java --
|
|
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
|
|
Free Software Foundation, Inc.
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
any later version.
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
02110-1301 USA.
|
|
|
|
Linking this library statically or dynamically with other modules is
|
|
making a combined work based on this library. Thus, the terms and
|
|
conditions of the GNU General Public License cover the whole
|
|
combination.
|
|
|
|
As a special exception, the copyright holders of this library give you
|
|
permission to link this library with independent modules to produce an
|
|
executable, regardless of the license terms of these independent
|
|
modules, and to copy and distribute the resulting executable under
|
|
terms of your choice, provided that you also meet, for each linked
|
|
independent module, the terms and conditions of the license of that
|
|
module. An independent module is a module which is not derived from
|
|
or based on this library. If you modify this library, you may extend
|
|
this exception to your version of the library, but you are not
|
|
obligated to do so. If you do not wish to do so, delete this
|
|
exception statement from your version. */
|
|
|
|
|
|
package java.util.zip;
|
|
|
|
import gnu.java.util.EmptyEnumeration;
|
|
|
|
import java.io.EOFException;
|
|
import java.io.File;
|
|
import java.io.FileNotFoundException;
|
|
import java.io.IOException;
|
|
import java.io.InputStream;
|
|
import java.io.RandomAccessFile;
|
|
import java.io.UnsupportedEncodingException;
|
|
import java.nio.ByteBuffer;
|
|
import java.nio.charset.Charset;
|
|
import java.nio.charset.CharsetDecoder;
|
|
import java.util.Enumeration;
|
|
import java.util.Iterator;
|
|
import java.util.LinkedHashMap;
|
|
|
|
/**
|
|
* This class represents a Zip archive. You can ask for the contained
|
|
* entries, or get an input stream for a file entry. The entry is
|
|
* automatically decompressed.
|
|
*
|
|
* This class is thread safe: You can open input streams for arbitrary
|
|
* entries in different threads.
|
|
*
|
|
* @author Jochen Hoenicke
|
|
* @author Artur Biesiadowski
|
|
*/
|
|
public class ZipFile implements ZipConstants
|
|
{
|
|
|
|
/**
|
|
* Mode flag to open a zip file for reading.
|
|
*/
|
|
public static final int OPEN_READ = 0x1;
|
|
|
|
/**
|
|
* Mode flag to delete a zip file after reading.
|
|
*/
|
|
public static final int OPEN_DELETE = 0x4;
|
|
|
|
/**
|
|
* This field isn't defined in the JDK's ZipConstants, but should be.
|
|
*/
|
|
static final int ENDNRD = 4;
|
|
|
|
// Name of this zip file.
|
|
private final String name;
|
|
|
|
// File from which zip entries are read.
|
|
private final RandomAccessFile raf;
|
|
|
|
// The entries of this zip file when initialized and not yet closed.
|
|
private LinkedHashMap<String, ZipEntry> entries;
|
|
|
|
private boolean closed = false;
|
|
|
|
|
|
/**
|
|
* Helper function to open RandomAccessFile and throw the proper
|
|
* ZipException in case opening the file fails.
|
|
*
|
|
* @param name the file name, or null if file is provided
|
|
*
|
|
* @param file the file, or null if name is provided
|
|
*
|
|
* @return the newly open RandomAccessFile, never null
|
|
*/
|
|
private RandomAccessFile openFile(String name,
|
|
File file)
|
|
throws ZipException, IOException
|
|
{
|
|
try
|
|
{
|
|
return
|
|
(name != null)
|
|
? new RandomAccessFile(name, "r")
|
|
: new RandomAccessFile(file, "r");
|
|
}
|
|
catch (FileNotFoundException f)
|
|
{
|
|
ZipException ze = new ZipException(f.getMessage());
|
|
ze.initCause(f);
|
|
throw ze;
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Opens a Zip file with the given name for reading.
|
|
* @exception IOException if a i/o error occured.
|
|
* @exception ZipException if the file doesn't contain a valid zip
|
|
* archive.
|
|
*/
|
|
public ZipFile(String name) throws ZipException, IOException
|
|
{
|
|
this.raf = openFile(name,null);
|
|
this.name = name;
|
|
checkZipFile();
|
|
}
|
|
|
|
/**
|
|
* Opens a Zip file reading the given File.
|
|
* @exception IOException if a i/o error occured.
|
|
* @exception ZipException if the file doesn't contain a valid zip
|
|
* archive.
|
|
*/
|
|
public ZipFile(File file) throws ZipException, IOException
|
|
{
|
|
this.raf = openFile(null,file);
|
|
this.name = file.getPath();
|
|
checkZipFile();
|
|
}
|
|
|
|
/**
|
|
* Opens a Zip file reading the given File in the given mode.
|
|
*
|
|
* If the OPEN_DELETE mode is specified, the zip file will be deleted at
|
|
* some time moment after it is opened. It will be deleted before the zip
|
|
* file is closed or the Virtual Machine exits.
|
|
*
|
|
* The contents of the zip file will be accessible until it is closed.
|
|
*
|
|
* @since JDK1.3
|
|
* @param mode Must be one of OPEN_READ or OPEN_READ | OPEN_DELETE
|
|
*
|
|
* @exception IOException if a i/o error occured.
|
|
* @exception ZipException if the file doesn't contain a valid zip
|
|
* archive.
|
|
*/
|
|
public ZipFile(File file, int mode) throws ZipException, IOException
|
|
{
|
|
if (mode != OPEN_READ && mode != (OPEN_READ | OPEN_DELETE))
|
|
throw new IllegalArgumentException("invalid mode");
|
|
if ((mode & OPEN_DELETE) != 0)
|
|
file.deleteOnExit();
|
|
this.raf = openFile(null,file);
|
|
this.name = file.getPath();
|
|
checkZipFile();
|
|
}
|
|
|
|
private void checkZipFile() throws ZipException
|
|
{
|
|
boolean valid = false;
|
|
|
|
try
|
|
{
|
|
byte[] buf = new byte[4];
|
|
raf.readFully(buf);
|
|
int sig = buf[0] & 0xFF
|
|
| ((buf[1] & 0xFF) << 8)
|
|
| ((buf[2] & 0xFF) << 16)
|
|
| ((buf[3] & 0xFF) << 24);
|
|
valid = sig == LOCSIG;
|
|
}
|
|
catch (IOException _)
|
|
{
|
|
}
|
|
|
|
if (!valid)
|
|
{
|
|
try
|
|
{
|
|
raf.close();
|
|
}
|
|
catch (IOException _)
|
|
{
|
|
}
|
|
throw new ZipException("Not a valid zip file");
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Checks if file is closed and throws an exception.
|
|
*/
|
|
private void checkClosed()
|
|
{
|
|
if (closed)
|
|
throw new IllegalStateException("ZipFile has closed: " + name);
|
|
}
|
|
|
|
/**
|
|
* Read the central directory of a zip file and fill the entries
|
|
* array. This is called exactly once when first needed. It is called
|
|
* while holding the lock on <code>raf</code>.
|
|
*
|
|
* @exception IOException if a i/o error occured.
|
|
* @exception ZipException if the central directory is malformed
|
|
*/
|
|
private void readEntries() throws ZipException, IOException
|
|
{
|
|
/* Search for the End Of Central Directory. When a zip comment is
|
|
* present the directory may start earlier.
|
|
* Note that a comment has a maximum length of 64K, so that is the
|
|
* maximum we search backwards.
|
|
*/
|
|
PartialInputStream inp = new PartialInputStream(raf, 4096);
|
|
long pos = raf.length() - ENDHDR;
|
|
long top = Math.max(0, pos - 65536);
|
|
do
|
|
{
|
|
if (pos < top)
|
|
throw new ZipException
|
|
("central directory not found, probably not a zip file: " + name);
|
|
inp.seek(pos--);
|
|
}
|
|
while (inp.readLeInt() != ENDSIG);
|
|
|
|
if (inp.skip(ENDTOT - ENDNRD) != ENDTOT - ENDNRD)
|
|
throw new EOFException(name);
|
|
int count = inp.readLeShort();
|
|
if (inp.skip(ENDOFF - ENDSIZ) != ENDOFF - ENDSIZ)
|
|
throw new EOFException(name);
|
|
int centralOffset = inp.readLeInt();
|
|
|
|
entries = new LinkedHashMap<String, ZipEntry> (count+count/2);
|
|
inp.seek(centralOffset);
|
|
|
|
for (int i = 0; i < count; i++)
|
|
{
|
|
if (inp.readLeInt() != CENSIG)
|
|
throw new ZipException("Wrong Central Directory signature: " + name);
|
|
|
|
inp.skip(6);
|
|
int method = inp.readLeShort();
|
|
int dostime = inp.readLeInt();
|
|
int crc = inp.readLeInt();
|
|
int csize = inp.readLeInt();
|
|
int size = inp.readLeInt();
|
|
int nameLen = inp.readLeShort();
|
|
int extraLen = inp.readLeShort();
|
|
int commentLen = inp.readLeShort();
|
|
inp.skip(8);
|
|
int offset = inp.readLeInt();
|
|
String name = inp.readString(nameLen);
|
|
|
|
ZipEntry entry = new ZipEntry(name);
|
|
entry.setMethod(method);
|
|
entry.setCrc(crc & 0xffffffffL);
|
|
entry.setSize(size & 0xffffffffL);
|
|
entry.setCompressedSize(csize & 0xffffffffL);
|
|
entry.setDOSTime(dostime);
|
|
if (extraLen > 0)
|
|
{
|
|
byte[] extra = new byte[extraLen];
|
|
inp.readFully(extra);
|
|
entry.setExtra(extra);
|
|
}
|
|
if (commentLen > 0)
|
|
{
|
|
entry.setComment(inp.readString(commentLen));
|
|
}
|
|
entry.offset = offset;
|
|
entries.put(name, entry);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Closes the ZipFile. This also closes all input streams given by
|
|
* this class. After this is called, no further method should be
|
|
* called.
|
|
*
|
|
* @exception IOException if a i/o error occured.
|
|
*/
|
|
public void close() throws IOException
|
|
{
|
|
RandomAccessFile raf = this.raf;
|
|
if (raf == null)
|
|
return;
|
|
|
|
synchronized (raf)
|
|
{
|
|
closed = true;
|
|
entries = null;
|
|
raf.close();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Calls the <code>close()</code> method when this ZipFile has not yet
|
|
* been explicitly closed.
|
|
*/
|
|
protected void finalize() throws IOException
|
|
{
|
|
if (!closed && raf != null) close();
|
|
}
|
|
|
|
/**
|
|
* Returns an enumeration of all Zip entries in this Zip file.
|
|
*
|
|
* @exception IllegalStateException when the ZipFile has already been closed
|
|
*/
|
|
public Enumeration<? extends ZipEntry> entries()
|
|
{
|
|
checkClosed();
|
|
|
|
try
|
|
{
|
|
return new ZipEntryEnumeration(getEntries().values().iterator());
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
return new EmptyEnumeration<ZipEntry>();
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Checks that the ZipFile is still open and reads entries when necessary.
|
|
*
|
|
* @exception IllegalStateException when the ZipFile has already been closed.
|
|
* @exception IOException when the entries could not be read.
|
|
*/
|
|
private LinkedHashMap<String, ZipEntry> getEntries() throws IOException
|
|
{
|
|
synchronized(raf)
|
|
{
|
|
checkClosed();
|
|
|
|
if (entries == null)
|
|
readEntries();
|
|
|
|
return entries;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Searches for a zip entry in this archive with the given name.
|
|
*
|
|
* @param name the name. May contain directory components separated by
|
|
* slashes ('/').
|
|
* @return the zip entry, or null if no entry with that name exists.
|
|
*
|
|
* @exception IllegalStateException when the ZipFile has already been closed
|
|
*/
|
|
public ZipEntry getEntry(String name)
|
|
{
|
|
checkClosed();
|
|
|
|
try
|
|
{
|
|
LinkedHashMap<String, ZipEntry> entries = getEntries();
|
|
ZipEntry entry = entries.get(name);
|
|
// If we didn't find it, maybe it's a directory.
|
|
if (entry == null && !name.endsWith("/"))
|
|
entry = entries.get(name + '/');
|
|
return entry != null ? new ZipEntry(entry, name) : null;
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
return null;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Creates an input stream reading the given zip entry as
|
|
* uncompressed data. Normally zip entry should be an entry
|
|
* returned by getEntry() or entries().
|
|
*
|
|
* This implementation returns null if the requested entry does not
|
|
* exist. This decision is not obviously correct, however, it does
|
|
* appear to mirror Sun's implementation, and it is consistant with
|
|
* their javadoc. On the other hand, the old JCL book, 2nd Edition,
|
|
* claims that this should return a "non-null ZIP entry". We have
|
|
* chosen for now ignore the old book, as modern versions of Ant (an
|
|
* important application) depend on this behaviour. See discussion
|
|
* in this thread:
|
|
* http://gcc.gnu.org/ml/java-patches/2004-q2/msg00602.html
|
|
*
|
|
* @param entry the entry to create an InputStream for.
|
|
* @return the input stream, or null if the requested entry does not exist.
|
|
*
|
|
* @exception IllegalStateException when the ZipFile has already been closed
|
|
* @exception IOException if a i/o error occured.
|
|
* @exception ZipException if the Zip archive is malformed.
|
|
*/
|
|
public InputStream getInputStream(ZipEntry entry) throws IOException
|
|
{
|
|
checkClosed();
|
|
|
|
LinkedHashMap<String, ZipEntry> entries = getEntries();
|
|
String name = entry.getName();
|
|
ZipEntry zipEntry = entries.get(name);
|
|
if (zipEntry == null)
|
|
return null;
|
|
|
|
PartialInputStream inp = new PartialInputStream(raf, 1024);
|
|
inp.seek(zipEntry.offset);
|
|
|
|
if (inp.readLeInt() != LOCSIG)
|
|
throw new ZipException("Wrong Local header signature: " + name);
|
|
|
|
inp.skip(4);
|
|
|
|
if (zipEntry.getMethod() != inp.readLeShort())
|
|
throw new ZipException("Compression method mismatch: " + name);
|
|
|
|
inp.skip(16);
|
|
|
|
int nameLen = inp.readLeShort();
|
|
int extraLen = inp.readLeShort();
|
|
inp.skip(nameLen + extraLen);
|
|
|
|
inp.setLength(zipEntry.getCompressedSize());
|
|
|
|
int method = zipEntry.getMethod();
|
|
switch (method)
|
|
{
|
|
case ZipOutputStream.STORED:
|
|
return inp;
|
|
case ZipOutputStream.DEFLATED:
|
|
inp.addDummyByte();
|
|
final Inflater inf = new Inflater(true);
|
|
final int sz = (int) entry.getSize();
|
|
return new InflaterInputStream(inp, inf)
|
|
{
|
|
public int available() throws IOException
|
|
{
|
|
if (sz == -1)
|
|
return super.available();
|
|
if (super.available() != 0)
|
|
return sz - inf.getTotalOut();
|
|
return 0;
|
|
}
|
|
};
|
|
default:
|
|
throw new ZipException("Unknown compression method " + method);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Returns the (path) name of this zip file.
|
|
*/
|
|
public String getName()
|
|
{
|
|
return name;
|
|
}
|
|
|
|
/**
|
|
* Returns the number of entries in this zip file.
|
|
*
|
|
* @exception IllegalStateException when the ZipFile has already been closed
|
|
*/
|
|
public int size()
|
|
{
|
|
checkClosed();
|
|
|
|
try
|
|
{
|
|
return getEntries().size();
|
|
}
|
|
catch (IOException ioe)
|
|
{
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
private static class ZipEntryEnumeration implements Enumeration<ZipEntry>
|
|
{
|
|
private final Iterator<ZipEntry> elements;
|
|
|
|
public ZipEntryEnumeration(Iterator<ZipEntry> elements)
|
|
{
|
|
this.elements = elements;
|
|
}
|
|
|
|
public boolean hasMoreElements()
|
|
{
|
|
return elements.hasNext();
|
|
}
|
|
|
|
public ZipEntry nextElement()
|
|
{
|
|
/* We return a clone, just to be safe that the user doesn't
|
|
* change the entry.
|
|
*/
|
|
return (ZipEntry) (elements.next().clone());
|
|
}
|
|
}
|
|
|
|
private static final class PartialInputStream extends InputStream
|
|
{
|
|
/**
|
|
* The UTF-8 charset use for decoding the filenames.
|
|
*/
|
|
private static final Charset UTF8CHARSET = Charset.forName("UTF-8");
|
|
|
|
/**
|
|
* The actual UTF-8 decoder. Created on demand.
|
|
*/
|
|
private CharsetDecoder utf8Decoder;
|
|
|
|
private final RandomAccessFile raf;
|
|
private final byte[] buffer;
|
|
private long bufferOffset;
|
|
private int pos;
|
|
private long end;
|
|
// We may need to supply an extra dummy byte to our reader.
|
|
// See Inflater. We use a count here to simplify the logic
|
|
// elsewhere in this class. Note that we ignore the dummy
|
|
// byte in methods where we know it is not needed.
|
|
private int dummyByteCount;
|
|
|
|
public PartialInputStream(RandomAccessFile raf, int bufferSize)
|
|
throws IOException
|
|
{
|
|
this.raf = raf;
|
|
buffer = new byte[bufferSize];
|
|
bufferOffset = -buffer.length;
|
|
pos = buffer.length;
|
|
end = raf.length();
|
|
}
|
|
|
|
void setLength(long length)
|
|
{
|
|
end = bufferOffset + pos + length;
|
|
}
|
|
|
|
private void fillBuffer() throws IOException
|
|
{
|
|
synchronized (raf)
|
|
{
|
|
long len = end - bufferOffset;
|
|
if (len == 0 && dummyByteCount > 0)
|
|
{
|
|
buffer[0] = 0;
|
|
dummyByteCount = 0;
|
|
}
|
|
else
|
|
{
|
|
raf.seek(bufferOffset);
|
|
raf.readFully(buffer, 0, (int) Math.min(buffer.length, len));
|
|
}
|
|
}
|
|
}
|
|
|
|
public int available()
|
|
{
|
|
long amount = end - (bufferOffset + pos);
|
|
if (amount > Integer.MAX_VALUE)
|
|
return Integer.MAX_VALUE;
|
|
return (int) amount;
|
|
}
|
|
|
|
public int read() throws IOException
|
|
{
|
|
if (bufferOffset + pos >= end + dummyByteCount)
|
|
return -1;
|
|
if (pos == buffer.length)
|
|
{
|
|
bufferOffset += buffer.length;
|
|
pos = 0;
|
|
fillBuffer();
|
|
}
|
|
|
|
return buffer[pos++] & 0xFF;
|
|
}
|
|
|
|
public int read(byte[] b, int off, int len) throws IOException
|
|
{
|
|
if (len > end + dummyByteCount - (bufferOffset + pos))
|
|
{
|
|
len = (int) (end + dummyByteCount - (bufferOffset + pos));
|
|
if (len == 0)
|
|
return -1;
|
|
}
|
|
|
|
int totalBytesRead = Math.min(buffer.length - pos, len);
|
|
System.arraycopy(buffer, pos, b, off, totalBytesRead);
|
|
pos += totalBytesRead;
|
|
off += totalBytesRead;
|
|
len -= totalBytesRead;
|
|
|
|
while (len > 0)
|
|
{
|
|
bufferOffset += buffer.length;
|
|
pos = 0;
|
|
fillBuffer();
|
|
int remain = Math.min(buffer.length, len);
|
|
System.arraycopy(buffer, pos, b, off, remain);
|
|
pos += remain;
|
|
off += remain;
|
|
len -= remain;
|
|
totalBytesRead += remain;
|
|
}
|
|
|
|
return totalBytesRead;
|
|
}
|
|
|
|
public long skip(long amount) throws IOException
|
|
{
|
|
if (amount < 0)
|
|
return 0;
|
|
if (amount > end - (bufferOffset + pos))
|
|
amount = end - (bufferOffset + pos);
|
|
seek(bufferOffset + pos + amount);
|
|
return amount;
|
|
}
|
|
|
|
void seek(long newpos) throws IOException
|
|
{
|
|
long offset = newpos - bufferOffset;
|
|
if (offset >= 0 && offset <= buffer.length)
|
|
{
|
|
pos = (int) offset;
|
|
}
|
|
else
|
|
{
|
|
bufferOffset = newpos;
|
|
pos = 0;
|
|
fillBuffer();
|
|
}
|
|
}
|
|
|
|
void readFully(byte[] buf) throws IOException
|
|
{
|
|
if (read(buf, 0, buf.length) != buf.length)
|
|
throw new EOFException();
|
|
}
|
|
|
|
void readFully(byte[] buf, int off, int len) throws IOException
|
|
{
|
|
if (read(buf, off, len) != len)
|
|
throw new EOFException();
|
|
}
|
|
|
|
int readLeShort() throws IOException
|
|
{
|
|
int result;
|
|
if(pos + 1 < buffer.length)
|
|
{
|
|
result = ((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8);
|
|
pos += 2;
|
|
}
|
|
else
|
|
{
|
|
int b0 = read();
|
|
int b1 = read();
|
|
if (b1 == -1)
|
|
throw new EOFException();
|
|
result = (b0 & 0xff) | (b1 & 0xff) << 8;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
int readLeInt() throws IOException
|
|
{
|
|
int result;
|
|
if(pos + 3 < buffer.length)
|
|
{
|
|
result = (((buffer[pos + 0] & 0xff) | (buffer[pos + 1] & 0xff) << 8)
|
|
| ((buffer[pos + 2] & 0xff)
|
|
| (buffer[pos + 3] & 0xff) << 8) << 16);
|
|
pos += 4;
|
|
}
|
|
else
|
|
{
|
|
int b0 = read();
|
|
int b1 = read();
|
|
int b2 = read();
|
|
int b3 = read();
|
|
if (b3 == -1)
|
|
throw new EOFException();
|
|
result = (((b0 & 0xff) | (b1 & 0xff) << 8) | ((b2 & 0xff)
|
|
| (b3 & 0xff) << 8) << 16);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Decode chars from byte buffer using UTF8 encoding. This
|
|
* operation is performance-critical since a jar file contains a
|
|
* large number of strings for the name of each file in the
|
|
* archive. This routine therefore avoids using the expensive
|
|
* utf8Decoder when decoding is straightforward.
|
|
*
|
|
* @param buffer the buffer that contains the encoded character
|
|
* data
|
|
* @param pos the index in buffer of the first byte of the encoded
|
|
* data
|
|
* @param length the length of the encoded data in number of
|
|
* bytes.
|
|
*
|
|
* @return a String that contains the decoded characters.
|
|
*/
|
|
private String decodeChars(byte[] buffer, int pos, int length)
|
|
throws IOException
|
|
{
|
|
String result;
|
|
int i=length - 1;
|
|
while ((i >= 0) && (buffer[i] <= 0x7f))
|
|
{
|
|
i--;
|
|
}
|
|
if (i < 0)
|
|
{
|
|
result = new String(buffer, 0, pos, length);
|
|
}
|
|
else
|
|
{
|
|
ByteBuffer bufferBuffer = ByteBuffer.wrap(buffer, pos, length);
|
|
if (utf8Decoder == null)
|
|
utf8Decoder = UTF8CHARSET.newDecoder();
|
|
utf8Decoder.reset();
|
|
char [] characters = utf8Decoder.decode(bufferBuffer).array();
|
|
result = String.valueOf(characters);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
String readString(int length) throws IOException
|
|
{
|
|
if (length > end - (bufferOffset + pos))
|
|
throw new EOFException();
|
|
|
|
String result = null;
|
|
try
|
|
{
|
|
if (buffer.length - pos >= length)
|
|
{
|
|
result = decodeChars(buffer, pos, length);
|
|
pos += length;
|
|
}
|
|
else
|
|
{
|
|
byte[] b = new byte[length];
|
|
readFully(b);
|
|
result = decodeChars(b, 0, length);
|
|
}
|
|
}
|
|
catch (UnsupportedEncodingException uee)
|
|
{
|
|
throw new AssertionError(uee);
|
|
}
|
|
return result;
|
|
}
|
|
|
|
public void addDummyByte()
|
|
{
|
|
dummyByteCount = 1;
|
|
}
|
|
}
|
|
}
|