Rewrite problematic code

Fixes #60. Based on Davipb/utf8-utf16-converter@656b03a. Signed-off-by: Peter Lemenkov <[email protected]>
twogood · Nov 19, 2024 · cec275c · cec275c
1 parent d6d883a
commit cec275c
Show file tree

Hide file tree

Showing 10 changed files with 413 additions and 776 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory(convert_utf)
-
 if(USE_OUR_OWN_MD5)
     add_subdirectory(md5)
 endif()
@@ -9,10 +7,12 @@ set(LIBUNSHIELD_HEADERS
     libunshield.h
     log.h
     cabfile.h
+    converter.h
 )
 
 set(LIBUNSHIELD_SOURCES
     component.c
+    converter.c
     directory.c
     file.c
     file_group.c
@@ -31,7 +31,7 @@ endif()
 target_include_directories(libunshield PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
     $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-target_link_libraries(libunshield PUBLIC ZLIB::ZLIB PRIVATE $<TARGET_OBJECTS:convert_utf>)
+target_link_libraries(libunshield PUBLIC ZLIB::ZLIB)
 target_compile_definitions(libunshield PRIVATE UNSHIELD_EXPORT)
 set_target_properties(libunshield PROPERTIES OUTPUT_NAME unshield)
 set_target_properties(libunshield PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})

diff --git a/lib/convert_utf/CMakeLists.txt b/lib/convert_utf/CMakeLists.txt