libjava/classpath/ChangeLog.gcj:
2007-05-31 Matthias Klose <doko@ubuntu.com> * javax/management/NotificationBroadcasterSupport.java (getNotificationInfo): Add cast. * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include directories. * native/jni/qt-peer/Makefile.in: Regenerate. libjava/ChangeLog: 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/natFileWin32.cc (setFilePermissions): New (stub only). _access: Handle EXEC query, stub only. 2007-06-03 Matthias Klose <doko@ubuntu.com> Merged from classpath: * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge. * java/lang/System.java(inheritedChannel): New. * java/lang/Character.java: Remove stray`;'. * java/net/MulticastSocket.java: Merged. * java/text/DateFormatSymbols.java(getInstance): New, comment updates. * java/text/Collator.java(getInstance): Merged. * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG. getDisplayName, getDisplayNames: New. * java/util/logging/Logger.java: Merged. * Regenerate .class and .h files. 2007-06-03 Matthias Klose <doko@ubuntu.com> * java/io/File.java: Merge with classpath-0.95, new method setFilePermissions, new attribute EXEC. * java/io/natFilePosix.cc (setFilePermissions): New. _access: Handle EXEC query. * classpath/lib/java/io/File.class, java/io/File.h: Regenerate. 2007-06-03 Matthias Klose <doko@ubuntu.com> Imported GNU Classpath 0.95. * classpath/Makefile.in, classpath/native/jni/midi-dssi/Makefile.in, classpath/native/jni/classpath/Makefile.in, classpath/native/jni/Makefile.in, classpath/native/jni/gconf-peer/Makefile.in, classpath/native/jni/java-io/Makefile.in, classpath/native/jni/native-lib/Makefile.in, classpath/native/jni/java-util/Makefile.in, classpath/native/jni/midi-alsa/Makefile.in, classpath/native/jni/java-lang/Makefile.in, classpath/native/jni/java-nio/Makefile.in, classpath/native/jni/java-net/Makefile.in, classpath/native/jni/xmlj/Makefile.in, classpath/native/jni/qt-peer/Makefile.in, classpath/native/jni/gtk-peer/Makefile.in, classpath/native/Makefile.in, classpath/native/jawt/Makefile.in, classpath/native/fdlibm/Makefile.in, classpath/native/plugin/Makefile.in, classpath/resource/Makefile.in, classpath/scripts/Makefile.in, classpath/tools/Makefile.in, classpath/doc/Makefile.in, classpath/doc/api/Makefile.in, classpath/lib/Makefile.in, classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in, classpath/external/sax/Makefile.in, classpath/external/w3c_dom/Makefile.in, classpath/external/relaxngDatatype/Makefile.in, classpath/include/Makefile.in, classpath/examples/Makefile.in: Regenerate. * classpath/config.guess, classpath/config.sub, classpath/ltmain.sh : Update. * classpath/configure, classpath/depcomp, classpath/missing, classpath/aclocal.m4, classpath/install-sh: Regenerate. * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95. * sources.am: Regenerate. * Makefile.in: Regenerate. * Update the .class files and generated CNI header files, add new .class and generated CNI header files. * Remove generated files for removed java source files: classpath/gnu/java/net/BASE64.java, classpath/gnu/java/security/util/Base64.java, classpath/gnu/java/awt/peer/gtk/GThreadMutex.java, classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java, classpath/gnu/java/awt/font/autofit/Scaler.java, classpath/gnu/classpath/jdwp/util/Value.java, classpath/gnu/javax/net/ssl/Base64.java. * Remove empty directories. * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc. * java/lang/Class.java(setAccessible): Merge from classpath. * java/util/Locale.java: Remove. * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java, gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New. * gcj/javaprims.h: Update class declarations. * scripts/classes.pl: Update usage. * HACKING: Mention to build all peers. From-SVN: r125302
This commit is contained in:
parent
af333b9a7f
commit
e1bea0c068
2951 changed files with 80982 additions and 68583 deletions
|
@ -43,15 +43,18 @@ java::io::File::_access (jint query)
|
|||
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);
|
||||
jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
|
||||
buf[total] = '\0';
|
||||
JvAssert (query == READ || query == WRITE || query == EXISTS);
|
||||
JvAssert (query == READ || query == WRITE || query == EXISTS
|
||||
|| query == EXEC);
|
||||
#ifdef HAVE_ACCESS
|
||||
int mode;
|
||||
if (query == READ)
|
||||
mode = R_OK;
|
||||
else if (query == WRITE)
|
||||
mode = W_OK;
|
||||
else
|
||||
else if (query == EXISTS)
|
||||
mode = F_OK;
|
||||
else
|
||||
mode = X_OK;
|
||||
return ::access (buf, mode) == 0;
|
||||
#else
|
||||
return false;
|
||||
|
@ -343,6 +346,54 @@ java::io::File::performMkdir (void)
|
|||
#endif
|
||||
}
|
||||
|
||||
jboolean
|
||||
java::io::File::setFilePermissions (jboolean enable,
|
||||
jboolean ownerOnly,
|
||||
jint permissions)
|
||||
{
|
||||
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);
|
||||
jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
|
||||
buf[total] = '\0';
|
||||
JvAssert (permissions == READ || permissions == WRITE || permissions == EXEC);
|
||||
#if defined (HAVE_STAT) && defined (HAVE_CHMOD)
|
||||
mode_t mode = 0;
|
||||
|
||||
struct stat sb;
|
||||
if (::stat (buf, &sb))
|
||||
return false;
|
||||
|
||||
if (ownerOnly)
|
||||
{
|
||||
if (permissions == READ)
|
||||
mode |= S_IRUSR;
|
||||
else if (permissions == WRITE)
|
||||
mode |= S_IWUSR;
|
||||
else if (permissions == EXEC)
|
||||
mode |= S_IXUSR;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (permissions == READ)
|
||||
mode |= (S_IRUSR | S_IRGRP | S_IROTH);
|
||||
else if (permissions == WRITE)
|
||||
mode |= (S_IWUSR | S_IWGRP | S_IWOTH);
|
||||
else if (permissions == EXEC)
|
||||
mode |= (S_IXUSR | S_IXGRP | S_IXOTH);
|
||||
}
|
||||
|
||||
if (enable)
|
||||
mode = sb.st_mode | mode;
|
||||
else
|
||||
mode = sb.st_mode & ~mode;
|
||||
|
||||
if (::chmod(buf, mode) < 0)
|
||||
return false;
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
jboolean
|
||||
java::io::File::performSetReadOnly (void)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue