Attachment #169979 for bug #314448

View | Details | Raw Unified | Return to bug 314448
Collapse All | Expand All

Lines 7-12 Link Here

(-)natives/unix/unixfile.c (-1 / +5 lines)
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* Martin Oberhuber (Wind River) - [314448] error on exists() for non-accessible
10	*******************************************************************************/	11	*******************************************************************************/
11		12
12	#include <stdlib.h>	13	#include <stdlib.h>
Lines 138-143 Link Here
138	* Class: org_eclipse_core_internal_filesystem_local_unix_UnixFileNatives	139	* Class: org_eclipse_core_internal_filesystem_local_unix_UnixFileNatives
139	* Method: lstat	140	* Method: lstat
140	* Signature: ([BLorg/eclipse/core/internal/filesystem/local/unix/StructStat;)I	141	* Signature: ([BLorg/eclipse/core/internal/filesystem/local/unix/StructStat;)I
		142	* returns: 0 on success, -1 on error converting to Java, -2 if file does not exist, or errno code on file access error
141	*/	143	*/
142	JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_filesystem_local_unix_UnixFileNatives_lstat	144	JNIEXPORT jint JNICALL Java_org_eclipse_core_internal_filesystem_local_unix_UnixFileNatives_lstat
143	(JNIEnv *env, jclass clazz, jbyteArray path, jobject buf)	145	(JNIEnv *env, jclass clazz, jbyteArray path, jobject buf)
Lines 151-158 Link Here
151	free(name);	153	free(name);
152	if (code != -1)	154	if (code != -1)
153	return convertStatToObject(env, info, buf);	155	return convertStatToObject(env, info, buf);
		156	else if (errno == ENOENT)
		157	return -2; /* file does not exist */
154	else	158	else
155	return code;	159	return errno;
156	}	160	}
157		161
158	/*	162	/*




 * Contributors:
 *     IBM Corporation - initial API and implementation
 * Martin Oberhuber (Wind River) - [294429] Avoid substring baggage in FileInfo
 * Martin Oberhuber (Wind River) - [314448] error on exists() for non-accessible
 *******************************************************************************/
package org.eclipse.core.internal.filesystem.local;


		return file.equals(otherFile.file);
	}

	public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
		if (LocalFileNativesManager.isUsingNatives()) {
			FileInfo info = LocalFileNativesManager.fetchFileInfo(filePath);
			//natives don't set the file name on all platforms

		if (monitor.isCanceled()) {
			throw new OperationCanceledException();
		}
		if (target.delete())
			return true;
		if (target.isDirectory()) {
			monitor.subTask(NLS.bind(Messages.deleting, target));

				return false;
			}
		}
		//if we got this far, we failed or the file never existed 
		String message = null;
		try {
			IFileInfo info = fetchInfo(EFS.NONE, monitor);
			if (!info.exists())
				return true;
			else if (info.getAttribute(EFS.ATTRIBUTE_READ_ONLY))
				message = NLS.bind(Messages.couldnotDeleteReadOnly, target.getAbsolutePath());
			else
				message = NLS.bind(Messages.couldnotDelete, target.getAbsolutePath());
			status.add(new Status(IStatus.ERROR, Policy.PI_FILE_SYSTEM, EFS.ERROR_DELETE, message, null));
		} catch (CoreException ce) {
			status.add(ce.getStatus());
		}
		return false;
	}





 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 * Martin Oberhuber (Wind River) - [314448] error on exists() for non-accessible
 *******************************************************************************/
package org.eclipse.core.internal.filesystem.local;

import org.eclipse.core.filesystem.IFileInfo;
import org.eclipse.core.filesystem.provider.FileInfo;
import org.eclipse.core.internal.filesystem.local.unix.UnixFileNatives;
import org.eclipse.core.runtime.CoreException;

/**
 * Dispatches methods backed by native code to the appropriate platform specific 

		return LocalFileNatives.attributes();
	}

	public static FileInfo fetchFileInfo(String fileName) throws CoreException {
		if (UnixFileNatives.isUsingNatives())
			return UnixFileNatives.fetchFileInfo(fileName);
		return LocalFileNatives.fetchFileInfo(fileName);




 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 * Martin Oberhuber (Wind River) - [314448] error on exists() for non-accessible
 *******************************************************************************/
package org.eclipse.core.internal.filesystem.local.unix;


import org.eclipse.core.filesystem.provider.FileInfo;
import org.eclipse.core.internal.filesystem.*;
import org.eclipse.core.internal.filesystem.local.Convert;
import org.eclipse.core.runtime.*;
import org.eclipse.osgi.util.NLS;

public abstract class UnixFileNatives {

		return ret;
	}

	public static FileInfo fetchFileInfo(String fileName) throws CoreException {
		FileInfo info = null;
		byte[] name = fileNameToBytes(fileName);
		StructStat stat = new StructStat();
		int errno = lstat(name, stat);
		if (errno == 0) {
			if ((stat.st_mode & UnixFileFlags.S_IFMT) == UnixFileFlags.S_IFLNK) {
				if (stat(name, stat) == 0)
					info = stat.toFileInfo();

					info.setStringAttribute(EFS.ATTRIBUTE_LINK_TARGET, bytesToFileName(target, (int) length));
			} else
				info = stat.toFileInfo();
		} else if (errno == -2) {
			//file does not exist
			info = new FileInfo();
		} else {
			throw new CoreException(new Status(IStatus.ERROR, Policy.PI_FILE_SYSTEM, EFS.ERROR_READ, "errno: " + info, null)); //$NON-NLS-1$
		}
		return info;
	}


Return to bug 314448

Lines 8-13 Link Here

(-)src/org/eclipse/core/internal/filesystem/local/LocalFile.java (-8 / +16 lines)
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
10	* Martin Oberhuber (Wind River) - [294429] Avoid substring baggage in FileInfo	10	* Martin Oberhuber (Wind River) - [294429] Avoid substring baggage in FileInfo
		11	* Martin Oberhuber (Wind River) - [314448] error on exists() for non-accessible
11	*******************************************************************************/	12	*******************************************************************************/
12	package org.eclipse.core.internal.filesystem.local;	13	package org.eclipse.core.internal.filesystem.local;
13		14
Lines 139-145 Link Here
139	return file.equals(otherFile.file);	140	return file.equals(otherFile.file);
140	}	141	}
141		142
142	public IFileInfo fetchInfo(int options, IProgressMonitor monitor) {	143	public IFileInfo fetchInfo(int options, IProgressMonitor monitor) throws CoreException {
143	if (LocalFileNativesManager.isUsingNatives()) {	144	if (LocalFileNativesManager.isUsingNatives()) {
144	FileInfo info = LocalFileNativesManager.fetchFileInfo(filePath);	145	FileInfo info = LocalFileNativesManager.fetchFileInfo(filePath);
145	//natives don't set the file name on all platforms	146	//natives don't set the file name on all platforms
Lines 212-218 Link Here
212	if (monitor.isCanceled()) {	213	if (monitor.isCanceled()) {
213	throw new OperationCanceledException();	214	throw new OperationCanceledException();
214	}	215	}
215	if (target.delete() \|\| !target.exists())	216	if (target.delete())
216	return true;	217	return true;
217	if (target.isDirectory()) {	218	if (target.isDirectory()) {
218	monitor.subTask(NLS.bind(Messages.deleting, target));	219	monitor.subTask(NLS.bind(Messages.deleting, target));
Lines 246-258 Link Here
246	return false;	247	return false;
247	}	248	}
248	}	249	}
249	//if we got this far, we failed	250	//if we got this far, we failed or the file never existed
250	String message = null;	251	String message = null;
251	if (fetchInfo().getAttribute(EFS.ATTRIBUTE_READ_ONLY))	252	try {
252	message = NLS.bind(Messages.couldnotDeleteReadOnly, target.getAbsolutePath());	253	IFileInfo info = fetchInfo(EFS.NONE, monitor);
253	else	254	if (!info.exists())
254	message = NLS.bind(Messages.couldnotDelete, target.getAbsolutePath());	255	return true;
255	status.add(new Status(IStatus.ERROR, Policy.PI_FILE_SYSTEM, EFS.ERROR_DELETE, message, null));	256	else if (info.getAttribute(EFS.ATTRIBUTE_READ_ONLY))
		257	message = NLS.bind(Messages.couldnotDeleteReadOnly, target.getAbsolutePath());
		258	else
		259	message = NLS.bind(Messages.couldnotDelete, target.getAbsolutePath());
		260	status.add(new Status(IStatus.ERROR, Policy.PI_FILE_SYSTEM, EFS.ERROR_DELETE, message, null));
		261	} catch (CoreException ce) {
		262	status.add(ce.getStatus());
		263	}
256	return false;	264	return false;
257	}	265	}
258		266