Merge pull request #3665 from obrie/fix/device_name_sanitization

Fix device name sanitization within ES controller configscripts

Author: joolswills

scriptmodules/supplementary/emulationstation/configscripts/mupen64plus.sh

@@ -230,8 +230,9 @@ function onend_mupen64plus_joystick() {
     if [[ -f "$file" ]]; then
         # backup current config file
         cp "$file" "${file}.bak"
-        sed -i /"${DEVICE_NAME}_START"/,/"${DEVICE_NAME}_END"/d "$file"
-        if grep -q "$DEVICE_NAME" "$file" ; then
+        local escaped_device_name=$(echo "$DEVICE_NAME" | sed 's|[]\[^$.*/]|\\&|g')
+        sed -i /"${escaped_device_name}_START"/,/"${escaped_device_name}_END"/d "$file"
+        if grep -Fq "$DEVICE_NAME" "$file" ; then
             rm /tmp/mp64tempconfig.cfg
             return
         fi

scriptmodules/supplementary/emulationstation/configscripts/openmsx.sh

@@ -150,7 +150,7 @@ function onend_openmsx_joystick() {
     local conf
 
     # sanitize filename
-    conf=${DEVICE_NAME//[\?\<\>\\\/:\*\|]/}
+    conf=${DEVICE_NAME//[:><?\"\/\\|*]/}
 
     mkdir -p "$home/.openMSX/share/joystick/game"
     cat > "$home/.openMSX/share/joystick/${conf}.tcl" <<_EOF_

scriptmodules/supplementary/emulationstation/configscripts/reicast.sh

@@ -20,7 +20,7 @@ function onstart_reicast_joystick() {
             file="$configdir/dreamcast/mappings/controller_xboxdrv.cfg"
             ;;
         *)
-            file="$configdir/dreamcast/mappings/evdev_${DEVICE_NAME//[:><?\"]/-}.cfg"
+            file="$configdir/dreamcast/mappings/evdev_${DEVICE_NAME//[:><?\"\/\\|*]/-}.cfg"
             ;;
     esac
 
@@ -221,7 +221,7 @@ function onend_reicast_joystick() {
             file="$configdir/dreamcast/mappings/controller_xboxdrv.cfg"
             ;;
         *)
-            file="$configdir/dreamcast/mappings/evdev_${DEVICE_NAME//[:><?\"]/-}.cfg"
+            file="$configdir/dreamcast/mappings/evdev_${DEVICE_NAME//[:><?\"\/\\|*]/-}.cfg"
             ;;
     esac
 

scriptmodules/supplementary/emulationstation/configscripts/retroarch.sh

@@ -241,7 +241,7 @@ function map_retroarch_joystick() {
     declare -A hat_map=([1]="up" [2]="right" [4]="down" [8]="left")
     iniGet "input_driver"
     local input_driver="$ini_value"
-    local autoconfig_preset=$(grep -rwl "$rootdir/emulators/retroarch/autoconfig-presets/$input_driver" -e "$DEVICE_NAME" | head -1)
+    local autoconfig_preset=$(grep -rwFl "$rootdir/emulators/retroarch/autoconfig-presets/$input_driver" -e "$DEVICE_NAME" | head -1)
     for key in "${keys[@]}"; do
         case "$input_type" in
             hat)
@@ -387,7 +387,7 @@ function onend_retroarch_joystick() {
     done < <(grep -Fl "\"$DEVICE_NAME\"" "$dir/"*.cfg 2>/dev/null)
 
     # sanitise filename
-    file="${DEVICE_NAME//[\?\<\>\\\/:\*\|]/}.cfg"
+    file="${DEVICE_NAME//[:><?\"\/\\|*]/}.cfg"
 
     if [[ -f "$dir/$file" ]]; then
         mv "$dir/$file" "$dir/$file.bak"