fix(cd,mplayer): use _comp_{split,compgen}

Author: akinomyoga

completions/cd

@@ -30,10 +30,13 @@ _comp_cmd_cd()
     _comp_readline_variable_on mark-symlinked-directories && mark_symdirs=y
 
     # we have a CDPATH, so loop on its contents
-    for i in ${CDPATH//:/$'\n'}; do
+    local paths dirs
+    _comp_split -F : paths "$CDPATH"
+    for i in "${paths[@]}"; do
         # create an array of matched subdirs
         k=${#COMPREPLY[@]}
-        for j in $(compgen -d -- "$i/$cur"); do
+        _comp_compgen -v dirs -c "$i/$cur" -- -d
+        for j in "${dirs[@]}"; do
             if [[ ($mark_symdirs && -L $j || $mark_dirs && ! -L $j) && ! -d ${j#"$i/"} ]]; then
                 j+="/"
             fi

completions/mplayer

@@ -85,10 +85,11 @@ _comp_cmd_mplayer()
                 dirs=(/usr/share/mplayer/skins /usr/local/share/mplayer/skins)
             fi
 
-            local IFS=$'\n'
+            local -a subdirs
             for i in ~/.mplayer/skins "${dirs[@]}"; do
                 if [[ -d $i && -r $i ]]; then
-                    for j in $(compgen -d -- "$i/$cur"); do
+                    _comp_compgen -v subdirs -c "$i/$cur" -- -d
+                    for j in "${subdirs[@]}"; do
                         COMPREPLY[k++]=${j#"$i/"}
                     done
                 fi