This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[classpath-095-merge-branch] implement java.io.File methods
- From: Matthias Klose <doko at ubuntu dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Thu, 17 May 2007 23:24:15 +0200
- Subject: [classpath-095-merge-branch] implement java.io.File methods
This patch implements the native support for new methods in java.io.File.
Checked in to the classpath-095-merge-branch.
Missing are the native changes for natFileWin32.cc (only natFilePosix.cc done).
2007-05-17 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.
Matthias
2007-05-17 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.
Index: java/io/File.java
===================================================================
--- java/io/File.java (revision 124801)
+++ java/io/File.java (working copy)
@@ -67,6 +67,7 @@
private final static int READ = 0;
private final static int WRITE = 1;
private final static int EXISTS = 2;
+ private final static int EXEC = 3;
// QUERY arguments to stat function.
private final static int DIRECTORY = 0;
@@ -182,6 +183,27 @@
return _access (WRITE);
}
+ /**
+ * This method tests whether or not the current thread is allowed to
+ * to execute the file pointed to by this object. This will be true if and
+ * and only if 1) the file exists and 2) the <code>SecurityManager</code>
+ * (if any) allows access to the file via it's <code>checkExec</code>
+ * method 3) the file is executable.
+ *
+ * @return <code>true</code> if execution is allowed,
+ * <code>false</code> otherwise
+ *
+ * @exception SecurityException If the <code>SecurityManager</code>
+ * does not allow access to the file
+ */
+ public boolean canExecute()
+ {
+ if (!exists())
+ return false;
+ checkExec();
+ return _access (EXEC);
+ }
+
private native boolean performCreate() throws IOException;
/**
@@ -1139,6 +1161,159 @@
}
/*
+ * This native method sets file permissions.
+ */
+ private native boolean setFilePermissions(boolean enable, boolean ownerOnly,
+ int permissions);
+
+ /**
+ * This method sets the owner's read permission for the File represented by
+ * this object.
+ *
+ * It is the same as calling <code>setReadable(readable, true)</code>.
+ *
+ * @param <code>readable</code> <code>true</code> to set read permission,
+ * <code>false</code> to unset the read permission.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setReadable(boolean, boolean)
+ * @since 1.6
+ */
+ public boolean setReadable(boolean readable)
+ {
+ return setReadable(readable, true);
+ }
+
+ /**
+ * This method sets the read permissions for the File represented by
+ * this object.
+ *
+ * If <code>ownerOnly</code> is set to <code>true</code> then only the
+ * read permission bit for the owner of the file is changed.
+ *
+ * If <code>ownerOnly</code> is set to <code>false</code>, the file
+ * permissions are changed so that the file can be read by everyone.
+ *
+ * On unix like systems this sets the <code>user</code>, <code>group</code>
+ * and <code>other</code> read bits and is equal to call
+ * <code>chmod a+r</code> on the file.
+ *
+ * @param <code>readable</code> <code>true</code> to set read permission,
+ * <code>false</code> to unset the read permission.
+ * @param <code>ownerOnly</code> <code>true</code> to set read permission
+ * for owner only, <code>false</code> for all.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setReadable(boolean)
+ * @since 1.6
+ */
+ public boolean setReadable(boolean readable, boolean ownerOnly)
+ {
+ checkWrite();
+ return setFilePermissions(readable, ownerOnly, READ);
+ }
+
+ /**
+ * This method sets the owner's write permission for the File represented by
+ * this object.
+ *
+ * It is the same as calling <code>setWritable(readable, true)</code>.
+ *
+ * @param <code>writable</code> <code>true</code> to set write permission,
+ * <code>false</code> to unset write permission.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setWritable(boolean, boolean)
+ * @since 1.6
+ */
+ public boolean setWritable(boolean writable)
+ {
+ return setWritable(writable, true);
+ }
+
+ /**
+ * This method sets the write permissions for the File represented by
+ * this object.
+ *
+ * If <code>ownerOnly</code> is set to <code>true</code> then only the
+ * write permission bit for the owner of the file is changed.
+ *
+ * If <code>ownerOnly</code> is set to <code>false</code>, the file
+ * permissions are changed so that the file can be written by everyone.
+ *
+ * On unix like systems this set the <code>user</code>, <code>group</code>
+ * and <code>other</code> write bits and is equal to call
+ * <code>chmod a+w</code> on the file.
+ *
+ * @param <code>writable</code> <code>true</code> to set write permission,
+ * <code>false</code> to unset write permission.
+ * @param <code>ownerOnly</code> <code>true</code> to set write permission
+ * for owner only, <code>false</code> for all.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setWritable(boolean)
+ * @since 1.6
+ */
+ public boolean setWritable(boolean writable, boolean ownerOnly)
+ {
+ checkWrite();
+ return setFilePermissions(writable, ownerOnly, WRITE);
+ }
+
+ /**
+ * This method sets the owner's execute permission for the File represented
+ * by this object.
+ *
+ * It is the same as calling <code>setExecutable(readable, true)</code>.
+ *
+ * @param <code>executable</code> <code>true</code> to set execute permission,
+ * <code>false</code> to unset execute permission.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setExecutable(boolean, boolean)
+ * @since 1.6
+ */
+ public boolean setExecutable(boolean executable)
+ {
+ return setExecutable(executable, true);
+ }
+
+ /**
+ * This method sets the execute permissions for the File represented by
+ * this object.
+ *
+ * If <code>ownerOnly</code> is set to <code>true</code> then only the
+ * execute permission bit for the owner of the file is changed.
+ *
+ * If <code>ownerOnly</code> is set to <code>false</code>, the file
+ * permissions are changed so that the file can be executed by everyone.
+ *
+ * On unix like systems this set the <code>user</code>, <code>group</code>
+ * and <code>other</code> write bits and is equal to call
+ * <code>chmod a+x</code> on the file.
+ *
+ * @param <code>executable</code> <code>true</code> to set write permission,
+ * <code>false</code> to unset write permission.
+ * @param <code>ownerOnly</code> <code>true</code> to set write permission
+ * for owner only, <code>false</code> for all.
+ * @return <code>true</code> if the file permissions are changed,
+ * <code>false</code> otherwise.
+ * @exception SecurityException If write access of the file is not permitted.
+ * @see #setExecutable(boolean)
+ * @since 1.6
+ */
+ public boolean setExecutable(boolean executable, boolean ownerOnly)
+ {
+ checkWrite();
+ return setFilePermissions(executable, ownerOnly, EXEC);
+ }
+
+ /*
* This native method sets the permissions to make the file read only.
*/
private native boolean performSetReadOnly();
@@ -1372,6 +1547,15 @@
s.checkRead(path);
}
+ private void checkExec()
+ {
+ // Check the SecurityManager
+ SecurityManager s = System.getSecurityManager();
+
+ if (s != null)
+ s.checkExec(path);
+ }
+
/**
* Calling this method requests that the file represented by this object
* be deleted when the virtual machine exits. Note that this request cannot
Index: java/io/natFilePosix.cc
===================================================================
--- java/io/natFilePosix.cc (revision 124801)
+++ java/io/natFilePosix.cc (working copy)
@@ -43,15 +43,18 @@
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 if (query == EXISTS)
+ mode = F_OK;
else
- mode = F_OK;
+ mode = X_OK;
return ::access (buf, mode) == 0;
#else
return false;
@@ -344,6 +347,54 @@
}
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)
{
char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1);