Make the ContainerTreeIterator recognize symbolic links

We cannot rely on Eclipse's resource handling here since it
looks at the link target rather than the link itself.

Change-Id: I94bfd493805478f2a232229ce6d25a0d810bfd0f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 60 insertions, 32 deletions

diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
index 13056b3f95..377db469f3 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
@@ -9,6 +9,7 @@
 
 package org.eclipse.egit.core;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -288,28 +289,39 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
 			rsrc = f;
 			this.hasInheritedResourceFilters = hasInheritedResourceFilters;
 
-			switch (f.getType()) {
-			case IResource.FILE:
+			FileMode mode = null;
+			try {
 				File file = asFile();
-				if (FS.DETECTED.supportsExecute() && file != null
-						&& FS.DETECTED.canExecute(file))
-					mode = FileMode.EXECUTABLE_FILE;
-				else
-					mode = FileMode.REGULAR_FILE;
-				break;
-			case IResource.PROJECT:
-			case IResource.FOLDER: {
-				final IContainer c = (IContainer) f;
-				if (c.findMember(Constants.DOT_GIT) != null)
-					mode = FileMode.GITLINK;
-				else
-					mode = FileMode.TREE;
-				break;
-			}
-			default:
+				if (FS.DETECTED.supportsSymlinks() && file != null
+						&& FS.DETECTED.isSymLink(file))
+					mode = FileMode.SYMLINK;
+				else {
+					switch (f.getType()) {
+					case IResource.FILE:
+						if (FS.DETECTED.supportsExecute()
+									&& FS.DETECTED.canExecute(file))
+								mode = FileMode.EXECUTABLE_FILE;
+							else
+								mode = FileMode.REGULAR_FILE;
+						break;
+					case IResource.PROJECT:
+					case IResource.FOLDER: {
+						final IContainer c = (IContainer) f;
+						if (c.findMember(Constants.DOT_GIT) != null)
+							mode = FileMode.GITLINK;
+						else
+							mode = FileMode.TREE;
+						break;
+					}
+					default:
+						mode = FileMode.MISSING;
+						break;
+					}
+				}
+			} catch (IOException e) {
 				mode = FileMode.MISSING;
-				break;
 			}
+			this.mode = mode;
 		}
 
 		@Override
@@ -328,12 +340,16 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
 		@Override
 		public long getLength() {
 			if (length < 0)
-				if (rsrc instanceof IFile) {
-					File file = asFile();
-					if (file != null)
-						length = file.length();
-					else
+				if (rsrc instanceof IFile || mode == FileMode.SYMLINK) {
+					try {
+						File file = asFile();
+						if (file != null)
+							length = FS.DETECTED.length(asFile());
+						else
+							length = 0;
+					} catch (IOException e) {
 						length = 0;
+					}
 				} else
 					length = 0;
 			return length;
@@ -341,19 +357,31 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
 
 		@Override
 		public long getLastModified() {
+			if (mode == FileMode.SYMLINK) {
+				try {
+					return FS.DETECTED.lastModified(asFile());
+				} catch (IOException e) {
+					return 0;
+				}
+			}
 			return rsrc.getLocalTimeStamp();
 		}
 
 		@Override
 		public InputStream openInputStream() throws IOException {
-			if (rsrc.getType() == IResource.FILE)
-				try {
-					return ((IFile) rsrc).getContents(true);
-				} catch (CoreException err) {
-					final IOException ioe = new IOException(err.getMessage());
-					ioe.initCause(err);
-					throw ioe;
-				}
+			if (mode == FileMode.SYMLINK) {
+				return new ByteArrayInputStream(FS.DETECTED.readSymLink(
+						asFile()).getBytes(Constants.CHARACTER_ENCODING));
+			} else {
+				if (rsrc.getType() == IResource.FILE)
+					try {
+						return ((IFile) rsrc).getContents(true);
+					} catch (CoreException err) {
+						final IOException ioe = new IOException(err.getMessage());
+						ioe.initCause(err);
+						throw ioe;
+					}
+			}
 			throw new IOException("Not a regular file: " + rsrc);  //$NON-NLS-1$
 		}