HADOOP-3539. Merge -r 668861:668862 from trunk to branch 0.18.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.18@668863 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -608,6 +608,9 @@ Release 0.18.0 - Unreleased
     HADOOP-3575. Fix the clover ant target after package refactoring.
     (Nigel Daley via cdouglas)
 
+    HADOOP-3539.  Fix the tool path in the bin/hadoop script under
+    cygwin. (Tsz Wo (Nicholas), Sze via omalley)
+
 Release 0.17.1 - Unreleased
 
   INCOMPATIBLE CHANGES

bin/hadoop

@@ -167,7 +167,7 @@ if $cygwin; then
   CLASSPATH=`cygpath -p -w "$CLASSPATH"`
   HADOOP_HOME=`cygpath -d "$HADOOP_HOME"`
   HADOOP_LOG_DIR=`cygpath -d "$HADOOP_LOG_DIR"`
-  TOOL_PATH=`cygpath -d "$TOOL_PATH"`
+  TOOL_PATH=`cygpath -p -w "$TOOL_PATH"`
 fi
 # setup 'java.library.path' for native-hadoop code if necessary
 JAVA_LIBRARY_PATH=''