Merge pull request #4113 from sylvestre/var-env

Weird env variable names should trigger an error.
This commit is contained in:
Terts Diepraam 2022-11-06 21:29:31 +01:00 committed by GitHub
commit 526cbae9ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 3 deletions

View file

@ -40,16 +40,21 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
return Ok(());
}
let mut not_found = false;
let mut error_found = false;
for env_var in variables {
// we silently ignore a=b as variable but we trigger an error
if env_var.contains('=') {
error_found = true;
continue;
}
if let Ok(var) = env::var(env_var) {
print!("{}{}", var, separator);
} else {
not_found = true;
error_found = true;
}
}
if not_found {
if error_found {
Err(1.into())
} else {
Ok(())

View file

@ -28,3 +28,12 @@ fn test_get_var() {
assert!(!result.stdout_str().is_empty());
assert_eq!(result.stdout_str().trim(), "VALUE");
}
#[test]
fn test_ignore_equal_var() {
let scene = TestScenario::new(util_name!());
// tested by gnu/tests/misc/printenv.sh
let result = scene.ucmd().env("a=b", "c").arg("a=b").fails();
assert!(result.stdout_str().is_empty());
}