Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CommandBuilder: Use more robust quoting #1540

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open

CommandBuilder: Use more robust quoting #1540

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
87f5564
CommandBuilder: Use more robust quoting
Artoria2e5 Jun 5, 2022
25e9113
fixup! so it's more like C... (SQUASH MERGE!)
Artoria2e5 Jun 5, 2022
b031549
fixup! missed a step!
Artoria2e5 Jun 5, 2022
9c610b6
fixup! 为什么我要打开这个悲伤的网站
Artoria2e5 Jun 5, 2022
cfc495e
Merge branch 'javafx' into patch-5
Artoria2e5 Aug 8, 2023
f6898ff
Merge remote-tracking branch 'upstream/javafx' into patch-5
Glavo Jan 23, 2024
0b07cf7
fix build
Glavo Jan 23, 2024
87e1f45
update
Glavo Jan 23, 2024
3b9c722
fix build
Glavo Jan 23, 2024
c1b714d
update
Glavo Jan 23, 2024
b2b1e2f
update
Glavo Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/CommandBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@

import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.regex.Matcher;
Expand Down Expand Up @@ -297,7 +299,14 @@ private static String escape(String str, char... escapeChars) {
}

public static String toBatchStringLiteral(String s) {
return containsEscape(s, " \t\"^&<>|") ? '"' + escape(s, '\\', '"') + '"' : s;
String escape = " \t\"^&<>|?*";
if (containsEscape(s, escape))
// The argument has not been quoted, add quotes.
// See explanation at https://github.com/Artoria2e5/node/blob/fix!/child-process-args/lib/child_process.js
// about making the string "inert to CMD", and associated unit tests
return '"' + s.replaceAll("(\\\\*)($|\")\"", "$1$1$2").replace("\"", "\"\"") + '"';
else
return s;
}

public static String toShellStringLiteral(String s) {
Expand Down