Thanks to visit codestin.com
Credit goes to github.com

Skip to content

printenv skips environment variables with invalid UTF-8 #9702

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
Closed
sylvestre wants to merge 1 commit into from
Closed

printenv skips environment variables with invalid UTF-8 #9702

sylvestre wants to merge 1 commit into from
+72 −7

Conversation

@sylvestre
Copy link
Contributor

@sylvestre sylvestre commented Dec 18, 2025

closes: #9701

@github-actions
Copy link

github-actions bot commented Dec 18, 2025

GNU testsuite comparison:

Congrats! The gnu test tests/tail/inotify-dir-recreate is now passing!

@sylvestre sylvestre force-pushed the printenv branch 2 times, most recently from 7bc8beb to 8c5873a Compare December 18, 2025 21:47
@github-actions
Copy link

github-actions bot commented Dec 18, 2025

GNU testsuite comparison:

Congrats! The gnu test tests/misc/nohup is no longer failing!
Note: The gnu test tests/tail/inotify-dir-recreate is now being skipped but was previously passing.

@github-actions
Copy link

github-actions bot commented Dec 18, 2025

GNU testsuite comparison:

Congrats! The gnu test tests/tail/inotify-dir-recreate is now passing!

@github-actions
Copy link

github-actions bot commented Dec 19, 2025

GNU testsuite comparison:

Note: The gnu test tests/tail/inotify-dir-recreate is now being skipped but was previously passing.

cakebaker
cakebaker reviewed Dec 19, 2025
View reviewed changes
tests/by-util/test_printenv.rs
Comment on lines +5 to +8
#[cfg(unix)]
use std::ffi::OsString;
#[cfg(unix)]
use std::os::unix::ffi::OsStringExt;
Copy link
Contributor

@cakebaker cakebaker Dec 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would move the imports to the test function, otherwise there are "unused import" warnings on Android and the BSDs.

@ChrisDryden
Copy link
Collaborator

ChrisDryden commented Dec 19, 2025

I was thinking that for most of the code we can use a helper function like this:

  fn write_os_str(out: &mut impl Write, s: &OsStr) -> io::Result<()> {
      #[cfg(unix)]
      {
          use std::os::unix::ffi::OsStrExt;
          out.write_all(s.as_bytes())
      }
      #[cfg(not(unix))]
      {
          // On Windows, OsString to_string_lossy is lossless
          out.write_all(s.to_string_lossy().as_bytes())
      }
  }

So everything can be kept as OsString, then in all of the functions they have the same code path without having the inline cfg stuff. Would be good to have most of our code move away from String by default through this too

@ChrisDryden
Copy link
Collaborator

ChrisDryden commented Dec 19, 2025

Hey this helper function actually already exists in: write_all_os

coreutils/src/uucore/src/lib/mods/display.rs

Line 115 in 16f7350

fn write_all_os(&mut self, buf: &OsStr) -> io::Result<()> {

@ChrisDryden ChrisDryden mentioned this pull request Dec 19, 2025
Merged
@ChrisDryden
Copy link
Collaborator

ChrisDryden commented Dec 19, 2025

To make an example of how it could be used here I made a PR doing the similar thing for the env command: #9144

Makes the implementation way smaller compared to the inlining

@asder8215
Copy link
Contributor

asder8215 commented Dec 19, 2025

I think you accidentally referenced the wc PR, think you meant this #9726?

@sylvestre sylvestre mentioned this pull request Dec 19, 2025
Merged
@sylvestre sylvestre closed this Dec 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cakebaker cakebaker cakebaker left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

printenv skips environment variables with invalid UTF-8

4 participants

@sylvestre @ChrisDryden @asder8215 @cakebaker