Make signal exit format more consistent

TheOnlyMrCat · Apr 17, 2022 · 83726fa · 83726fa
1 parent 758f6c4
commit 83726fa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/out.rs b/src/out.rs
@@ -357,13 +357,18 @@ pub fn process_finish(output_stream: &StandardStream, status: &ProcessExit) {
         let sigstr_ptr = unsafe { strsignal(signal as std::os::raw::c_int) };
 
         if sigstr_ptr.is_null() {
-            format!("signal {}", signal)
+            format!(
+                "signal {}{}",
+                signal,
+                if core { " - core dumped" } else { "" }
+            )
         } else {
-            // SAFETY: The string returned from `strsignal` is valid until the next call to strsignal
+            // SAFETY: The string returned from `strsignal` is valid until our next call to strsignal
             // and has been verified to be non-null. The string returned by `strsignal` is null-terminated.
             let sigstr = unsafe { CStr::from_ptr(sigstr_ptr) };
             format!(
-                "signal {signal} ({}){}",
+                "signal {} ({}){}",
+                signal,
                 sigstr.to_string_lossy(),
                 if core { " - core dumped" } else { "" }
             )

diff --git a/src/process.rs b/src/process.rs
@@ -355,8 +355,7 @@ impl From<StdioRepr> for Stdio {
             StdioRepr::Fd(fd) => {
                 use std::os::unix::io::FromRawFd;
                 unsafe {
-                    // SAFETY: Umm, not sure how to enforce this, to be honest.
-                    //         I'll deal with it later
+                    // SAFETY: Not currently enforced. Replace with OwnedFd and OwnedHandle when #87074 is stable
                     Stdio::from_raw_fd(fd)
                 }
             }