diff --git a/interfaces/kits/js/BUILD.gn b/interfaces/kits/js/BUILD.gn index 3189321612d37b7013da20a8bb7c2629109ca481..7fec7231a4642aa657cf70f67c14650092b7c93c 100644 --- a/interfaces/kits/js/BUILD.gn +++ b/interfaces/kits/js/BUILD.gn @@ -109,6 +109,7 @@ ohos_shared_library("fs") { relative_install_dir = "module/file" include_dirs = [ + "${file_api_path}/interfaces/kits/rust/include", "${src_path}/common", "${src_path}/common/file_helper", "${src_path}/mod_fs", @@ -119,16 +120,19 @@ ohos_shared_library("fs") { sources = [ "src/common/file_helper/fd_guard.cpp", "src/mod_fs/class_file/file_n_exporter.cpp", + "src/mod_fs/class_readeriterator/readeriterator_n_exporter.cpp", "src/mod_fs/class_stat/stat_n_exporter.cpp", "src/mod_fs/common_func.cpp", "src/mod_fs/module.cpp", "src/mod_fs/properties/close.cpp", "src/mod_fs/properties/fdatasync.cpp", "src/mod_fs/properties/fsync.cpp", + "src/mod_fs/properties/lseek.cpp", "src/mod_fs/properties/lstat.cpp", "src/mod_fs/properties/mkdtemp.cpp", "src/mod_fs/properties/open.cpp", "src/mod_fs/properties/prop_n_exporter.cpp", + "src/mod_fs/properties/read_lines.cpp", "src/mod_fs/properties/rename.cpp", "src/mod_fs/properties/rmdirent.cpp", "src/mod_fs/properties/stat.cpp", @@ -138,6 +142,7 @@ ohos_shared_library("fs") { cflags_cc = [ "-std=c++17" ] deps = [ + "${file_api_path}/interfaces/kits/rust:rust_file", "${utils_path}/filemgmt_libhilog:filemgmt_libhilog", "${utils_path}/filemgmt_libn:filemgmt_libn", ] @@ -157,10 +162,8 @@ ohos_shared_library("fs") { ] if (!use_mingw_win && !use_mac) { - include_dirs += [ "${file_api_path}/interfaces/kits/rust/include" ] sources += [ "src/mod_fs/class_randomaccessfile/randomaccessfile_n_exporter.cpp", - "src/mod_fs/class_readeriterator/readeriterator_n_exporter.cpp", "src/mod_fs/class_stream/flush.cpp", "src/mod_fs/class_stream/stream_n_exporter.cpp", "src/mod_fs/class_watcher/watcher_entity.cpp", @@ -172,10 +175,8 @@ ohos_shared_library("fs") { "src/mod_fs/properties/dup.cpp", "src/mod_fs/properties/fdopen_stream.cpp", "src/mod_fs/properties/listfile.cpp", - "src/mod_fs/properties/lseek.cpp", "src/mod_fs/properties/move.cpp", "src/mod_fs/properties/movedir.cpp", - "src/mod_fs/properties/read_lines.cpp", "src/mod_fs/properties/read_text.cpp", "src/mod_fs/properties/symlink.cpp", "src/mod_fs/properties/watcher.cpp", @@ -193,10 +194,7 @@ ohos_shared_library("fs") { "ipc:ipc_core", "samgr:samgr_proxy", ] - deps += [ - "${file_api_path}/interfaces/kits/native:remote_uri_native", - "${file_api_path}/interfaces/kits/rust:rust_file", - ] + deps += [ "${file_api_path}/interfaces/kits/native:remote_uri_native" ] } } diff --git a/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp b/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp index 44b4ca8ffaa31e613ccfac147be499c0fec1b79c..996f02dcd34440164f157a7d82af08a23c1e7de9 100644 --- a/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp +++ b/interfaces/kits/js/src/mod_fs/properties/prop_n_exporter.cpp @@ -32,9 +32,11 @@ #include "fsync.h" #include "js_native_api.h" #include "js_native_api_types.h" +#include "lseek.h" #include "lstat.h" #include "mkdtemp.h" #include "open.h" +#include "read_lines.h" #include "rename.h" #include "rmdirent.h" #include "stat.h" @@ -48,10 +50,8 @@ #include "dup.h" #include "fdopen_stream.h" #include "listfile.h" -#include "lseek.h" #include "move.h" #include "movedir.h" -#include "read_lines.h" #include "read_text.h" #include "symlink.h" #include "watcher.h" @@ -569,6 +569,7 @@ bool PropNExporter::Export() NVal::DeclareNapiFunction("fdatasyncSync", Fdatasync::Sync), NVal::DeclareNapiFunction("fsync", Fsync::Async), NVal::DeclareNapiFunction("fsyncSync", Fsync::Sync), + NVal::DeclareNapiFunction("lseek", Lseek::Sync), NVal::DeclareNapiFunction("lstat", Lstat::Async), NVal::DeclareNapiFunction("lstatSync", Lstat::Sync), NVal::DeclareNapiFunction("mkdir", Mkdir), @@ -579,6 +580,8 @@ bool PropNExporter::Export() NVal::DeclareNapiFunction("openSync", Open::Sync), NVal::DeclareNapiFunction("read", Read), NVal::DeclareNapiFunction("readSync", ReadSync), + NVal::DeclareNapiFunction("readLines", ReadLines::Async), + NVal::DeclareNapiFunction("readLinesSync", ReadLines::Sync), NVal::DeclareNapiFunction("rename", Rename::Async), NVal::DeclareNapiFunction("renameSync", Rename::Sync), NVal::DeclareNapiFunction("rmdir", Rmdirent::Async), @@ -605,13 +608,10 @@ bool PropNExporter::Export() NVal::DeclareNapiFunction("fdopenStreamSync", FdopenStream::Sync), NVal::DeclareNapiFunction("listFile", ListFile::Async), NVal::DeclareNapiFunction("listFileSync", ListFile::Sync), - NVal::DeclareNapiFunction("lseek", Lseek::Sync), NVal::DeclareNapiFunction("moveDir", MoveDir::Async), NVal::DeclareNapiFunction("moveDirSync", MoveDir::Sync), NVal::DeclareNapiFunction("moveFile", Move::Async), NVal::DeclareNapiFunction("moveFileSync", Move::Sync), - NVal::DeclareNapiFunction("readLines", ReadLines::Async), - NVal::DeclareNapiFunction("readLinesSync", ReadLines::Sync), NVal::DeclareNapiFunction("readText", ReadText::Async), NVal::DeclareNapiFunction("readTextSync", ReadText::Sync), NVal::DeclareNapiFunction("symlink", Symlink::Async), diff --git a/interfaces/kits/rust/BUILD.gn b/interfaces/kits/rust/BUILD.gn index 61f13fe6bd120cff70d733efb9b52f7b63b787ee..af4dbb296382d1709b6a8674853f893d7071e502 100644 --- a/interfaces/kits/rust/BUILD.gn +++ b/interfaces/kits/rust/BUILD.gn @@ -20,5 +20,4 @@ ohos_rust_shared_ffi("rust_file") { sources = [ "src/lib.rs" ] crate_name = "rust_file" deps = [ "//third_party/rust/crates/libc:lib" ] - external_deps = [ "hilog:hilog_rust" ] } diff --git a/interfaces/kits/rust/src/adapter.rs b/interfaces/kits/rust/src/adapter.rs index 16304c047157186f7912fa386a3e9434fed57666..444a924d84e7ba89a9b4c8462fead737d026d39c 100644 --- a/interfaces/kits/rust/src/adapter.rs +++ b/interfaces/kits/rust/src/adapter.rs @@ -13,7 +13,6 @@ * limitations under the License. */ -use hilog_rust::{error, hilog, HiLogLabel, LogType}; use libc::{__errno_location, c_char, c_uint, c_void}; use std::ffi::{CStr, CString}; use std::fs::File; @@ -24,12 +23,6 @@ use std::path::PathBuf; use std::ptr::null_mut; use std::{fs, mem}; -const LOG_LABEL: HiLogLabel = HiLogLabel { - log_type: LogType::LogCore, - domain: 0xD004388, - tag: "file_api", -}; - /// Enumeration of `lseek` interface to seek within a file. #[repr(C)] #[allow(dead_code)] @@ -69,7 +62,6 @@ pub(crate) unsafe fn error_control(err: Error) { ErrorKind::InvalidData => *errno_pos = 61, _ => { *errno_pos = 13900042; - error!(LOG_LABEL, "Unknown error is : {}", @public(err)); } } }