Changeset 539

Timestamp:

08/27/08 13:24:19 (4 months ago)

Author:

chris

Message:

Implement File.setReadOnly().

Files:

• Mika/trunk/core-vm/java/java/io/File.java (modified) (1 diff)
• Mika/trunk/core-vm/src/native/java/io/File.c (modified) (4 diffs)
• Mika/trunk/core-vm/src/vm/core-classes.in (modified) (2 diffs)

Mika/trunk/core-vm/java/java/io/File.java

@@ -433 +433 @@
-  }
-
-
-
-
+
-
-  public native long length() throws SecurityException;

Mika/trunk/core-vm/src/native/java/io/File.c

@@ -2 +2 @@
-* Parts copyright (c) 2001, 2002, 2003 by Punch Telematix.                *
-* All rights reserved.                                                    *
- by Chris Gray, /k/ Embedded Java Solutions.
-All rights reserved.           
+, 2008 by Chris Gray, /k/ Embedded Java     
+Solutions. All rights reserved.
-*                                                                         *
-* Redistribution and use in source and binary forms, with or without      *
@@ -139 +139 @@
-}
-
+w_boolean File_setReadOnly (JNIEnv *env, w_instance thisFile) {
+  char *pathname;
+  struct vfs_STAT statbuf;
+  jboolean result;
+  const int WRITABLE = VFS_S_IWUSR | VFS_S_IWGRP | VFS_S_IWOTH;
+  
+  pathname = getFileName(thisFile);       
+  result = vfs_stat(pathname, &statbuf) == 0
+    && vfs_chmod(pathname, statbuf.st_mode & ~WRITABLE) == 0;
+
+  freeFileName(pathname);
+  
+  return result;
+}
+
-w_boolean Java_File_canRead (JNIEnv *env, w_instance thisFile) {
-  struct vfs_STAT statbuf;
@@ -183 +198 @@
-    return 0;
-  }
+}
+
+w_boolean File_delete (JNIEnv *env, w_instance thisFile) {
+  char      *pathname;
+  struct vfs_STAT statbuf;
+  w_boolean result;
+  
+  pathname = getFileName(thisFile);       
+
+  result == (vfs_stat(pathname, &statbuf) == 0);
+  if (result) {
+    if(VFS_S_ISDIR(statbuf.st_mode)) {
+      result = (vfs_rmdir(pathname) == 0);
+      woempa(9, "%s is a directory, result = %d\n", pathname, result);
+      wprintf("%s is a directory, result = %d\n", pathname, result);
+    } else {
+      result = (vfs_unlink(pathname) == 0);
+      woempa(9, "%s is a file, result = %d\n", pathname, result);
+      wprintf("%s is a file, result = %d\n", pathname, result);
+    }
+  }
+  
+  freeFileName(pathname);
+
+  return result;
+
-}
-
@@ -293 +334 @@
-}
-
-/*
- * Class:     File
- * Method:    delete
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_File_delete
-  (JNIEnv *env, jobject thisObj) {
-
-  jboolean        isCopy;
-  const char      *pathname;
-  jstring         path;
-  struct vfs_STAT statbuf;
-  jboolean        result = JNI_FALSE;
-  
-  path = (jstring)(*env)->GetObjectField(env, thisObj, absname);
-  pathname = (*env)->GetStringUTFChars(env, path, &isCopy);       
-
-  if(vfs_stat((w_ubyte *)pathname, &statbuf) != -1) {
-    if(VFS_S_ISDIR(statbuf.st_mode)) {
-      if(vfs_rmdir(pathname) == 0) result = JNI_TRUE;
-      woempa(9, "%s is a directory, result = %d\n", pathname, result);
-    } else {
-      if(vfs_unlink(pathname) == 0) result = JNI_TRUE;
-      woempa(9, "%s is a file, result = %d\n", pathname, result);
-    }
-  }
-  
-  if(isCopy == JNI_TRUE) (*env)->ReleaseStringUTFChars(env, path, pathname);
-
-  return result;
-
-}
-
-#ifdef __cplusplus
-}

Mika/trunk/core-vm/src/vm/core-classes.in

@@ -750 +750 @@
-        mkdir                   ()Z                                             Java_File_mkdir
-        rename                  (Ljava/lang/String;Ljava/lang/String;)Z         Java_File_rename
-
+
+
-        get_CWD                 ()Ljava/lang/String;                            Java_File_get_CWD
-        get_fsroot              ()Ljava/lang/String;                            Java_File_get_fsroot
@@ -769 +770 @@
-        close                   ()V                                             Java_RandomAccessFile_close
-wonka/vm/ProcessInfo
-I
++
-  id            I
-  destroyed     Z