3 files changed, 21 insertions, 6 deletions

diff --git a/rsnix/src/klog.rs b/rsnix/src/klog.rs
index 5da5094..2e1fc82 100644
--- a/rsnix/src/klog.rs
+++ b/rsnix/src/klog.rs
@@ -21,7 +21,11 @@ extern crate alloc;
 use alloc::string::String;
 
 pub const MAX_LINES: usize = 128;
-pub const MAX_LINE: usize = 128;
+/// Max bytes stored per line.  Wide enough that no real line truncates
+/// at any plausible terminal width (a 240-col 4K framebuffer row is
+/// still under this) — long lines flow in full and the terminal wraps
+/// them at the screen edge instead of cutting them off.
+pub const MAX_LINE: usize = 512;
 
 struct Ring {
     /// Sequence counter for the next line to be appended (total ever).
@@ -36,7 +40,7 @@ struct Ring {
     /// the timer is running (early-boot PIT reads are uninitialised).
     last_ms: u64,
     ms: [u64; MAX_LINES],
-    lens: [u8; MAX_LINES],
+    lens: [u16; MAX_LINES],
     bytes: [[u8; MAX_LINE]; MAX_LINES],
 }
 
@@ -74,7 +78,7 @@ pub fn append(line: &str, mut ms: u64) {
     }
     r.ms[r.next] = ms;
     r.bytes[r.next][..n].copy_from_slice(&b[..n]);
-    r.lens[r.next] = n as u8;
+    r.lens[r.next] = n as u16;
     r.next = (r.next + 1) % MAX_LINES;
     r.seq += 1;
 }
diff --git a/rsnix/src/tty.rs b/rsnix/src/tty.rs
index 81a7a24..7304925 100644
--- a/rsnix/src/tty.rs
+++ b/rsnix/src/tty.rs
@@ -17,7 +17,10 @@ use crate::ps2::{self, KeyEvent};
 use crate::strbuf;
 use crate::{gop, serial};
 
-pub const LINE_BUF_SIZE: usize = 256;
+/// Max characters a single typed line can hold.  Long enough that no
+/// realistic command line gets silently cut — the terminal wraps the
+/// echo at the screen edge, and the full line is what's submitted.
+pub const LINE_BUF_SIZE: usize = 1024;
 
 /// Result of one canonical line-input session.
 #[allow(clippy::large_enum_variant)] // stack buffer by design (no heap churn)
diff --git a/shell/src/lib.rs b/shell/src/lib.rs
index 97fa6c2..617e5a4 100644
--- a/shell/src/lib.rs
+++ b/shell/src/lib.rs
@@ -365,6 +365,7 @@ enum StageState {
     Pause {
         shown: usize,
         screen: usize,
+        cols: usize,
     },
 }
 
@@ -433,6 +434,10 @@ impl Pipeline {
                 Filter::Pause => StageState::Pause {
                     shown: 0,
                     screen: rsnix::vt::size().0.saturating_sub(1).max(1),
+                    // Rows a screenful of *wrapped* output occupies: a
+                    // line wider than the terminal takes more than one
+                    // row, so the pager counts rows, not lines.
+                    cols: rsnix::vt::size().1.max(1),
                 },
             };
             stages.push((f.clone(), st));
@@ -510,14 +515,17 @@ impl Pipeline {
                     }
                 }
                 Filter::Pause => {
-                    let StageState::Pause { shown, screen } = st else {
+                    let StageState::Pause { shown, screen, cols } = st else {
                         unreachable!("stage state does not match filter")
                     };
                     for l in cur.drain(..) {
+                        // Rows this line occupies after terminal wrapping
+                        // (at least 1; an empty line is one row).
+                        let rows = l.len().div_ceil(*cols);
                         if *shown > 0 && *shown % *screen == 0 && !pager_wait() {
                             return false;
                         }
-                        *shown += 1;
+                        *shown += rows;
                         out.push(l);
                     }
                 }