diff --git a/native/src/base/cstr.rs b/native/src/base/cstr.rs index 2e21278ae..60e1cb77f 100644 --- a/native/src/base/cstr.rs +++ b/native/src/base/cstr.rs @@ -34,13 +34,6 @@ use crate::slice_from_ptr_mut; // Utf8CString, Utf8CStrBufRef, and Utf8CStrBufArr implements Utf8CStrWrite. // Utf8CStrBufRef and Utf8CStrBufArr implements Utf8CStrBuf. -pub fn copy_cstr + ?Sized>(dest: &mut [u8], src: &T) -> usize { - let src = src.as_ref().to_bytes_with_nul(); - let len = min(src.len(), dest.len()); - dest[..len].copy_from_slice(&src[..len]); - len - 1 -} - fn utf8_cstr_buf_append(buf: &mut dyn Utf8CStrBuf, s: &[u8]) -> usize { let mut used = buf.len(); if used >= buf.capacity() - 1 { @@ -49,7 +42,9 @@ fn utf8_cstr_buf_append(buf: &mut dyn Utf8CStrBuf, s: &[u8]) -> usize { } let dest = unsafe { &mut buf.mut_buf()[used..] }; let len = min(s.len(), dest.len() - 1); - dest[..len].copy_from_slice(&s[..len]); + if len > 0 { + dest[..len].copy_from_slice(&s[..len]); + } dest[len] = b'\0'; used += len; unsafe { buf.set_len(used) }; diff --git a/native/src/base/files.rs b/native/src/base/files.rs index 25f29e3d0..848d790a5 100644 --- a/native/src/base/files.rs +++ b/native/src/base/files.rs @@ -5,7 +5,9 @@ use std::fs::File; use std::io::{BufRead, BufReader, Read, Seek, SeekFrom, Write}; use std::ops::Deref; use std::os::fd::{AsFd, BorrowedFd, IntoRawFd}; +use std::os::unix::ffi::OsStrExt; use std::os::unix::io::{AsRawFd, FromRawFd, OwnedFd, RawFd}; +use std::path::Path; use std::{io, mem, ptr, slice}; use bytemuck::{bytes_of_mut, Pod}; @@ -17,8 +19,8 @@ use num_traits::AsPrimitive; use crate::cxx_extern::readlinkat_for_cxx; use crate::{ - copy_cstr, cstr, errno, error, FsPath, FsPathBuf, LibcReturn, Utf8CStr, Utf8CStrBuf, - Utf8CStrBufArr, + cstr, errno, error, FsPath, FsPathBuf, LibcReturn, Utf8CStr, Utf8CStrBuf, Utf8CStrBufArr, + Utf8CStrWrite, }; pub fn __open_fd_impl(path: &Utf8CStr, flags: i32, mode: mode_t) -> io::Result { @@ -631,11 +633,14 @@ impl FsPath { } pub fn mkdirs(&self, mode: mode_t) -> io::Result<()> { - let mut buf = [0_u8; 4096]; - let len = copy_cstr(&mut buf, self); - let buf = &mut buf[..len]; + if self.is_empty() { + return Ok(()); + } + let mut arr = Utf8CStrBufArr::default(); + arr.push_str(self); let mut off = 1; unsafe { + let buf = arr.as_bytes_mut(); while let Some(p) = buf[off..].iter().position(|c| *c == b'/') { buf[off + p] = b'\0'; if libc::mkdir(buf.as_ptr().cast(), mode) < 0 && *errno() != EEXIST {