Merge ../YAPDroid/yap

os/files.c

@@ -429,7 +429,11 @@ static Int access_file(USES_REGS1) {
                 return FALSE;
             }
         } else {
+<<<<<<< HEAD
 	  return true;
+=======
+            return false;
+>>>>>>> f798372fb1dc4ff03c592d2ae8e0245a842305b8
         }
     }
 #if HAVE_ACCESS
@@ -521,7 +525,6 @@ static Int exists_directory(USES_REGS1) {
     if (!s) return false;
     if ((vfs = vfs_owner(s))) {
 bool rc = true;
-void *o;
       return vfs->isdir(vfs, s);
 
       UNLOCK(GLOBAL_Stream[sno].streamlock);