Rollup merge of rust-lang#142091 - thaliaarchi:aix-getenv, r=workingjubilee

matthiaskrgr · web-flow · commit 9c895558ecb0 · 2025-06-06T00:58:48.000+02:00
Fix AIX build Fix rust-lang#141543. `getenv` was moved out of this file to `sys::env::getenv` in rust-lang#140143. Replace its usage with `std::env::var_os`, the publicly exposed version. This matches the other usages of the same function in this file.
diff --git a/library/std/src/sys/pal/unix/os.rs b/library/std/src/sys/pal/unix/os.rs
@@ -282,7 +282,7 @@ pub fn current_exe() -> io::Result<PathBuf> {
         return getcwd().map(|cwd| cwd.join(path))?.canonicalize();
     }
     // Search PATH to infer current_exe.
-    if let Some(p) = getenv(OsStr::from_bytes("PATH".as_bytes())) {
+    if let Some(p) = env::var_os(OsStr::from_bytes("PATH".as_bytes())) {
         for search_path in split_paths(&p) {
             let pb = search_path.join(&path);
             if pb.is_file()

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ pub fn current_exe() -> io::Result<PathBuf> {`
`282`	`282`	`return getcwd().map(\|cwd\| cwd.join(path))?.canonicalize();`
`283`	`283`	`}`
`284`	`284`	`// Search PATH to infer current_exe.`
`285`		`- if let Some(p) = getenv(OsStr::from_bytes("PATH".as_bytes())) {`
	`285`	`+ if let Some(p) = env::var_os(OsStr::from_bytes("PATH".as_bytes())) {`
`286`	`286`	`for search_path in split_paths(&p) {`
`287`	`287`	`let pb = search_path.join(&path);`
`288`	`288`	`if pb.is_file()`