Browse Source

HADOOP-9193. hadoop script can inadvertently expand wildcard arguments when delegating to hdfs script. (Andy Isaacson via tgraves)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1441499 13f79535-47bb-0310-9956-ffa450edef68
Thomas Graves 12 years ago
parent
commit
792c5e1752

+ 3 - 0
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -50,6 +50,9 @@ Release 0.23.7 - UNRELEASED
     webhdfs filesystem and fsck to fail when security is on  (Arpit Gupta
     via tgraves)
 
+    HADOOP-9193. hadoop script can inadvertently expand wildcard arguments
+    when delegating to hdfs script. (Andy Isaacson via tgraves)
+
 Release 0.23.6 - UNRELEASED
 
   INCOMPATIBLE CHANGES

+ 4 - 4
hadoop-common-project/hadoop-common/src/main/bin/hadoop

@@ -56,9 +56,9 @@ case $COMMAND in
     echo "" 1>&2
     #try to locate hdfs and if present, delegate to it.  
     if [ -f "${HADOOP_HDFS_HOME}"/bin/hdfs ]; then
-      exec "${HADOOP_HDFS_HOME}"/bin/hdfs $*
+      exec "${HADOOP_HDFS_HOME}"/bin/hdfs "$@"
     elif [ -f "${HADOOP_PREFIX}"/bin/hdfs ]; then
-      exec "${HADOOP_PREFIX}"/bin/hdfs $*
+      exec "${HADOOP_PREFIX}"/bin/hdfs "$@"
     else
       echo "HADOOP_HDFS_HOME not found!"
       exit 1
@@ -72,9 +72,9 @@ case $COMMAND in
     echo "" 1>&2
     #try to locate mapred and if present, delegate to it.
     if [ -f "${HADOOP_MAPRED_HOME}"/bin/mapred ]; then
-      exec "${HADOOP_MAPRED_HOME}"/bin/mapred $*
+      exec "${HADOOP_MAPRED_HOME}"/bin/mapred "$@"
     elif [ -f "${HADOOP_PREFIX}"/bin/mapred ]; then
-      exec "${HADOOP_PREFIX}"/bin/mapred $*
+      exec "${HADOOP_PREFIX}"/bin/mapred "$@"
     else
       echo "HADOOP_MAPRED_HOME not found!"
       exit 1