From 5774bac63966480790b15b32db1642d6a8c89af1 Mon Sep 17 00:00:00 2001 From: Foorack Date: Sun, 9 Feb 2025 17:32:02 +0100 Subject: [PATCH] lsmem: String path concat on Windows --- src/uu/lsmem/src/lsmem.rs | 7 ++----- tests/by-util/test_lsmem.rs | 8 +++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/uu/lsmem/src/lsmem.rs b/src/uu/lsmem/src/lsmem.rs index c397f05..e626af8 100644 --- a/src/uu/lsmem/src/lsmem.rs +++ b/src/uu/lsmem/src/lsmem.rs @@ -360,12 +360,9 @@ impl Options { } fn read_info(lsmem: &mut Lsmem, opts: &mut Options) { + let path_block_size = Path::new(&opts.sysmem).join(PATH_SUB_BLOCK_SIZE_BYTES); lsmem.block_size = u64::from_str_radix( - &read_file_content::(Path::new(&format!( - "{}/{}", - opts.sysmem, PATH_SUB_BLOCK_SIZE_BYTES - ))) - .unwrap(), + &read_file_content::(path_block_size.as_path()).unwrap(), 16, ) .unwrap(); diff --git a/tests/by-util/test_lsmem.rs b/tests/by-util/test_lsmem.rs index 39b759b..00e38da 100644 --- a/tests/by-util/test_lsmem.rs +++ b/tests/by-util/test_lsmem.rs @@ -7,7 +7,13 @@ use crate::common::util::TestScenario; #[must_use] fn sysroot() -> String { - format!("{}/tests/fixtures/lsmem/input", env!("CARGO_MANIFEST_DIR")) + path_concat!( + env!("CARGO_MANIFEST_DIR"), + "tests", + "fixtures", + "lsmem", + "input" + ) } fn sysroot_test_with_args(expected_output: &str, args: &[&str]) {