new file mode 100644

@@ -0,0 +1,5 @@

+[workspace]

+

+members = [

+    "libclamav_rust",

+]

@@ -9,4 +9,5 @@ add_rust_library(TARGET clamav_rust WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DI

 if (WIN32)

     target_link_libraries(clamav_rust PUBLIC INTERFACE Userenv)

 endif()

+

 add_library(ClamAV::libclamav_rust ALIAS clamav_rust)

@@ -12,4 +12,3 @@ log = {version = "*", features = ["std"]}

 [lib]

 crate-type = ["staticlib"]

 name = "clamav_rust"

-path = "lib.rs"

deleted file mode 100644

@@ -1,18 +0,0 @@

-#

-# Rust common libs for ClamAV apps

-#

-

-rdiff_SOURCES = \

-    rdiff/Cargo.toml \

-    rdiff/rdiff.rs

-

-EXTRA_DIST = $(rdiff_SOURCES)

-

-$(top_builddir)/common_rust/rdiff/$(RUST_TARGET_SUBDIR)/librdiff.a: $(rdiff_SOURCES)

-	cd $(top_srcdir)/common_rust/rdiff && \

-	mkdir -p $(top_builddir)/common_rust/rdiff && \

-	CARGO_TARGET_DIR=$(top_builddir)/common_rust/rdiff cargo build --target-dir $(abs_top_builddir)/common_rust/rdiff $(CARGO_RELEASE_ARGS)

-

-rdiff_LIB=$(top_builddir)/common_rust/rdiff/$(RUST_TARGET_SUBDIR)/librdiff.a

-

-all: $(rdiff_LIB)

deleted file mode 100644

@@ -1,23 +0,0 @@

-/*

- *  libclamav features written in Rust

- *

- *  Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

- *

- *  Authors: Micah Snyder, Mickey Sola

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-pub mod logging;

\ No newline at end of file

deleted file mode 100644

@@ -1,77 +0,0 @@

-/*

- *  Rust logging module

- *

- *  Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

- *

- *  Authors: Mickey Sola

- *

- *  This program is free software; you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License version 2 as

- *  published by the Free Software Foundation.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program; if not, write to the Free Software

- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

- *  MA 02110-1301, USA.

- */

-

-use std::ffi::c_void;

-use std::ffi::CString;

-use std::os::raw::c_char;

-

-extern crate log;

-

-use self::log::LevelFilter;

-use self::log::{Level, Metadata, Record};

-

-extern "C" {

-    fn cli_warnmsg(str: *const c_char, ...) -> c_void;

-    fn cli_dbgmsg(str: *const c_char, ...) -> c_void;

-    fn cli_infomsg_simple(str: *const c_char, ...) -> c_void;

-    fn cli_errmsg(str: *const c_char, ...) -> c_void;

-}

-

-pub struct ClamLogger;

-

-impl log::Log for ClamLogger {

-    fn enabled(&self, metadata: &Metadata) -> bool {

-        metadata.level() <= Level::Debug

-    }

-

-    fn log(&self, record: &Record) {

-        if self.enabled(record.metadata()) {

-            let msg = CString::new(format!("{}\n", record.args())).unwrap();

-            let ptr = msg.as_ptr();

-

-            match record.level() {

-                Level::Debug => unsafe {

-                    cli_dbgmsg(ptr);

-                },

-                Level::Error => unsafe {

-                    cli_errmsg(ptr);

-                },

-                Level::Info => unsafe {

-                    cli_infomsg_simple(ptr);

-                },

-                Level::Warn => unsafe {

-                    cli_warnmsg(ptr);

-                },

-                _ => {}

-            }

-        }

-    }

-

-    fn flush(&self) {}

-}

-

-#[no_mangle]

-pub extern "C" fn clrs_log_init() -> bool {

-    log::set_boxed_logger(Box::new(ClamLogger))

-        .map(|()| log::set_max_level(LevelFilter::Debug))

-        .is_ok()

-}

new file mode 100644

@@ -0,0 +1,23 @@

+/*

+ *  libclamav features written in Rust

+ *

+ *  Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *

+ *  Authors: Micah Snyder, Mickey Sola

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License version 2 as

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

+pub mod logging;

\ No newline at end of file

new file mode 100644

@@ -0,0 +1,77 @@

+/*

+ *  Rust logging module

+ *

+ *  Copyright (C) 2021 Cisco Systems, Inc. and/or its affiliates. All rights reserved.

+ *

+ *  Authors: Mickey Sola

+ *

+ *  This program is free software; you can redistribute it and/or modify

+ *  it under the terms of the GNU General Public License version 2 as

+ *  published by the Free Software Foundation.

+ *

+ *  This program is distributed in the hope that it will be useful,

+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of

+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ *  GNU General Public License for more details.

+ *

+ *  You should have received a copy of the GNU General Public License

+ *  along with this program; if not, write to the Free Software

+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

+ *  MA 02110-1301, USA.

+ */

+

+use std::ffi::c_void;

+use std::ffi::CString;

+use std::os::raw::c_char;

+

+extern crate log;

+

+use self::log::LevelFilter;

+use self::log::{Level, Metadata, Record};

+

+extern "C" {

+    fn cli_warnmsg(str: *const c_char, ...) -> c_void;

+    fn cli_dbgmsg(str: *const c_char, ...) -> c_void;

+    fn cli_infomsg_simple(str: *const c_char, ...) -> c_void;

+    fn cli_errmsg(str: *const c_char, ...) -> c_void;

+}

+

+pub struct ClamLogger;

+

+impl log::Log for ClamLogger {

+    fn enabled(&self, metadata: &Metadata) -> bool {

+        metadata.level() <= Level::Debug

+    }

+

+    fn log(&self, record: &Record) {

+        if self.enabled(record.metadata()) {

+            let msg = CString::new(format!("{}\n", record.args())).unwrap();

+            let ptr = msg.as_ptr();

+

+            match record.level() {

+                Level::Debug => unsafe {

+                    cli_dbgmsg(ptr);

+                },

+                Level::Error => unsafe {

+                    cli_errmsg(ptr);

+                },

+                Level::Info => unsafe {

+                    cli_infomsg_simple(ptr);

+                },

+                Level::Warn => unsafe {

+                    cli_warnmsg(ptr);

+                },

+                _ => {}

+            }

+        }

+    }

+

+    fn flush(&self) {}

+}

+

+#[no_mangle]

+pub extern "C" fn clrs_log_init() -> bool {

+    log::set_boxed_logger(Box::new(ClamLogger))

+        .map(|()| log::set_max_level(LevelFilter::Debug))

+        .is_ok()

+}