[Scummvm-git-logs] scummvm master -> 11e486d631257ee9f85ba0e029fa37e76f68784d

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
09dfabf6c5 DEVTOOLS: COMPANION: Escape more shell characters
11e486d631 COMMON: Replace rindex() with more portable code


Commit: 09dfabf6c5c084de2a45f8e5067befb8a5973e70
    https://github.com/scummvm/scummvm/commit/09dfabf6c5c084de2a45f8e5067befb8a5973e70
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-01T14:51:04+02:00

Commit Message:
DEVTOOLS: COMPANION: Escape more shell characters

Changed paths:
    devtools/dumper-companion.pl


diff --git a/devtools/dumper-companion.pl b/devtools/dumper-companion.pl
index a3c7d08bbe..ef7ef4545a 100755
--- a/devtools/dumper-companion.pl
+++ b/devtools/dumper-companion.pl
@@ -193,7 +193,7 @@ sub processIso($) {
 				$prevlen = length "$dir$decfname";
 				flush STDOUT;
 
-				$fname =~ s/([*+\[\]\|<>&])/\\$1/g; # Files cound have special symbols in them, escape, so shell is happy
+				$fname =~ s/([*+\[\]\|<>&`\^\{\}\\])/\\$1/g; # Files cound have special symbols in them, escape, so shell is happy
 
 				if ($res != 0) {
 					system1("hcopy -m -- \"$mdir$fname\" \"$outPath$dir$decfname\"") == 0 or die "Can't execute hcopy";


Commit: 11e486d631257ee9f85ba0e029fa37e76f68784d
    https://github.com/scummvm/scummvm/commit/11e486d631257ee9f85ba0e029fa37e76f68784d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-01T14:51:04+02:00

Commit Message:
COMMON: Replace rindex() with more portable code

Changed paths:
    common/punycode.cpp


diff --git a/common/punycode.cpp b/common/punycode.cpp
index d382a834b1..a439f5db7d 100644
--- a/common/punycode.cpp
+++ b/common/punycode.cpp
@@ -304,7 +304,7 @@ String punycode_encodefilename(const String src) {
 			dst += '\x81';
 			dst += '\x79';
 		// Encode special symbols and non-printables
-		} else if (rindex("/\":*[]+|\\?%<>,;=", (byte)src[i]) || (byte)src[i] < 0x20) {
+		} else if (Common::String("/\":*[]+|\\?%<>,;=").contains(src[i]) || (byte)src[i] < 0x20) {
 			dst += '\x81';
 			dst += (byte)src[i] + '\x80';
 		} else {