Merge remote-tracking branch 'upstream/master' into module-rc

Author: Howard20181

native/src/base/cstr.rs

@@ -8,12 +8,12 @@ use libc::{c_char, mode_t};
 use crate::files::map_file_at;
 pub(crate) use crate::xwrap::*;
 use crate::{
-    CxxResultExt, Directory, FsPath, OsResultStatic, Utf8CStr, clone_attr, cstr, cstr_buf,
-    fclone_attr, fd_path, map_fd, map_file, slice_from_ptr,
+    CxxResultExt, Directory, FsPath, OsResultStatic, Utf8CStr, clone_attr, cstr, fclone_attr,
+    fd_path, map_fd, map_file, slice_from_ptr,
 };
 
 pub(crate) fn fd_path_for_cxx(fd: RawFd, buf: &mut [u8]) -> isize {
-    let mut buf = cstr_buf::wrap(buf);
+    let mut buf = cstr::buf::wrap(buf);
     fd_path(fd, &mut buf)
         .log_cxx()
         .map_or(-1_isize, |_| buf.len() as isize)
@@ -23,11 +23,11 @@ pub(crate) fn fd_path_for_cxx(fd: RawFd, buf: &mut [u8]) -> isize {
 unsafe extern "C" fn canonical_path(path: *const c_char, buf: *mut u8, bufsz: usize) -> isize {
     unsafe {
         match Utf8CStr::from_ptr(path) {
-            Ok(p) => {
-                let mut buf = cstr_buf::wrap_ptr(buf, bufsz);
-                FsPath::from(p)
-                    .realpath(&mut buf)
-                    .map_or(-1, |_| buf.len() as isize)
+            Ok(path) => {
+                let mut buf = cstr::buf::wrap_ptr(buf, bufsz);
+                path.realpath(&mut buf)
+                    .log_cxx()
+                    .map_or(-1_isize, |_| buf.len() as isize)
             }
             Err(_) => -1,
         }
@@ -38,7 +38,7 @@ unsafe extern "C" fn canonical_path(path: *const c_char, buf: *mut u8, bufsz: us
 unsafe extern "C" fn mkdirs_for_cxx(path: *const c_char, mode: mode_t) -> i32 {
     unsafe {
         match Utf8CStr::from_ptr(path) {
-            Ok(p) => FsPath::from(p).mkdirs(mode).map_or(-1, |_| 0),
+            Ok(path) => path.mkdirs(mode).map_or(-1, |_| 0),
             Err(_) => -1,
         }
     }
@@ -48,7 +48,7 @@ unsafe extern "C" fn mkdirs_for_cxx(path: *const c_char, mode: mode_t) -> i32 {
 unsafe extern "C" fn rm_rf_for_cxx(path: *const c_char) -> bool {
     unsafe {
         match Utf8CStr::from_ptr(path) {
-            Ok(p) => FsPath::from(p).remove_all().is_ok(),
+            Ok(path) => path.remove_all().is_ok(),
             Err(_) => false,
         }
     }
@@ -114,8 +114,6 @@ unsafe extern "C" fn cp_afc_for_cxx(src: *const c_char, dest: *const c_char) ->
     unsafe {
         if let Ok(src) = Utf8CStr::from_ptr(src) {
             if let Ok(dest) = Utf8CStr::from_ptr(dest) {
-                let src = FsPath::from(src);
-                let dest = FsPath::from(dest);
                 return src.copy_to(dest).log_cxx().is_ok();
             }
         }
@@ -128,8 +126,6 @@ unsafe extern "C" fn mv_path_for_cxx(src: *const c_char, dest: *const c_char) ->
     unsafe {
         if let Ok(src) = Utf8CStr::from_ptr(src) {
             if let Ok(dest) = Utf8CStr::from_ptr(dest) {
-                let src = FsPath::from(src);
-                let dest = FsPath::from(dest);
                 return src.move_to(dest).log_cxx().is_ok();
             }
         }
@@ -142,8 +138,6 @@ unsafe extern "C" fn link_path_for_cxx(src: *const c_char, dest: *const c_char)
     unsafe {
         if let Ok(src) = Utf8CStr::from_ptr(src) {
             if let Ok(dest) = Utf8CStr::from_ptr(dest) {
-                let src = FsPath::from(src);
-                let dest = FsPath::from(dest);
                 return src.link_to(dest).log_cxx().is_ok();
             }
         }
@@ -156,8 +150,6 @@ unsafe extern "C" fn clone_attr_for_cxx(src: *const c_char, dest: *const c_char)
     unsafe {
         if let Ok(src) = Utf8CStr::from_ptr(src) {
             if let Ok(dest) = Utf8CStr::from_ptr(dest) {
-                let src = FsPath::from(src);
-                let dest = FsPath::from(dest);
                 return clone_attr(src, dest).log_cxx().is_ok();
             }
         }

native/src/base/cxx_extern.rs

@@ -1,7 +1,7 @@
 use crate::cxx_extern::readlinkat;
 use crate::{
-    FileAttr, FsPathBuf, LibcReturn, OsError, OsResult, OsResultStatic, Utf8CStr, Utf8CStrBuf,
-    cstr_buf, errno, fd_path, fd_set_attr,
+    FileAttr, FsPath, FsPathBuilder, LibcReturn, OsError, OsResult, OsResultStatic, Utf8CStr,
+    Utf8CStrBuf, cstr, errno, fd_path, fd_set_attr,
 };
 use libc::{EEXIST, O_CLOEXEC, O_CREAT, O_RDONLY, O_TRUNC, O_WRONLY, dirent, mode_t};
 use std::fs::File;
@@ -184,7 +184,7 @@ impl Directory {
 
     fn path_at(&self, name: &Utf8CStr, buf: &mut dyn Utf8CStrBuf) -> OsResult<'static, ()> {
         self.path(buf)?;
-        FsPathBuf::from(buf).join(name);
+        buf.append_path(name);
         Ok(())
     }
 }
@@ -247,14 +247,14 @@ impl Directory {
     }
 
     pub fn get_attr_at<'a>(&self, name: &'a Utf8CStr) -> OsResult<'a, FileAttr> {
-        let mut path = FsPathBuf::default();
-        self.path_at(name, path.0.deref_mut())?;
+        let mut path = cstr::buf::default();
+        self.path_at(name, &mut path)?;
         path.get_attr().map_err(|e| e.set_args(Some(name), None))
     }
 
     pub fn set_attr_at<'a>(&self, name: &'a Utf8CStr, attr: &FileAttr) -> OsResult<'a, ()> {
-        let mut path = FsPathBuf::default();
-        self.path_at(name, path.0.deref_mut())?;
+        let mut path = cstr::buf::default();
+        self.path_at(name, &mut path)?;
         path.set_attr(attr)
             .map_err(|e| e.set_args(Some(name), None))
     }
@@ -264,15 +264,15 @@ impl Directory {
         name: &'a Utf8CStr,
         con: &mut dyn Utf8CStrBuf,
     ) -> OsResult<'a, ()> {
-        let mut path = FsPathBuf::default();
-        self.path_at(name, path.0.deref_mut())?;
+        let mut path = cstr::buf::default();
+        self.path_at(name, &mut path)?;
         path.get_secontext(con)
             .map_err(|e| e.set_args(Some(name), None))
     }
 
     pub fn set_secontext_at<'a>(&self, name: &'a Utf8CStr, con: &'a Utf8CStr) -> OsResult<'a, ()> {
-        let mut path = FsPathBuf::default();
-        self.path_at(name, path.0.deref_mut())?;
+        let mut path = cstr::buf::default();
+        self.path_at(name, &mut path)?;
         path.set_secontext(con)
             .map_err(|e| e.set_args(Some(name), Some(con)))
     }
@@ -344,7 +344,7 @@ impl Directory {
                 std::io::copy(&mut src, &mut dest)?;
                 fd_set_attr(dest.as_raw_fd(), &attr)?;
             } else if e.is_symlink() {
-                let mut target = cstr_buf::default();
+                let mut target = cstr::buf::default();
                 e.read_link(&mut target)?;
                 unsafe {
                     libc::symlinkat(target.as_ptr(), dir.as_raw_fd(), e.d_name.as_ptr())