* Broken symbolic links (which do not reference any valid file or directory)
* are being returned by {@link IFileStore#childInfos(int, IProgressMonitor)},
- * but {@link IFileInfo#exists()} returns false for these.
- * Operations like reading or writing on broken symbolic links throw
- * a "file not found" exception.
+ * and {@link IFileInfo#exists()} returns true for these. The fact
+ * whether link is broken can be checked by calling {@link IFileInfo#getAttribute(int)}
+ * with {@link #ATTRIBUTE_ACCESSIBLE} which returns false in such
+ * cases. Operations like reading or writing on broken symbolic links throw
+ * a "file not found" exception.
*
false by file system implementation in
+ * case the file is present but its content cannot be reached.
+ * + * Note that setting the accessible attribute does not cause a file to be + * marked as inaccessible. Rather, this attribute is set by file system + * implementations based on the current state of a file. + *
+ * + * @see IFileInfo#getAttribute(int) + * @see FileInfo#setAttribute(int, boolean) + * @since org.eclipse.core.filesystem 1.3 + */ + public static final int ATTRIBUTE_ACCESSIBLE = 1 << 7; + + /** * Scheme constant (value "file") indicating the local file system scheme. * @see EFS#getLocalFileSystem() */ Index: natives/unix/localfile.c =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.filesystem/natives/unix/localfile.c,v retrieving revision 1.9 diff -u -r1.9 localfile.c --- natives/unix/localfile.c 10 May 2007 13:53:51 -0000 1.9 +++ natives/unix/localfile.c 19 Oct 2009 15:30:47 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2007 IBM Corporation and others. + * Copyright (c) 2000, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -68,7 +68,7 @@ JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_filesystem_local_LocalFileNatives_nativeAttributes (JNIEnv *env, jclass clazz) { #if defined(EFS_SYMLINK_SUPPORT) - return ATTRIBUTE_READ_ONLY | ATTRIBUTE_EXECUTABLE | ATTRIBUTE_SYMLINK | ATTRIBUTE_LINK_TARGET; + return ATTRIBUTE_READ_ONLY | ATTRIBUTE_EXECUTABLE | ATTRIBUTE_SYMLINK | ATTRIBUTE_LINK_TARGET | ATTRIBUTE_ACCESSIBLE; #else return ATTRIBUTE_READ_ONLY | ATTRIBUTE_EXECUTABLE; #endif @@ -101,7 +101,12 @@ mid = (*env)->GetMethodID(env, cls, "setExists", "(Z)V"); if (mid == 0) return JNI_FALSE; (*env)->CallVoidMethod(env, fileInfo, mid, JNI_TRUE); - + + // set accessible attribute + mid = (*env)->GetMethodID(env, cls, "setAttribute", "(IZ)V"); + if (mid == 0) return JNI_FALSE; + (*env)->CallVoidMethod(env, fileInfo, mid, ATTRIBUTE_ACCESSIBLE, JNI_TRUE); + // last modified mid = (*env)->GetMethodID(env, cls, "setLastModified", "(J)V"); if (mid == 0) return JNI_FALSE; @@ -156,6 +161,31 @@ mid = (*env)->GetMethodID(env, cls, "setStringAttribute", "(ILjava/lang/String;)V"); if (mid == 0) return JNI_FALSE; (*env)->CallVoidMethod(env, fileInfo, mid, ATTRIBUTE_LINK_TARGET, linkTarget); + + return JNI_TRUE; +} + +/* + * Set exists and non accessible in IFileInfo + */ +jboolean setExistsNonAccessibleInFileInfo (JNIEnv *env, jobject fileInfo) { + jclass cls; + jmethodID mid; + + cls = (*env)->GetObjectClass(env, fileInfo); + if (cls == 0) return JNI_FALSE; + + // exists + mid = (*env)->GetMethodID(env, cls, "setExists", "(Z)V"); + if (mid == 0) return JNI_FALSE; + (*env)->CallVoidMethod(env, fileInfo, mid, JNI_TRUE); + + // set accessible attribute to false + mid = (*env)->GetMethodID(env, cls, "setAttribute", "(IZ)V"); + if (mid == 0) return JNI_FALSE; + (*env)->CallVoidMethod(env, fileInfo, mid, ATTRIBUTE_ACCESSIBLE, JNI_FALSE); + + return JNI_TRUE; } #endif @@ -175,10 +205,10 @@ /* get stat */ name = getByteArray(env, target); #if defined(EFS_SYMLINK_SUPPORT) - //do an lstat first to see if it is a symbolic link + // do an lstat first to see if it is a symbolic link code = lstat((const char*)name, &info); if (code == 0 && (info.st_mode & S_IFLNK) == S_IFLNK) { - //symbolic link: read link target + // symbolic link: read link target char buf[PATH_MAX+1]; int len; jbyteArray barr; @@ -192,15 +222,20 @@ linkTarget = getString(env, barr); setSymlinkInFileInfo(env, fileInfo, linkTarget); - //stat link target (will fail for broken links) + // stat link target code = stat((const char*)name, &info); + + // link is broken + if (code == -1) { + return setExistsNonAccessibleInFileInfo(env, fileInfo); + } } #else code = stat((const char*)name, &info); #endif free(name); - /* test if an error occurred */ + // test if an error occurred if (code == -1) return 0; return convertStatToFileInfo(env, info, fileInfo); Index: src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.filesystem/src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java,v retrieving revision 1.18 diff -u -r1.18 LocalFileSystem.java --- src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java 27 Jun 2007 18:17:56 -0000 1.18 +++ src/org/eclipse/core/internal/filesystem/local/LocalFileSystem.java 19 Oct 2009 15:30:47 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2007 IBM Corporation and others. + * Copyright (c) 2005, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -97,11 +97,11 @@ String os = getOS(); String arch = System.getProperty("osgi.arch", ""); //$NON-NLS-1$ //$NON-NLS-2$ if (os.equals(Constants.OS_WIN32)) - attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN; + attributes |= EFS.ATTRIBUTE_ARCHIVE | EFS.ATTRIBUTE_HIDDEN | EFS.ATTRIBUTE_ACCESSIBLE; else if (os.equals(Constants.OS_LINUX) || (os.equals(Constants.OS_SOLARIS) && arch.equals(Constants.ARCH_SPARC))) - attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET; + attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_SYMLINK | EFS.ATTRIBUTE_LINK_TARGET | EFS.ATTRIBUTE_ACCESSIBLE; else if (os.equals(Constants.OS_MACOSX) || os.equals(Constants.OS_HPUX) || os.equals(Constants.OS_QNX)) - attributes |= EFS.ATTRIBUTE_EXECUTABLE; + attributes |= EFS.ATTRIBUTE_EXECUTABLE | EFS.ATTRIBUTE_ACCESSIBLE; return attributes; } Index: src/org/eclipse/core/filesystem/provider/FileInfo.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.filesystem/src/org/eclipse/core/filesystem/provider/FileInfo.java,v retrieving revision 1.12 diff -u -r1.12 FileInfo.java --- src/org/eclipse/core/filesystem/provider/FileInfo.java 7 Apr 2008 08:55:39 -0000 1.12 +++ src/org/eclipse/core/filesystem/provider/FileInfo.java 19 Oct 2009 15:30:47 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2008 IBM Corporation and others. + * Copyright (c) 2005, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -35,7 +35,7 @@ /** * Bit field of file attributes */ - private int attributes = 0; + private int attributes = EFS.ATTRIBUTE_ACCESSIBLE; /** * The last modified time. Index: natives/unix/linux/Makefile_new =================================================================== RCS file: natives/unix/linux/Makefile_new diff -N natives/unix/linux/Makefile_new --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ natives/unix/linux/Makefile_new 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,32 @@ +#********************************************************************** +# Copyright (c) 2000, 2004 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +#********************************************************************** +# +# makefile for libcore.so + +CORE.C = ../localfile.c +CORE.O = localfile.o +LIB_NAME = liblocalfile.so +LIB_NAME_FULL = liblocalfile_1_0_0.so + +#Set this to be your OS type +OS_TYPE = linux + +#Set this to be the location of your JRE +JAVA_HOME = /home/tzarna/java_install/j2sdk1.4.2_17 + +JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE} +COMMON_INCLUDE = -I include +#OPT_FLAGS=-g +OPT_FLAGS=-O -s -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + +core : + gcc $(OPT_FLAGS) -fPIC -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C) + gcc $(OPT_FLAGS) -shared -Wl,-soname,$(LIB_NAME) -o $(LIB_NAME_FULL) $(CORE.O) -lc + +clean : + rm *.o *.so #P org.eclipse.core.resources Index: src/org/eclipse/core/resources/IResource.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/resources/IResource.java,v retrieving revision 1.106 diff -u -r1.106 IResource.java --- src/org/eclipse/core/resources/IResource.java 9 Oct 2009 16:36:35 -0000 1.106 +++ src/org/eclipse/core/resources/IResource.java 19 Oct 2009 15:30:49 -0000 @@ -1595,9 +1595,9 @@ /** * Returns whether this resource is accessible. For files and folders, - * this is equivalent to existing; for projects, - * this is equivalent to existing and being open. The workspace root - * is always accessible. + * this is equivalent to existing and having reachable content; for projects, + * this is equivalent to existing, being open and having reachable content. + * The workspace root is always accessible. * * @returntrue if this resource is accessible, and
* false otherwise
Index: src/org/eclipse/core/resources/ResourceAttributes.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/resources/ResourceAttributes.java,v
retrieving revision 1.13
diff -u -r1.13 ResourceAttributes.java
--- src/org/eclipse/core/resources/ResourceAttributes.java 7 Apr 2008 08:55:44 -0000 1.13
+++ src/org/eclipse/core/resources/ResourceAttributes.java 19 Oct 2009 15:30:49 -0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2008 Red Hat Incorporated and others
+ * Copyright (c) 2004, 2009 Red Hat Incorporated and others
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -103,7 +103,7 @@
}
/**
- * Returns whether this ResourceAttributes object is marked read only.
+ * Returns whether this ResourceAttributes object is marked as symbolic link.
*
* @return true if this resource is marked as symbolic link,
* false otherwise
@@ -115,6 +115,18 @@
}
/**
+ * Returns whether this ResourceAttributes object is marked as accessible.
+ *
+ * @return true if this resource is marked as accessible,
+ * false otherwise
+ * @see #setAccessible(boolean)
+ * @since 3.6
+ */
+ public boolean isAccessible() {
+ return (attributes & EFS.ATTRIBUTE_ACCESSIBLE) != 0;
+ }
+
+ /**
* Sets or unsets whether this ResourceAttributes object is marked archive.
*
* @param archive true to set it to be archive,
@@ -182,6 +194,18 @@
}
/**
+ * Sets or unsets whether this ResourceAttributes object is marked as accessible.
+ *
+ * @param accessible true to set it to be marked as accessible,
+ * false to unset
+ * @see #isAccessible()
+ * @since 3.6
+ */
+ public void setAccessible(boolean accessible) {
+ set(EFS.ATTRIBUTE_ACCESSIBLE, accessible);
+ }
+
+ /**
* Returns a string representation of the attributes, suitable
* for debugging purposes only.
*/
Index: src/org/eclipse/core/internal/resources/Resource.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/resources/Resource.java,v
retrieving revision 1.172
diff -u -r1.172 Resource.java
--- src/org/eclipse/core/internal/resources/Resource.java 9 Oct 2009 16:36:35 -0000 1.172
+++ src/org/eclipse/core/internal/resources/Resource.java 19 Oct 2009 15:30:49 -0000
@@ -1436,7 +1436,11 @@
* @see IResource#isAccessible()
*/
public boolean isAccessible() {
- return exists();
+ if (exists()) {
+ ResourceAttributes attributes = getLocalManager().attributes(this);
+ return attributes != null && attributes.isAccessible();
+ }
+ return false;
}
/* (non-Javadoc)
Index: src/org/eclipse/core/internal/utils/FileUtil.java
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.core.resources/src/org/eclipse/core/internal/utils/FileUtil.java,v
retrieving revision 1.19
diff -u -r1.19 FileUtil.java
--- src/org/eclipse/core/internal/utils/FileUtil.java 17 Nov 2008 04:21:23 -0000 1.19
+++ src/org/eclipse/core/internal/utils/FileUtil.java 19 Oct 2009 15:30:49 -0000
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
+ * Copyright (c) 2005, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -144,6 +144,7 @@
attributes.setExecutable(fileInfo.getAttribute(EFS.ATTRIBUTE_EXECUTABLE));
attributes.setHidden(fileInfo.getAttribute(EFS.ATTRIBUTE_HIDDEN));
attributes.setSymbolicLink(fileInfo.getAttribute(EFS.ATTRIBUTE_SYMLINK));
+ attributes.setAccessible(fileInfo.getAttribute(EFS.ATTRIBUTE_ACCESSIBLE));
return attributes;
}
#P org.eclipse.ui.ide
Index: plugin.xml
===================================================================
RCS file: /cvsroot/eclipse/org.eclipse.ui.ide/plugin.xml,v
retrieving revision 1.287
diff -u -r1.287 plugin.xml
--- plugin.xml 24 Apr 2009 17:30:51 -0000 1.287
+++ plugin.xml 19 Oct 2009 15:30:55 -0000
@@ -349,6 +349,23 @@