From 39e2f1138b59e207822a80b0cfb40cffc40ab3da Mon Sep 17 00:00:00 2001
From: Peter Ammon <rf@fishshell.com>
Date: Sat, 16 Aug 2025 14:36:40 -0700
Subject: [PATCH] Bravely stop setting stdout to unbuffered

Issue #3748 made stdout (the C FILE*, NOT the file descriptor) unbuffered,
due to concerns about mixing output to the stdout FILE* with output output.

We no longer write to the C FILE* and Rust libc doesn't expose stdout, which may
be a macro. This code no longer looks useful. Bravely remove it.
---
 src/env/environment.rs | 14 +++-----------
 src/libc.rs            |  5 -----
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/env/environment.rs b/src/env/environment.rs
index 86d3e3878..48644a14b 100644
--- a/src/env/environment.rs
+++ b/src/env/environment.rs
@@ -13,8 +13,8 @@
 use crate::flog::FLOG;
 use crate::global_safety::RelaxedAtomicBool;
 use crate::input::{init_input, FISH_BIND_MODE_VAR};
-use crate::libc::{stdout_stream, C_PATH_BSHELL, _PATH_BSHELL};
-use crate::nix::{geteuid, getpid, isatty};
+use crate::libc::{C_PATH_BSHELL, _PATH_BSHELL};
+use crate::nix::{geteuid, getpid};
 use crate::null_terminated_array::OwningNullTerminatedArray;
 use crate::path::{
     path_emit_config_directory_messages, path_get_cache, path_get_config, path_get_data,
@@ -28,11 +28,10 @@
 use crate::wutil::{fish_wcstol, wgetcwd, wgettext};
 use std::sync::atomic::Ordering;
 
-use libc::{c_int, confstr, uid_t, STDOUT_FILENO, _IONBF};
+use libc::{c_int, confstr, uid_t};
 use once_cell::sync::{Lazy, OnceCell};
 use std::collections::HashMap;
 use std::ffi::CStr;
-use std::io::Write;
 use std::mem::MaybeUninit;
 use std::os::unix::prelude::*;
 use std::sync::Arc;
@@ -858,12 +857,5 @@ pub fn env_init(paths: Option<&ConfigPaths>, do_uvars: bool, default_paths: bool
 /// Various things we need to initialize at run-time that don't really fit any of the other init
 /// routines.
 pub fn misc_init() {
-    // If stdout is open on a tty ensure stdio is unbuffered. That's because those functions might
-    // be intermixed with `write()` calls and we need to ensure the writes are not reordered. See
-    // issue #3748.
-    if isatty(STDOUT_FILENO) {
-        let _ = std::io::stdout().flush();
-        unsafe { libc::setvbuf(stdout_stream(), std::ptr::null_mut(), _IONBF, 0) };
-    }
     _PATH_BSHELL.store(unsafe { C_PATH_BSHELL().cast_mut() }, Ordering::SeqCst);
 }
diff --git a/src/libc.rs b/src/libc.rs
index 3e71064e5..32315bbff 100644
--- a/src/libc.rs
+++ b/src/libc.rs
@@ -6,8 +6,3 @@
 extern "C" {
     pub fn C_PATH_BSHELL() -> *const c_char;
 }
-
-extern "C" {
-    pub fn stdout_stream() -> *mut libc::FILE;
-    pub fn setlinebuf(stream: *mut libc::FILE);
-}