Set LANG in spawnutils

greymd · Jan 24, 2024 · 1ba5bb7 · 1ba5bb7
1 parent 5ef80b2
commit 1ba5bb7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/spawnutils.rs b/src/spawnutils.rs
@@ -25,6 +25,7 @@ pub fn exec_cmd(
         return Ok((Box::new(io::sink()), Box::new(io::empty()), "".to_string()));
     }
     let child = Command::new(&cmds[0])
+        .env("LANG", "en_US.UTF-8")
         .args(&cmds[1..])
         .stdin(Stdio::piped())
         .stdout(Stdio::piped())
@@ -54,6 +55,7 @@ pub fn exec_cmd_sync_replace(input: String, cmds: &Vec<String>, line_end: u8, ch
         }
     }
     let child = Command::new(&cmds_new[0])
+        .env("LANG", "en_US.UTF-8")
         .args(&cmds_new[1..])
         .stdout(Stdio::piped())
         .spawn()
@@ -79,6 +81,7 @@ pub fn exec_cmd_sync_replace(input: String, cmds: &Vec<String>, line_end: u8, ch
 pub fn exec_cmd_sync(input: String, cmds: &Vec<String>, line_end: u8, chomp: bool) -> String {
     debug!("thread: exec_cmd_sync: {:?}", &cmds);
     let mut child = Command::new(&cmds[0])
+        .env("LANG", "en_US.UTF-8")
         .args(&cmds[1..])
         .stdin(Stdio::piped())
         .stdout(Stdio::piped())

diff --git a/tests/lib.rs b/tests/lib.rs
@@ -885,7 +885,6 @@ mod cmdtest {
             fn test_csv_double_quotation_utf8() {
                 let mut cmd = assert_cmd::Command::cargo_bin(env!("CARGO_PKG_NAME")).unwrap();
                 cmd.args(&["--csv", "-f", "2", "--", SED_CMD, "s/./@/g"])
-                    .env("LANG", "en_US.UTF-8")
                     .write_stdin("名前,\"作\"\"者\",ノート\n１レコード目,\"あ\"\"いう\"\"\nえお\",かきく\n２レコード目,\"\"\"さしす\n\"\"せそ\",\"たちつ\nてと\"\n")
                     .assert()
                     .stdout("名前,@@@@@@,ノート\n１レコード目,@@@@@@@@\n@@@,かきく\n２レコード目,@@@@@@\n@@@@@,\"たちつ\nてと\"\n");