Fixing symlink handling logic.

Need to actually read the symlink :-(


BUG=None
TEST=None
R=noelallen@google.com
Review URL: http://codereview.chromium.org/8743004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112129 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 6 deletions

diff --git a/native_client_sdk/src/build_tools/nsis_script.py b/native_client_sdk/src/build_tools/nsis_script.py
index f34f211..f670659 100644
--- a/native_client_sdk/src/build_tools/nsis_script.py
+++ b/native_client_sdk/src/build_tools/nsis_script.py
@@ -90,18 +90,22 @@ class NsisScript(path_set.PathSet):
     if file_filter:
       self._files = set(file_filter(self._files))
 
-    def IsCygwinSymlink(path):
+    def ReadCygwinSymlink(path):
       if not os.path.isfile(path):
-        return False
-      data = open(path, 'rb').read(10)
-      return data == '!<symlink>'
+        return None
+      header = open(path, 'rb').read(12)
+      if header != '!<symlink>\xff\xfe':
+        return None
+      data = open(path, 'rb').read()[12:]
+      return ''.join([ch for ch in data if ch != '\x00'])
 
     # Pick out cygwin symlinks.
     all_files = self._files
     self._files = set()
     for f in all_files:
-      if IsCygwinSymlink(f):
-        self._symlinks.add(f)
+      link = ReadCygwinSymlink(f)
+      if link:
+        self._symlinks[f] = link
       else:
         self._files.add(f)