gcc/libjava/classpath/native/jni/java-io/java_io_VMFile.c
Matthias Klose cd6d4007aa re PR libgcj/37636 (java tools are unable to find resource files)
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
2008-10-21 17:55:01 +00:00

1215 lines
31 KiB
C

/* java_io_VMFile.c - Native methods for java.io.File class
Copyright (C) 1998, 2004, 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. */
/* do not move; needed here because of some macro definitions */
#include <config.h>
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#endif
#include <jni.h>
#include <jcl.h>
#include "cpio.h"
#include "cpnative.h"
#include "java_io_VMFile.h"
/* ***** PRIVATE FUNCTIONS DELCARATION ***** */
/**
* Enables of disables the passed permission bit of a file.
*/
static jboolean set_file_permissions (JNIEnv *env, jstring name,
jboolean enable,
jboolean ownerOnly,
int permissions);
/* ***** END: PRIVATE FUNCTIONS DELCARATION ***** */
/*************************************************************************/
/*
* Method to create an empty file.
*
* Class: java_io_VMFile
* Method: create
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_create (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int fd;
int result;
filename = JCL_jstring_to_cstring (env, name);
if (filename == NULL)
{
return 0;
}
result = cpio_openFile (filename, &fd, CPFILE_FLAG_CREATE|CPFILE_FLAG_WRITE, CPFILE_PERMISSION_NORMAL);
if (result != CPNATIVE_OK)
{
if (result != EEXIST)
JCL_ThrowException (env,
"java/io/IOException",
cpnative_getErrorString (result));
JCL_free_cstring (env, name, filename);
return 0;
}
cpio_closeFile (fd);
JCL_free_cstring (env, name, filename);
return 1;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method checks to see if we have read permission on a file.
*
* Class: java_io_VMFile
* Method: canRead
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_canRead (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return JNI_FALSE;
}
result = cpio_checkAccess (filename, CPFILE_FLAG_READ);
(*env)->ReleaseStringUTFChars (env, name, filename);
if (result != CPNATIVE_OK)
return JNI_FALSE;
return JNI_TRUE;
#else /* not WITHOUT_FILESYSTEM */
return JNI_FALSE;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method checks to see if we have write permission on a file.
*
* Class: java_io_VMFile
* Method: canWrite
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_canWrite (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return JNI_FALSE;
}
result = cpio_checkAccess (filename, CPFILE_FLAG_WRITE);
(*env)->ReleaseStringUTFChars (env, name, filename);
if (result != CPNATIVE_OK)
{
return JNI_FALSE;
}
return JNI_TRUE;
#else /* not WITHOUT_FILESYSTEM */
return JNI_FALSE;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_canWriteDirectory (JNIEnv *env, jclass clazz, jstring path)
{
/* this is only valid on *nix systems */
return Java_java_io_VMFile_canWrite(env, clazz, path);
}
/*************************************************************************/
/*
* This method checks to see if we have execute permission on a file.
*
* Class: java_io_VMFile
* Method: canExecute
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_canExecute (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return JNI_FALSE;
}
result = cpio_checkAccess (filename, CPFILE_FLAG_EXEC);
(*env)->ReleaseStringUTFChars (env, name, filename);
if (result != CPNATIVE_OK)
return JNI_FALSE;
return JNI_TRUE;
#else /* not WITHOUT_FILESYSTEM */
return JNI_FALSE;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method makes a file read only.
*
* Class: java_io_VMFile
* Method: setReadOnly
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_setReadOnly (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_setFileReadonly (filename);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method changes the read permission bit of a file.
*
* Class: java_io_VMFile
* Method: setReadable
* Signature: (Ljava/lang/String;ZZ)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_setReadable (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring name,
jboolean readable,
jboolean ownerOnly)
{
return set_file_permissions (env, name, readable, ownerOnly,
CPFILE_FLAG_READ);
}
/*************************************************************************/
/*
* This method changes the write permission bit of a file.
*
* Class: java_io_VMFile
* Method: setWritable
* Signature: (Ljava/lang/String;ZZ)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_setWritable (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring name,
jboolean writable,
jboolean ownerOnly)
{
return set_file_permissions (env, name, writable, ownerOnly,
CPFILE_FLAG_WRITE);
}
/*************************************************************************/
/*
* This method changes the execute permission bit of a file.
*
* Class: java_io_VMFile
* Method: setExecutable
* Signature: (Ljava/lang/String;ZZ)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_setExecutable (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring name,
jboolean executable,
jboolean ownerOnly)
{
return set_file_permissions (env, name, executable, ownerOnly,
CPFILE_FLAG_EXEC);
}
/*************************************************************************/
JNIEXPORT jlong JNICALL
Java_java_io_VMFile_getTotalSpace (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring path)
{
#ifndef WITHOUT_FILESYSTEM
jlong result;
const char *_path = NULL;
_path = (*env)->GetStringUTFChars (env, path, 0);
if (_path == NULL)
{
return 0L;
}
result = cpio_df (_path, TOTAL);
(*env)->ReleaseStringUTFChars (env, path, _path);
return result;
#else /* not WITHOUT_FILESYSTEM */
return 0L;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
JNIEXPORT jlong JNICALL
Java_java_io_VMFile_getFreeSpace (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring path)
{
#ifndef WITHOUT_FILESYSTEM
jlong result;
const char *_path = NULL;
_path = (*env)->GetStringUTFChars (env, path, 0);
if (_path == NULL)
{
return 0L;
}
result = cpio_df (_path, FREE);
(*env)->ReleaseStringUTFChars (env, path, _path);
return result;
#else /* not WITHOUT_FILESYSTEM */
return 0L;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
JNIEXPORT jlong JNICALL
Java_java_io_VMFile_getUsableSpace (JNIEnv *env,
jclass clazz __attribute__ ((__unused__)),
jstring path)
{
#ifndef WITHOUT_FILESYSTEM
jlong result;
const char *_path = NULL;
_path = (*env)->GetStringUTFChars (env, path, 0);
if (_path == NULL)
{
return 0L;
}
result = cpio_df (_path, USABLE);
(*env)->ReleaseStringUTFChars (env, path, _path);
return result;
#else /* not WITHOUT_FILESYSTEM */
return 0L;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method checks to see if a file exists.
*
* Class: java_io_VMFile
* Method: exists
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_exists (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_isFileExists (filename);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method checks to see if a file is a "plain" file; that is, not
* a directory, pipe, etc.
*
* Class: java_io_VMFile
* Method: isFile
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_isFile (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
jint entryType;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_checkType (filename, &entryType);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method checks to see if a file is a directory or not.
*
* Class: java_io_VMFile
* Method: isDirectory
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_isDirectory (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
jint entryType;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_checkType (filename, &entryType);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method returns the length of the file.
*
* Class: java_io_VMFile
* Method: length
* Signature: (Ljava/lang/String;)J
*/
JNIEXPORT jlong JNICALL
Java_java_io_VMFile_length (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int tmpfd;
jlong length;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
return 0;
/* open file for reading, get size and close file */
result = cpio_openFile (filename, &tmpfd, CPFILE_FLAG_READ, 0);
if (result != CPNATIVE_OK)
return 0;
result = cpio_getFileSize (tmpfd, &length);
if (result != CPNATIVE_OK)
{
cpio_closeFile (tmpfd);
return 0;
}
result = cpio_closeFile (tmpfd);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? length : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method returns the modification date of the file.
*
* Class: java_io_VMFile
* Method: lastModified
* Signature: (Ljava/lang/String;)J
*/
JNIEXPORT jlong JNICALL
Java_java_io_VMFile_lastModified (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
jlong mtime;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_getModificationTime (filename, &mtime);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? mtime : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method sets the modification date of the file.
*
* Class: java_io_VMFile
* Method: setLastModified
* Signature: (Ljava/lang/String;J)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_setLastModified (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name, jlong newtime)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_setModificationTime (filename, newtime);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method deletes a file (actually a name for a file - additional
* links could exist).
*
* Class: java_io_VMFile
* Method: delete
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_delete (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return 0;
}
result = cpio_removeFile (filename);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method creates a directory.
*
* Class: java_io_VMFile
* Method: mkdir
* Signature: (Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_mkdir (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const char *pathname;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
pathname = (*env)->GetStringUTFChars (env, name, 0);
if (pathname == NULL)
{
return 0;
}
result = cpio_mkdir (pathname);
(*env)->ReleaseStringUTFChars (env, name, pathname);
return (result == CPNATIVE_OK) ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method renames a (link to a) file.
*
* Class: java_io_VMFile
* Method: renameTo
* Signature: (Ljava/lang/String;Ljava/lang/String;)Z
*/
JNIEXPORT jboolean JNICALL
Java_java_io_VMFile_renameTo (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring t, jstring d)
{
#ifndef WITHOUT_FILESYSTEM
const char *old_filename, *new_filename;
int result;
/* Don't use the JCL convert function because it throws an exception
on failure */
old_filename = (*env)->GetStringUTFChars (env, t, 0);
if (old_filename == NULL)
{
return 0;
}
new_filename = (*env)->GetStringUTFChars (env, d, 0);
if (new_filename == NULL)
{
(*env)->ReleaseStringUTFChars (env, t, old_filename);
return 0;
}
result = cpio_rename (old_filename, new_filename);
(*env)->ReleaseStringUTFChars (env, d, new_filename);
(*env)->ReleaseStringUTFChars (env, t, old_filename);
return (result == CPNATIVE_OK) ? 1 : 0;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* This method returns an array of String representing all the files
* in a directory except "." and "..".
*
* Class: java_io_VMFile
* Method: list
* Signature: (Ljava/lang/String;)[Ljava/lang/String;
*/
JNIEXPORT jobjectArray JNICALL
Java_java_io_VMFile_list (JNIEnv * env,
jclass clazz __attribute__ ((__unused__)),
jstring name)
{
#ifndef WITHOUT_FILESYSTEM
const int REALLOC_SIZE = 10;
const char *dirname;
int result;
char **filelist;
void *handle;
char *filename = (char *) JCL_malloc (env, FILENAME_MAX);
unsigned long int filelist_count, max_filelist_count;
char **tmp_filelist;
jclass str_clazz;
jobjectArray filearray;
unsigned long int i;
jstring str;
/* Don't use the JCL convert function because it throws an exception
on failure */
dirname = (*env)->GetStringUTFChars (env, name, 0);
if (dirname == NULL)
{
return 0;
}
/* open directory for reading */
result = cpio_openDir (dirname, &handle);
(*env)->ReleaseStringUTFChars (env, name, dirname);
if (result != CPNATIVE_OK)
{
return 0;
}
/* allocate filelist */
filelist = (char **) JCL_malloc (env, sizeof (char *) * REALLOC_SIZE);
if (filelist == NULL)
{
result = cpio_closeDir (handle);
return 0;
}
filelist_count = 0;
max_filelist_count = REALLOC_SIZE;
/* read the files from the directory */
result = cpio_readDir (handle, filename);
while (result == CPNATIVE_OK)
{
if ((strcmp (filename, ".") != 0) && (strcmp (filename, "..") != 0))
{
/* allocate more memory if necessary */
if (filelist_count >= max_filelist_count)
{
tmp_filelist = (char **) JCL_realloc (env,
filelist,
(max_filelist_count +
REALLOC_SIZE) *
sizeof (char *));
if (tmp_filelist == NULL)
{
for (i = 0; i < filelist_count; i++)
{
JCL_free (env, filelist[i]);
}
JCL_free (env, filelist);
result = cpio_closeDir (handle);
return 0;
}
filelist = tmp_filelist;
max_filelist_count += REALLOC_SIZE;
}
/* save entry in list (avoid strdup, because it is not ANSI C, thus difficult to port) */
filelist[filelist_count] =
(char *) JCL_malloc (env, strlen (filename) + 1);
assert (filelist[filelist_count] != NULL);
strcpy (filelist[filelist_count], filename);
filelist_count++;
}
/* read next directory entry */
result = cpio_readDir (handle, filename);
}
JCL_free (env, filename);
/* close directory */
result = cpio_closeDir (handle);
/* put the list of files into a Java String array and return it */
str_clazz = (*env)->FindClass (env, "java/lang/String");
if (str_clazz == NULL)
{
for (i = 0; i < filelist_count; i++)
{
JCL_free (env, filelist[i]);
}
JCL_free (env, filelist);
return 0;
}
filearray = (*env)->NewObjectArray (env, filelist_count, str_clazz, 0);
if (filearray == NULL)
{
for (i = 0; i < filelist_count; i++)
{
JCL_free (env, filelist[i]);
}
JCL_free (env, filelist);
return 0;
}
(*env)->DeleteLocalRef (env, str_clazz);
for (i = 0; i < filelist_count; i++)
{
/* create new string */
str = (*env)->NewStringUTF (env, filelist[i]);
if (str == NULL)
{
/* We don't clean up everything here, but if this failed,
something serious happened anyway */
for (i = 0; i < filelist_count; i++)
{
JCL_free (env, filelist[i]);
}
JCL_free (env, filelist);
return 0;
}
/* save into array */
(*env)->SetObjectArrayElement (env, filearray, i, str);
/* delete local reference */
(*env)->DeleteLocalRef (env, str);
}
/* free resources */
for (i = 0; i < filelist_count; i++)
{
JCL_free (env, filelist[i]);
}
JCL_free (env, filelist);
return filearray;
#else /* not WITHOUT_FILESYSTEM */
return 0;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/*
* These two methods are used to maintain dynamically allocated
* buffers for getCanonicalPath without the overhead of calling
* realloc every time a buffer is modified. Buffers are sized
* at the smallest multiple of CHUNKSIZ that is greater than or
* equal to the desired length. The default CHUNKSIZ is 256,
* longer than most paths, so in most cases a getCanonicalPath
* will require only one malloc per buffer.
*/
#define CHUNKLOG 8
#define CHUNKSIZ (1 << CHUNKLOG)
static int
nextChunkSize (int size)
{
return ((size >> CHUNKLOG) + ((size & (CHUNKSIZ - 1)) ? 1 : 0)) << CHUNKLOG;
}
static char *
maybeGrowBuf (JNIEnv *env, char *buf, int *size, int required)
{
if (required > *size)
{
*size = nextChunkSize (required);
buf = JCL_realloc (env, buf, *size);
}
return buf;
}
/*************************************************************************/
/*
* This method converts a path to canonical form on GNU/Posix systems.
* This involves the removal of redundant separators, references to
* "." and "..", and symbolic links.
*
* The conversion proceeds on a component-by-component basis: symbolic
* links and references to ".." are resolved as and when they occur.
* This means that if "/foo/bar" is a symbolic link to "/baz" then the
* canonical form of "/foo/bar/.." is "/" and not "/foo".
*
* In order to mimic the behaviour of proprietary JVMs, non-existant
* path components are allowed (a departure from the normal GNU system
* convention). This means that if "/foo/bar" is a symbolic link to
* "/baz", the canonical form of "/non-existant-directory/../foo/bar"
* is "/baz".
*
* Class: java_io_VMFile
* Method: toCanonicalForm
* Signature: (Ljava/lang/String)Ljava/lang/String
*/
JNIEXPORT jstring JNICALL
Java_java_io_VMFile_toCanonicalForm (JNIEnv *env,
jclass class __attribute__ ((__unused__)),
jstring jpath)
{
#ifndef WITHOUT_FILESYSTEM
const char *path;
char *src, *dst;
int srci, dsti;
int srcl, dstl;
int len;
int fschecks;
#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
struct stat sb;
#endif /* HAVE_LSTAT && HAVE_READLINK */
path = JCL_jstring_to_cstring (env, jpath);
if (path == NULL)
return NULL;
/* It is the caller's responsibility to ensure the path is absolute. */
if (path[0] == 0 || path[0] != '/')
{
JCL_free_cstring (env, jpath, path);
JCL_ThrowException (env, "java/lang/RuntimeException", "Not absolute");
return NULL;
}
len = strlen (path);
srcl = nextChunkSize (len + 1);
src = JCL_malloc (env, srcl);
if (src == NULL)
{
JCL_free_cstring (env, jpath, path);
return NULL;
}
strcpy (src, path);
JCL_free_cstring (env, jpath, path);
srci = 1;
dstl = nextChunkSize (2);
dst = JCL_malloc (env, dstl);
if (dst == NULL)
{
JCL_free (env, src);
return NULL;
}
dst[0] = '/';
dsti = 1;
fschecks = JNI_TRUE;
while (src[srci] != '\0')
{
int tmpi, dsti_save;
/* Skip slashes. */
while (src[srci] == '/')
srci++;
tmpi = srci;
/* Find next slash. */
while (src[srci] != '/' && src[srci] != '\0')
srci++;
if (srci == tmpi)
/* We hit the end. */
break;
len = srci - tmpi;
/* Handle "." and "..". */
if (len == 1 && src[tmpi] == '.')
continue;
if (len == 2 && src[tmpi] == '.' && src[tmpi + 1] == '.')
{
while (dsti > 1 && dst[dsti - 1] != '/')
dsti--;
if (dsti != 1)
dsti--;
/* Reenable filesystem checking if disabled, as we might
* have reversed over whatever caused the problem before.
* At least one proprietary JVM has inconsistencies because
* it does not do this.
*/
fschecks = JNI_TRUE;
continue;
}
/* Handle real path components. */
dst = maybeGrowBuf (env,
dst, &dstl, dsti + (dsti > 1 ? 1 : 0) + len + 1);
if (dst == NULL)
{
JCL_free (env, src);
return NULL;
}
dsti_save = dsti;
if (dsti > 1)
dst[dsti++] = '/';
strncpy (&dst[dsti], &src[tmpi], len);
dsti += len;
if (fschecks == JNI_FALSE)
continue;
#if defined (HAVE_LSTAT) && defined (HAVE_READLINK)
dst[dsti] = '\0';
if (lstat (dst, &sb) == 0)
{
if (S_ISLNK (sb.st_mode))
{
int tmpl = CHUNKSIZ;
char *tmp = JCL_malloc (env, tmpl);
if (tmp == NULL)
{
JCL_free (env, src);
JCL_free (env, dst);
return NULL;
}
while (1)
{
tmpi = readlink (dst, tmp, tmpl);
if (tmpi < 1)
{
JCL_free (env, src);
JCL_free (env, dst);
JCL_free (env, tmp);
JCL_ThrowException (env, "java/io/IOException",
"readlink failed");
return NULL;
}
if (tmpi < tmpl)
break;
tmpl += CHUNKSIZ;
tmp = JCL_realloc (env, tmp, tmpl);
}
/* Prepend the link's path to src. */
tmp = maybeGrowBuf (env,
tmp, &tmpl, tmpi + strlen (&src[srci]) + 1);
if (tmp == NULL)
{
JCL_free (env, src);
JCL_free (env, dst);
return NULL;
}
strcpy (&tmp[tmpi], &src[srci]);
JCL_free (env, src);
src = tmp;
srcl = tmpl;
srci = 0;
/* Either replace or append dst depending on whether the
* link is relative or absolute.
*/
dsti = src[0] == '/' ? 1 : dsti_save;
}
}
else
{
/* Something doesn't exist, or we don't have permission to
* read it, or a previous path component is a directory, or
* a symlink is looped. Whatever, we can't check the
* filesystem any more.
*/
fschecks = JNI_FALSE;
}
#endif /* HAVE_LSTAT && HAVE_READLINK */
}
dst[dsti] = '\0';
jpath = (*env)->NewStringUTF (env, dst);
JCL_free (env, src);
JCL_free (env, dst);
return jpath;
#else /* not WITHOUT_FILESYSTEM */
return NULL;
#endif /* not WITHOUT_FILESYSTEM */
}
/*************************************************************************/
/* ***** PRIVATE FUNCTIONS IMPLEMENTATION ***** */
static jboolean set_file_permissions (JNIEnv *env, jstring name,
jboolean enable,
jboolean ownerOnly,
int permissions)
{
#ifndef WITHOUT_FILESYSTEM
const char *filename;
int result = JNI_FALSE;
/* Don't use the JCL convert function because it throws an exception
on failure */
filename = (*env)->GetStringUTFChars (env, name, 0);
if (filename == NULL)
{
return JNI_FALSE;
}
if (ownerOnly)
{
permissions |= CPFILE_FLAG_USR;
}
if (!enable)
{
permissions |= CPFILE_FLAG_OFF;
}
result = cpio_chmod (filename, permissions);
(*env)->ReleaseStringUTFChars (env, name, filename);
return result == CPNATIVE_OK ? JNI_TRUE : JNI_FALSE;
#else /* not WITHOUT_FILESYSTEM */
return JNI_FALSE;
#endif /* not WITHOUT_FILESYSTEM */
}