Rename "shared" library to "common"

The named "shared" is confusing, especially now that these features are built as a static library instead of being directly compiled into the various applications.
2025-10-19 10:23:17 +00:00 · 2021-03-04 19:39:50 -08:00 · 2021-03-04 19:39:50 -08:00 · c025afd683
commit c025afd683
parent 5d30d08d50
103 changed files with 118 additions and 115 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -779,7 +779,7 @@ endif()
 add_subdirectory( libclamav )

 if(NOT ENABLE_LIBCLAMAV_ONLY)
-    add_subdirectory( shared )
+    add_subdirectory( common )

    add_subdirectory( libfreshclam )

--- a/Makefile.am
+++ b/Makefile.am
@ -25,8 +25,8 @@ SUBDIRS = libclamav
 bin_SCRIPTS=clamav-config

 else
-SUBDIRS = libltdl libclamav shared libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
-EXTRA_DIST = examples shared libclamav.pc.in COPYING.txt COPYING platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh
+SUBDIRS = libltdl libclamav common libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests
+EXTRA_DIST = examples common libclamav.pc.in COPYING.txt COPYING platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.cmake.md INSTALL.autotools.md NEWS.md README.md cmake CMakeLists.txt CMakeOptions.cmake $(top_srcdir)/**/CMakeLists.txt libclammspack/config.h.in.cmake clamav-config.h.cmake.in target.h.cmake.in autogen.sh

 bin_SCRIPTS=clamav-config

--- a/4
+++ b/4
@ -35,8 +35,8 @@ clang-format -i -verbose libclamunrar_iface/*.cpp
 clang-format -i -verbose libclamunrar_iface/*.h
 clang-format -i -verbose libfreshclam/*.c
 clang-format -i -verbose libfreshclam/*.h
-clang-format -i -verbose shared/*.c
-clang-format -i -verbose shared/*.h
+clang-format -i -verbose common/*.c
+clang-format -i -verbose common/*.h
 clang-format -i -verbose sigtool/*.c
 clang-format -i -verbose sigtool/*.h
 clang-format -i -verbose clamonacc/*.c
--- a/clamav-milter/CMakeLists.txt
+++ b/clamav-milter/CMakeLists.txt
@ -20,6 +20,6 @@ set_target_properties( clamav-milter PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamav-milter
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared
+        ClamAV::common
        Sendmail::milter )
 install(TARGETS clamav-milter DESTINATION ${CMAKE_INSTALL_SBINDIR})
--- a/clamav-milter/Makefile.am
+++ b/clamav-milter/Makefile.am
@ -37,6 +37,6 @@ AM_CFLAGS=@WERR_CFLAGS_MILTER@

 endif

-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
-AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/shared -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/common -I$(top_srcdir) @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
 CLEANFILES=*.gcda *.gcno
--- a/clamav-milter/clamav-milter.c
+++ b/clamav-milter/clamav-milter.c
@ -41,7 +41,7 @@
 #include "clamav.h"
 #include "default.h"

-// shared
+// common
 #include "output.h"
 #include "optparser.h"
 #include "misc.h"
--- a/clamav-milter/clamfi.c
+++ b/clamav-milter/clamfi.c
@ -38,7 +38,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamav-milter/netcode.c
+++ b/clamav-milter/netcode.c
@ -49,7 +49,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "output.h"
 #include "optparser.h"

--- a/clamav-milter/whitelist.c
+++ b/clamav-milter/whitelist.c
@ -30,7 +30,7 @@
 // libclamav
 #include "regex/regex.h"

-// shared
+// common
 #include "output.h"

 #include "whitelist.h"
--- a/clambc/CMakeLists.txt
+++ b/clambc/CMakeLists.txt
@ -25,7 +25,7 @@ set_target_properties( clambc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clambc
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS clambc DESTINATION .)
 else()
--- a/clambc/Makefile.am
+++ b/clambc/Makefile.am
@ -3,6 +3,6 @@ clambc_SOURCES = \
    bcrun.c

 AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @THREAD_LIBS@
 CLEANFILES=*.gcda *.gcno
--- a/clambc/bcrun.c
+++ b/clambc/bcrun.c
@ -35,7 +35,7 @@
 #include "bytecode.h"
 #include "bytecode_priv.h"

-// shared
+// common
 #include "optparser.h"
 #include "misc.h"

--- a/clamconf/CMakeLists.txt
+++ b/clamconf/CMakeLists.txt
@ -25,7 +25,7 @@ set_target_properties( clamconf PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamconf
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS clamconf DESTINATION .)
 else()
--- a/clamconf/Makefile.am
+++ b/clamconf/Makefile.am
@ -26,10 +26,10 @@ clamconf_SOURCES = \
 AM_CFLAGS=@WERR_CFLAGS@ @SSL_CPPFLAGS@

 DEFS = @DEFS@
-AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
+AM_CPPFLAGS = @CLAMCONF_CPPFLAGS@ -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
 	      @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@\
 	      -DBUILD_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILD_CFLAGS="\"$(CFLAGS)\""\
 	      -DBUILD_CXXFLAGS="\"$(CXXFLAGS)\"" -DBUILD_LDFLAGS="\"$(LDFLAGS)\""\
 	      -DBUILD_CONFIGURE_FLAGS="\"$(BUILD_CONFIGURE_FLAGS)\""
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMCONF_LIBS@ @CLAMD_LIBS@ @THREAD_LIBS@ @LIBCLAMAV_LIBS@ @ZLIB_LIBS@
 CLEANFILES=*.gcda *.gcno
--- a/clamconf/clamconf.c
+++ b/clamconf/clamconf.c
@ -49,7 +49,7 @@
 #include "bytecode_detect.h"
 #include "fpu.h"

-// shared
+// common
 #include "optparser.h"
 #include "misc.h"

--- a/clamd/CMakeLists.txt
+++ b/clamd/CMakeLists.txt
@ -40,7 +40,7 @@ set_target_properties( clamd PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamd
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS clamd DESTINATION .)
 else()
--- a/clamd/Makefile.am
+++ b/clamd/Makefile.am
@ -44,8 +44,8 @@ if INSTALL_SYSTEMD_UNITS
 systemdsystemunit_DATA = clamav-daemon.socket clamav-daemon.service
 endif

-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @CLAMD_LIBS@ @THREAD_LIBS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @CLAMD_LIBS@ @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 # it does support --help and --version but with the default config file
 # it outputs an error message which tells us to edit the config files
--- a/clamd/clamd.c
+++ b/clamd/clamd.c
@ -63,7 +63,7 @@
 #include "matcher-ac.h"
 #include "readdb.h"

-// shared
+// common
 #include "output.h"
 #include "optparser.h"
 #include "misc.h"
--- a/clamd/clamd_others.c
+++ b/clamd/clamd_others.c
@ -73,7 +73,7 @@
 #include "scanners.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamd/localserver.c
+++ b/clamd/localserver.c
@ -40,7 +40,7 @@
 #include "clamav.h"
 #include "str.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamd/scanner.c
+++ b/clamd/scanner.c
@ -51,7 +51,7 @@
 #include "others.h"
 #include "scanners.h"

-// shared
+// common
 #include "idmef_logging.h"
 #include "optparser.h"
 #include "output.h"
--- a/clamd/scanner.h
+++ b/clamd/scanner.h
@ -28,7 +28,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"

 #include "thrmgr.h"
--- a/clamd/server-th.c
+++ b/clamd/server-th.c
@ -51,7 +51,7 @@
 #include "others.h"
 #include "readdb.h"

-// shared
+// common
 #include "output.h"
 #include "optparser.h"
 #include "misc.h"
--- a/clamd/server.h
+++ b/clamd/server.h
@ -29,7 +29,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"

 #include "thrmgr.h"
--- a/clamd/session.c
+++ b/clamd/session.c
@ -55,7 +55,7 @@
 #include "str.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamd/session.h
+++ b/clamd/session.h
@ -52,7 +52,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"

 #include "server.h"
--- a/clamd/tcpserver.c
+++ b/clamd/tcpserver.c
@ -40,7 +40,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamd/thrmgr.c
+++ b/clamd/thrmgr.c
@ -35,7 +35,7 @@
 #include "others.h"
 #include "mpool.h"

-// shared
+// common
 #include "output.h"

 #include "thrmgr.h"
--- a/clamdscan/CMakeLists.txt
+++ b/clamdscan/CMakeLists.txt
@ -29,7 +29,7 @@ set_target_properties( clamdscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamdscan
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS clamdscan DESTINATION .)
 else()
--- a/clamdscan/Makefile.am
+++ b/clamdscan/Makefile.am
@ -28,8 +28,8 @@ clamdscan_SOURCES = \

 AM_CFLAGS=@WERR_CFLAGS@

-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
-LIBS = $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la @CLAMDSCAN_LIBS@ @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamscan -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CLAMDSCAN_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+LIBS = $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la @CLAMDSCAN_LIBS@ @THREAD_LIBS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamdscan$(EXEEXT)
 CLEANFILES=*.gcda *.gcno
--- a/clamdscan/clamdscan.c
+++ b/clamdscan/clamdscan.c
@ -38,7 +38,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "output.h"
 #include "misc.h"
 #include "optparser.h"
--- a/clamdscan/client.c
+++ b/clamdscan/client.c
@ -58,7 +58,7 @@
 #include "str.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamdscan/proto.c
+++ b/clamdscan/proto.c
@ -56,7 +56,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "actions.h"
 #include "output.h"
 #include "misc.h"
--- a/clamdtop/CMakeLists.txt
+++ b/clamdtop/CMakeLists.txt
@ -25,7 +25,7 @@ set_target_properties( clamdtop PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamdtop
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared
+        ClamAV::common
        Curses::curses )
 if(WIN32)
    install(TARGETS clamdtop DESTINATION .)
--- a/clamdtop/Makefile.am
+++ b/clamdtop/Makefile.am
@ -5,8 +5,8 @@ clamdtop_SOURCES = \
    clamdtop.c

 AM_CFLAGS=@WERR_CFLAGS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
-clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ @THREAD_LIBS@ $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @CURSES_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+clamdtop_LDADD = @SSL_LDFLAGS@ @SSL_LIBS@ @CURSES_LIBS@ @THREAD_LIBS@ $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la
 endif

 DEFS = @DEFS@
--- a/clamdtop/clamdtop.c
+++ b/clamdtop/clamdtop.c
@ -65,7 +65,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"
 #include "misc.h"

--- a/clamonacc/CMakeLists.txt
+++ b/clamonacc/CMakeLists.txt
@ -47,7 +47,7 @@ set_target_properties( clamonacc PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamonacc
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared
+        ClamAV::common
        CURL::libcurl )
 install(TARGETS clamonacc DESTINATION ${CMAKE_INSTALL_SBINDIR})

--- a/clamonacc/Makefile.am
+++ b/clamonacc/Makefile.am
@ -58,8 +58,8 @@ if INSTALL_SYSTEMD_UNITS
 systemdsystemunit_DATA = clamav-clamonacc.service
 endif

-LIBS = $(top_builddir)/shared/libshared.la $(top_builddir)/libclamav/libclamav.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamonacc -I$(top_srcdir)/shared -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+LIBS = $(top_builddir)/common/libcommon.la $(top_builddir)/libclamav/libclamav.la @CURL_LIBS@ @CLAMONACC_LIBS@ @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/clamonacc -I$(top_srcdir)/common -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @CLAMONACC_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=clamonacc$(EXEEXT)
 CLEANFILES=*.gcda *.gcno
--- a/clamonacc/clamonacc.c
+++ b/clamonacc/clamonacc.c
@ -46,7 +46,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "output.h"
 #include "misc.h"
 #include "optparser.h"
--- a/clamonacc/client/client.c
+++ b/clamonacc/client/client.c
@ -57,7 +57,7 @@
 #include "str.h"
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/clamonacc/client/protocol.c
+++ b/clamonacc/client/protocol.c
@ -57,7 +57,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "actions.h"
 #include "output.h"
 #include "misc.h"
--- a/clamonacc/fanotif/fanotif.c
+++ b/clamonacc/fanotif/fanotif.c
@ -40,7 +40,7 @@
 #include "clamav.h"
 #include "scanners.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/inotif/hash.c
+++ b/clamonacc/inotif/hash.c
@ -42,7 +42,7 @@
 #include "scanners.h"
 #include "str.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/inotif/inotif.c
+++ b/clamonacc/inotif/inotif.c
@ -43,7 +43,7 @@
 #include "clamav.h"
 #include "scanners.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/inotif/inotif.h
+++ b/clamonacc/inotif/inotif.h
@ -26,7 +26,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"

 #include "clamonacc.h"
--- a/clamonacc/misc/utils.c
+++ b/clamonacc/misc/utils.c
@ -34,7 +34,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/misc/utils.h
+++ b/clamonacc/misc/utils.h
@ -24,7 +24,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"

 #include "../clamonacc.h"
--- a/clamonacc/scan/onas_queue.c
+++ b/clamonacc/scan/onas_queue.c
@ -35,7 +35,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/scan/thread.c
+++ b/clamonacc/scan/thread.c
@ -37,7 +37,7 @@
 // libclamav
 #include "others.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"

--- a/clamonacc/scan/thread.h
+++ b/clamonacc/scan/thread.h
@ -28,7 +28,7 @@
 // libclamav
 #include "clamav.h"

-// shared
+// common
 #include "optparser.h"

 #define ONAS_SCTH_B_DIR 0x01
--- a/clamscan/CMakeLists.txt
+++ b/clamscan/CMakeLists.txt
@ -28,7 +28,7 @@ set_target_properties( clamscan PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamscan
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS clamscan DESTINATION .)
 else()
--- a/clamscan/Makefile.am
+++ b/clamscan/Makefile.am
@ -30,7 +30,7 @@ clamscan_SOURCES = \

 AM_CFLAGS=@WERR_CFLAGS@
 DEFS = @DEFS@
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @THREAD_LIBS@ @CLAMSCAN_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @CLAMSCAN_CPPFLAGS@

 CLEANFILES=*.gcda *.gcno
--- a/clamscan/clamscan.c
+++ b/clamscan/clamscan.c
@ -45,7 +45,7 @@
 #include "others.h"
 #include "str.h"

-// shared
+// common
 #include "misc.h"
 #include "output.h"
 #include "actions.h"
--- a/clamscan/manager.c
+++ b/clamscan/manager.c
@ -57,7 +57,7 @@
 #include "str.h"
 #include "readdb.h"

-// shared
+// common
 #include "optparser.h"
 #include "actions.h"
 #include "output.h"
--- a/clamsubmit/CMakeLists.txt
+++ b/clamsubmit/CMakeLists.txt
@ -25,7 +25,7 @@ set_target_properties( clamsubmit PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( clamsubmit
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared
+        ClamAV::common
        JSONC::jsonc
        CURL::libcurl )
 if(APPLE)
--- a/clamsubmit/Makefile.am
+++ b/clamsubmit/Makefile.am
@ -23,8 +23,8 @@ clamsubmit_SOURCES = \

 AM_CFLAGS=@WERR_CFLAGS@ @CLAMSUBMIT_CFLAGS@
 DEFS = @DEFS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la  @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la  @CLAMSUBMIT_LIBS@ @THREAD_LIBS@ @JSON_LIBS@ @SSL_LIBS@

 if MACOS
 AM_LDFLAGS = -framework CoreFoundation -framework Security
--- a/clamsubmit/clamsubmit.c
+++ b/clamsubmit/clamsubmit.c
@ -45,7 +45,7 @@
 #include "clamav.h"
 #include "others.h"

-// shared
+// common
 #include "misc.h"
 #include "getopt.h"
 #include "cert_util.h"
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@ -10,9 +10,9 @@ if(WIN32)
    include_directories(${CMAKE_SOURCE_DIR}/win32/compat)
 endif()

-# The shared object library
-add_library( shared_obj OBJECT )
-target_sources( shared_obj
+# The "common" object library
+add_library( common_obj OBJECT )
+target_sources( common_obj
    PRIVATE
        cert_util.c
        cdiff.c
@ -38,24 +38,24 @@ target_sources( shared_obj
        optparser.h
        output.h
        tar.h )
-target_include_directories( shared_obj
+target_include_directories( common_obj
    PRIVATE ${CMAKE_BINARY_DIR}
    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR} )
 if(FOUND_SYSTEMD)
-    target_include_directories( shared_obj
+    target_include_directories( common_obj
        PRIVATE ${SYSTEMD_INCLUDE_DIRS} )
 endif()
-set_target_properties( shared_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+set_target_properties( common_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )

 if(APPLE)
-    target_sources( shared_obj PRIVATE mac/cert_util_mac.m )
+    target_sources( common_obj PRIVATE mac/cert_util_mac.m )
 elseif(WIN32)
-    target_sources( shared_obj PRIVATE win/cert_util_win.c )
+    target_sources( common_obj PRIVATE win/cert_util_win.c )
 else()
-    target_sources( shared_obj PRIVATE linux/cert_util_linux.c )
+    target_sources( common_obj PRIVATE linux/cert_util_linux.c )
 endif()

-target_link_libraries( shared_obj
+target_link_libraries( common_obj
    PUBLIC
        ClamAV::libclamav
        ZLIB::ZLIB
@ -63,26 +63,26 @@ target_link_libraries( shared_obj
        OpenSSL::SSL
        OpenSSL::Crypto )
 if(WIN32)
-    target_link_libraries( shared_obj
+    target_link_libraries( common_obj
        PUBLIC
            crypt32 )
 endif()

 if(HAVE_SYSTEMD)
-    target_link_libraries( shared_obj
+    target_link_libraries( common_obj
        PRIVATE
            SYSTEMD::systemd )
 endif()

-# The shared static library.
-add_library( shared STATIC )
+# The "common" static library.
+add_library( common STATIC )

-target_link_libraries( shared
+target_link_libraries( common
    PUBLIC
-        shared_obj )
-set_target_properties( shared PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
+        common_obj )
+set_target_properties( common PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 if(WIN32)
-    set_target_properties(shared PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
+    set_target_properties(common PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif()

-add_library( ClamAV::shared ALIAS shared )
+add_library( ClamAV::common ALIAS common )
--- a/common/Makefile.am
+++ b/common/Makefile.am
@ -2,7 +2,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/libclamav -I$(top_builddir)/libcla
 LIBS = @SSL_LDFLAGS@ @SSL_LIBS@
 AM_LIBTOOLFLAGS = --tag CC

-libshared_la_SOURCES= \
+libcommon_la_SOURCES= \
    actions.c \
    actions.h \
    cdiff.c \
@ -29,19 +29,19 @@ libshared_la_SOURCES= \
    tar.h

 if MACOS
-    libshared_la_SOURCES += \
+    libcommon_la_SOURCES += \
        mac/cert_util_mac.m \
        cert_util.h
 endif
 if WINDOWS
-    libshared_la_SOURCES += \
+    libcommon_la_SOURCES += \
        win/cert_util_win.c \
        cert_util.h
 endif
 if LINUX
-    libshared_la_SOURCES += \
+    libcommon_la_SOURCES += \
        linux/cert_util_linux.c \
        cert_util.h
 endif

-noinst_LTLIBRARIES=libshared.la
+noinst_LTLIBRARIES=libcommon.la
--- a/common/actions.c
+++ b/common/actions.c
--- a/common/actions.h
+++ b/common/actions.h
--- a/common/cdiff.c
+++ b/common/cdiff.c
@ -39,7 +39,7 @@
 #include "dsig.h"
 #include "others.h"

-// shared
+// common
 #include "misc.h"
 #include "output.h"
 #include "cdiff.h"
--- a/common/cdiff.h
+++ b/common/cdiff.h
--- a/common/cert_util.c
+++ b/common/cert_util.c
--- a/common/cert_util.h
+++ b/common/cert_util.h
--- a/common/cert_util_internal.h
+++ b/common/cert_util_internal.h
--- a/common/clamdcom.c
+++ b/common/clamdcom.c
--- a/common/clamdcom.h
+++ b/common/clamdcom.h
--- a/common/fdpassing.h
+++ b/common/fdpassing.h
--- a/common/getopt.c
+++ b/common/getopt.c
--- a/common/getopt.h
+++ b/common/getopt.h
--- a/common/hostid.c
+++ b/common/hostid.c
--- a/common/hostid.h
+++ b/common/hostid.h
--- a/common/idmef_logging.c
+++ b/common/idmef_logging.c
--- a/common/idmef_logging.h
+++ b/common/idmef_logging.h
--- a/common/linux/cert_util_linux.c
+++ b/common/linux/cert_util_linux.c
--- a/common/mac/cert_util_mac.m
+++ b/common/mac/cert_util_mac.m
--- a/common/misc.c
+++ b/common/misc.c
--- a/common/misc.h
+++ b/common/misc.h
--- a/common/optparser.c
+++ b/common/optparser.c
--- a/common/optparser.h
+++ b/common/optparser.h
--- a/common/output.c
+++ b/common/output.c
--- a/common/output.h
+++ b/common/output.h
--- a/common/tar.c
+++ b/common/tar.c
--- a/common/tar.h
+++ b/common/tar.h
--- a/common/win/cert_util_win.c
+++ b/common/win/cert_util_win.c
--- a/configure.ac
+++ b/configure.ac
@ -185,7 +185,6 @@ AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
 AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
 AM_CONDITIONAL([MACOS], [test "$build_mac" = "yes"])

-
 AC_CONFIG_FILES([
                 Makefile
                 clamav-config
@ -198,7 +197,7 @@ if test "x$enable_libclamav_only" != "xyes"; then
                     clamscan/Makefile
                     database/Makefile
                     docs/Makefile
-                     shared/Makefile
+                     common/Makefile
                     clamd/Makefile
                     clamd/clamav-daemon.service
                     clamd/clamav-daemon.socket
@ -321,6 +320,7 @@ if test "x$enable_debug" = "xyes"; then
 else
    CL_MSG_STATUS([release mode],[yes],[yes])
 fi
+
 have_jit="no"
 if test "$subdirfailed" = "no"; then
    have_jit="yes"
--- a/freshclam/CMakeLists.txt
+++ b/freshclam/CMakeLists.txt
@ -27,7 +27,7 @@ target_link_libraries(freshclam-bin
    PRIVATE
        ClamAV::libfreshclam
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS freshclam-bin DESTINATION .)
 else()
--- a/freshclam/Makefile.am
+++ b/freshclam/Makefile.am
@ -34,7 +34,7 @@ endif

 AM_CFLAGS=@WERR_CFLAGS@
 DEFS = @DEFS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface -I$(top_srcdir)/libfreshclam @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
 LIBS = @SSL_LDFLAGS@ @SSL_LIBS@ @CURL_LDFLAGS@ @CURL_LIBS@ $(top_builddir)/libclamav/libclamav.la $(top_builddir)/libfreshclam/libfreshclam.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @THREAD_LIBS@

 AM_INSTALLCHECK_STD_OPTIONS_EXEMPT=freshclam$(EXEEXT)
--- a/freshclam/freshclam.c
+++ b/freshclam/freshclam.c
@ -55,7 +55,7 @@
 #include "others.h"
 #include "str.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "misc.h"
--- a/fuzz/Makefile.am
+++ b/fuzz/Makefile.am
@ -14,7 +14,7 @@ LIB_FUZZING_ENGINE_DEPRECATED ?= libstandalone_fuzz_target_runner.a

 AM_CPPFLAGS = \
    @SSL_CPPFLAGS@ \
-    -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
+    -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface \
    -std=c++11 -stdlib=libc++

 AM_LDFLAGS = \
--- a/libclamunrar_iface/Doxyfile
+++ b/libclamunrar_iface/Doxyfile
@ -19,4 +19,4 @@ MAX_DOT_GRAPH_DEPTH=3

 EXTRACT_ALL=YES
 INPUT = . \
-        ../shared
+        ../common
--- a/libfreshclam/CMakeLists.txt
+++ b/libfreshclam/CMakeLists.txt
@ -22,12 +22,13 @@ target_sources( libfreshclam_obj
    PUBLIC
        libfreshclam.h )
 target_include_directories( libfreshclam_obj
-    PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
+    PRIVATE
+        ${CMAKE_BINARY_DIR} # For clamav-config.h
    PUBLIC  ${CMAKE_CURRENT_SOURCE_DIR} )
 set_target_properties( libfreshclam_obj PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( libfreshclam_obj
    PUBLIC
-        ClamAV::shared
+        ClamAV::common
        CURL::libcurl
        OpenSSL::SSL
        OpenSSL::Crypto )
--- a/libfreshclam/Makefile.am
+++ b/libfreshclam/Makefile.am
@ -16,7 +16,7 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 #  MA 02110-1301, USA.

-libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@
+libfreshclam_la_LIBADD = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @FRESHCLAM_LIBS@ @ZLIB_LIBS@ @CURL_LIBS@ @SSL_LIBS@ @JSON_LIBS@ @LIBLTDL@ @THREAD_LIBS@ @LIBM@
 libfreshclam_la_DEPENDENCIES = @LTDLDEPS@
 libfreshclam_la_LDFLAGS = @CURL_LDFLAGS@ @SSL_LDFLAGS@ @TH_SAFE@ @JSON_LDFLAGS@ @LIBICONV@ $(XML_LIBS) -version-info @LIBFRESHCLAM_VERSION@ -no-undefined

@ -46,6 +46,6 @@ lib_LTLIBRARIES = libfreshclam.la

 AM_CFLAGS=@WERR_CFLAGS@
 DEFS = @DEFS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @CURL_CPPFLAGS@ @SSL_CPPFLAGS@ @FRESHCLAM_CPPFLAGS@ @ZLIB_CFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@

 CLEANFILES=*.gcda *.gcno
--- a/libfreshclam/libfreshclam.c
+++ b/libfreshclam/libfreshclam.c
@ -60,7 +60,7 @@
 #include "regex_list.h"
 #include "str.h"

-// shared
+// common
 #include "cert_util.h"
 #include "output.h"
 #include "misc.h"
--- a/libfreshclam/libfreshclam_internal.c
+++ b/libfreshclam/libfreshclam_internal.c
@ -77,7 +77,7 @@
 #include "cvd.h"
 #include "regex_list.h"

-// shared
+// common
 #include "optparser.h"
 #include "output.h"
 #include "cdiff.h"
--- a/sigtool/CMakeLists.txt
+++ b/sigtool/CMakeLists.txt
@ -21,13 +21,15 @@ if(WIN32)
    target_sources( sigtool PRIVATE ${CMAKE_SOURCE_DIR}/win32/res/sigtool.rc )
 endif()
 target_include_directories( sigtool
-    PRIVATE ${CMAKE_BINARY_DIR} # For clamav-config.h
+    PRIVATE
+        ${CMAKE_BINARY_DIR} # For clamav-config.h
 )
+
 set_target_properties( sigtool PROPERTIES COMPILE_FLAGS "${WARNCFLAGS}" )
 target_link_libraries( sigtool
    PRIVATE
        ClamAV::libclamav
-        ClamAV::shared )
+        ClamAV::common )
 if(WIN32)
    install(TARGETS sigtool DESTINATION .)
 else()
--- a/sigtool/Makefile.am
+++ b/sigtool/Makefile.am
@ -27,6 +27,6 @@ sigtool_SOURCES = \

 AM_CFLAGS=@WERR_CFLAGS@
 DEFS = @DEFS@
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
-LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/shared/libshared.la @SSL_LDFLAGS@ @SSL_LIBS@ @THREAD_LIBS@
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/libclamav -I$(top_builddir)/libclamav -I$(top_srcdir)/libclamunrar_iface @SSL_CPPFLAGS@ @JSON_CPPFLAGS@ @PCRE_CPPFLAGS@ @SIGTOOL_CPPFLAGS@
+LIBS = $(top_builddir)/libclamav/libclamav.la $(top_builddir)/common/libcommon.la @SSL_LDFLAGS@ @SSL_LIBS@ @THREAD_LIBS@
 CLEANFILES=*.gcda *.gcno
--- a/sigtool/sigtool.c
+++ b/sigtool/sigtool.c
@ -70,7 +70,7 @@
 #include "pe.h"
 #include "entconv.h"

-// shared
+// common
 #include "output.h"
 #include "optparser.h"
 #include "misc.h"
--- a/sigtool/vba.c
+++ b/sigtool/vba.c
@ -39,7 +39,7 @@
 #include "ole2_extract.h"
 #include "readdb.h"

-// shared
+// common
 #include "output.h"

 #include "vba.h"
--- a/Show more
+++ b/Show more