From ed76375e7e2d849434491c28ea57bb4cc667b1f6 Mon Sep 17 00:00:00 2001 From: vasilito Date: Sat, 11 Jul 2026 05:03:47 +0300 Subject: [PATCH] fix ArrayString type for context name logging --- src/scheme/proc.rs | 2 +- src/syscall/fs.rs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/scheme/proc.rs b/src/scheme/proc.rs index ceb1df6358..51105dc447 100644 --- a/src/scheme/proc.rs +++ b/src/scheme/proc.rs @@ -772,7 +772,7 @@ impl KernelScheme for ProcScheme { let ctx_name = context.read(token.token()).name; info!( "AwaitingFiletableChange applied: ctx='{}' posix_fds={} upper_fds={}", - str::from_utf8(&ctx_name).unwrap_or("?"), + ctx_name, posix_count, upper_count ); diff --git a/src/syscall/fs.rs b/src/syscall/fs.rs index 2f8e5fa43c..6970098289 100644 --- a/src/syscall/fs.rs +++ b/src/syscall/fs.rs @@ -3,7 +3,6 @@ use core::num::NonZeroUsize; use alloc::{string::{String, ToString}, sync::Arc, vec::Vec}; -use core::str; use redox_path::RedoxPath; use crate::{ @@ -80,11 +79,11 @@ pub fn openat( let (context, mut token) = current.token_split(); let name = context.name; let pipe = context.get_file(fh, &mut token).ok_or_else(|| { - info!("openat: EBADF fh={:#x} ctx='{}'", fh.get(), str::from_utf8(&name).unwrap_or("?")); + info!("openat: EBADF fh={:#x} ctx='{}'", fh.get(), name); Error::new(EBADF) })?; let desc = pipe.description.read(token.token()); - info!("openat: fh={:#x} scheme_id={} number={} path='{}' ctx='{}'", fh.get(), desc.scheme.get(), desc.number, path_buf, str::from_utf8(&name).unwrap_or("?")); + info!("openat: fh={:#x} scheme_id={} number={} path='{}' ctx='{}'", fh.get(), desc.scheme.get(), desc.number, path_buf, name); (desc.scheme, desc.number) };