Merge branch 'main' into date_11044

Author: mattsu2020

src/uu/nohup/src/nohup.rs

@@ -150,12 +150,12 @@ fn find_stdout() -> UResult<File> {
             Ok(t)
         }
         Err(e1) => {
-            let Some(home) = env::var_os("HOME") else {
+            let Ok(home) = env::var("HOME") else {
                 return Err(NohupError::OpenFailed(internal_failure_code, e1).into());
             };
             let mut homeout = PathBuf::from(home);
             homeout.push(NOHUP_OUT);
-            let homeout_str = homeout.to_string_lossy();
+            let homeout_str = homeout.to_str().unwrap();
             match OpenOptions::new().create(true).append(true).open(&homeout) {
                 Ok(t) => {
                     show_error!(

src/uu/touch/src/touch.rs

@@ -622,14 +622,21 @@ fn try_futimens_via_write_fd(path: &Path, atime: FileTime, mtime: FileTime) -> s
     let mtime_sec = mtime.unix_seconds();
     let mtime_nsec = i64::from(mtime.nanoseconds());
 
+    #[cfg(target_pointer_width = "32")]
     let atime_spec = TimeSpec::new(
         atime_sec.try_into().unwrap(),
         atime_nsec.try_into().unwrap(),
     );
+    #[cfg(target_pointer_width = "64")]
+    let atime_spec = TimeSpec::new(atime_sec, atime_nsec);
+
+    #[cfg(target_pointer_width = "32")]
     let mtime_spec = TimeSpec::new(
         mtime_sec.try_into().unwrap(),
         mtime_nsec.try_into().unwrap(),
     );
+    #[cfg(target_pointer_width = "64")]
+    let mtime_spec = TimeSpec::new(mtime_sec, mtime_nsec);
 
     futimens(&file, &atime_spec, &mtime_spec).map_err(Error::from)
 }

tests/by-util/test_nohup.rs

@@ -247,23 +247,3 @@ fn test_nohup_stderr_to_stdout() {
     assert!(content.contains("stdout message"));
     assert!(content.contains("stderr message"));
 }
-
-#[test]
-#[cfg(all(unix, not(target_os = "macos")))]
-fn test_nohup_non_utf8_home() {
-    use std::{ffi::OsStr, os::unix::ffi::OsStrExt};
-    let ts = TestScenario::new(util_name!());
-    let at = &ts.fixtures;
-
-    at.mkdir("nohup.out");
-    at.mkdir(OsStr::from_bytes(b"nohup_home\x80"));
-    let path = at.plus(OsStr::from_bytes(b"nohup_home\x80"));
-
-    ts.ucmd()
-        .terminal_simulation(true)
-        .env("HOME", path.as_os_str())
-        .args(&["true"])
-        .succeeds();
-
-    assert!(at.file_exists(path.join("nohup.out")));
-}