mirrors/coreutils
1
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2025-12-23 08:47:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9726 from ChrisDryden/env-non-utf8

Browse source 
env: preserve non-UTF-8 environment variables and remove unwrap
This commit is contained in:
Daniel Hofstetter 2025-12-20 16:38:45 +01:00 • committed by GitHub
commit ebaae2e2d5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/uu/env/src/env.rs vendored
View file

@ -30,7 +30,7 @@ use std::os::unix::ffi::OsStrExt;
#[cfg(unix)]
use std::os::unix::process::CommandExt;
use uucore::display::Quotable;
use uucore::display::{OsWrite, Quotable};
use uucore::error::{ExitCode, UError, UResult, USimpleError, UUsageError};
use uucore::line_ending::LineEnding;
#[cfg(unix)]
@ -100,12 +100,16 @@ struct Options<'a> {
}
/// print `name=value` env pairs on screen
fn print_env(line_ending: LineEnding) {
fn print_env(line_ending: LineEnding) -> io::Result<()> {
let stdout_raw = io::stdout();
let mut stdout = stdout_raw.lock();
for (n, v) in env::vars() {
write!(stdout, "{n}={v}{line_ending}").unwrap();
for (n, v) in env::vars_os() {
stdout.write_all_os(&n)?;
stdout.write_all(b"=")?;
stdout.write_all_os(&v)?;
write!(stdout, "{line_ending}")?;
}
Ok(())
}
fn parse_name_value_opt<'a>(opts: &mut Options<'a>, opt: &'a OsStr) -> UResult<bool> {
@ -548,7 +552,7 @@ impl EnvAppData {
if opts.program.is_empty() {
// no program provided, so just dump all env vars to stdout
print_env(opts.line_ending);
print_env(opts.line_ending)?;
} else {
return self.run_program(&opts, self.do_debug_printing);
}

13
tests/by-util/test_env.rs
View file

@ -1862,3 +1862,16 @@ fn test_braced_variable_error_unexpected_character() {
.fails_with_code(125)
.stderr_contains("Unexpected character: '?'");
}
#[test]
#[cfg(unix)]
fn test_non_utf8_env_vars() {
use std::ffi::OsString;
use std::os::unix::ffi::OsStringExt;
let non_utf8_value = OsString::from_vec(b"hello\x80world".to_vec());
new_ucmd!()
.env("NON_UTF8_VAR", &non_utf8_value)
.succeeds()
.stdout_contains_bytes(b"NON_UTF8_VAR=hello\x80world");
}