Separated search from xfs

Author: kala13x

.github/workflows/macos.yml

@@ -25,8 +25,4 @@ jobs:
         cmake --version
 
     - name: Build with CMake
-      run: |
-        mkdir build
-        cd build
-        cmake ..
-        make
+      run: ./build.sh --examples --tools --install

CMakeLists.txt

@@ -79,6 +79,7 @@ add_library(xutils STATIC
     ./src/sys/log.c
     ./src/sys/sig.c
     ./src/sys/xfs.c
+    ./src/sys/search.c
     ./src/sys/xtime.c
 )
 

Makefile

@@ -3,51 +3,52 @@
 # https://github.com/kala13x/smake #
 ####################################
 
-CFLAGS = -D_XUTILS_USE_SSL -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED
+CFLAGS = -g -O2 -Wall -D_XUTILS_DEBUG -D_XUTILS_USE_GNU -D_ASSERT_TIMED -D_XUTILS_USE_SSL
 CFLAGS += -I./src/crypt -I./src/data -I./src/net -I./src/sys -I./src
-LIBS = -lssl -lcrypto -lpthread
+LIBS = -lpthread -lssl -lcrypto
 NAME = libxutils.a
 ODIR = ./build
 OBJ = o
 
-OBJS = xver.$(OBJ) \
-    aes.$(OBJ) \
-    base64.$(OBJ) \
-    crc32.$(OBJ) \
-    crypt.$(OBJ) \
-    hmac.$(OBJ) \
-    md5.$(OBJ) \
-    rsa.$(OBJ) \
-    sha256.$(OBJ) \
-    sha1.$(OBJ) \
-    array.$(OBJ) \
-    hash.$(OBJ) \
-    json.$(OBJ) \
-    jwt.$(OBJ) \
-    list.$(OBJ) \
-    map.$(OBJ) \
-    buf.$(OBJ) \
-    str.$(OBJ) \
-    addr.$(OBJ) \
-    event.$(OBJ) \
-    http.$(OBJ) \
-    mdtp.$(OBJ) \
-    ntp.$(OBJ) \
-    rtp.$(OBJ) \
-    sock.$(OBJ) \
-    api.$(OBJ) \
-    ws.$(OBJ) \
-    sync.$(OBJ) \
-    pool.$(OBJ) \
-    thread.$(OBJ) \
-    type.$(OBJ) \
-    cli.$(OBJ) \
-    cpu.$(OBJ) \
-    mon.$(OBJ) \
-    log.$(OBJ) \
-    sig.$(OBJ) \
-    xfs.$(OBJ) \
-    xtime.$(OBJ) \
+OBJS = addr.$(OBJ) \
+	aes.$(OBJ) \
+	api.$(OBJ) \
+	array.$(OBJ) \
+	base64.$(OBJ) \
+	buf.$(OBJ) \
+	cli.$(OBJ) \
+	cpu.$(OBJ) \
+	crc32.$(OBJ) \
+	crypt.$(OBJ) \
+	event.$(OBJ) \
+	hash.$(OBJ) \
+	hmac.$(OBJ) \
+	http.$(OBJ) \
+	json.$(OBJ) \
+	jwt.$(OBJ) \
+	list.$(OBJ) \
+	log.$(OBJ) \
+	map.$(OBJ) \
+	md5.$(OBJ) \
+	mdtp.$(OBJ) \
+	mon.$(OBJ) \
+	ntp.$(OBJ) \
+	pool.$(OBJ) \
+	rsa.$(OBJ) \
+	rtp.$(OBJ) \
+	search.$(OBJ) \
+	sha1.$(OBJ) \
+	sha256.$(OBJ) \
+	sig.$(OBJ) \
+	sock.$(OBJ) \
+	str.$(OBJ) \
+	sync.$(OBJ) \
+	thread.$(OBJ) \
+	type.$(OBJ) \
+	ws.$(OBJ) \
+	xfs.$(OBJ) \
+	xtime.$(OBJ) \
+	xver.$(OBJ)
 
 OBJECTS = $(patsubst %,$(ODIR)/%,$(OBJS))
 INSTALL_INC = /usr/local/include/xutils

README.md

@@ -42,9 +42,10 @@
 #### System:
 - [Cross-platform file and directory operations](https://github.com/kala13x/libxutils/blob/main/src/sys/xfs.h)
 - [Cross-platform CPU affinity manipulation](https://github.com/kala13x/libxutils/blob/main/src/sys/cpu.h)
-- [Implementation of advanced file search](https://github.com/kala13x/libxutils/blob/main/src/sys/xfs.h)
+- [Implementation of advanced file search](https://github.com/kala13x/libxutils/blob/main/src/sys/search.h)
 - [System time manipulation library](https://github.com/kala13x/libxutils/blob/main/src/sys/xtime.h)
 - [Performance monitoring library](https://github.com/kala13x/libxutils/blob/main/src/sys/mon.h)
+- [File and directory operations](https://github.com/kala13x/libxutils/blob/main/src/sys/xfs.h)
 - [Simple and fast memory pool](https://github.com/kala13x/libxutils/blob/main/src/sys/pool.h)
 - [Advanced logging library](https://github.com/kala13x/libxutils/blob/main/src/sys/log.h)
 
@@ -109,38 +110,6 @@ make
 sudo make install
 ```
 
-### Build particular files only
-If you want to use particular files and functions, you can configure the library and select only that functionality for the build. In this way, it is possible not to increase the size of the program and to avoid the linkage of unused code.
-
-The `libxutils` project has a config file that contains a list of modules that will be included in the build. This file is used by the `build.sh` script, which resolves dependencies for each enabled module and generates a `CMakeList.txt` file.
-
-Open `xutils.conf` file with a text editor and mark only the functionality you want to include in the build. Use a low-case `y` symbol to enable and any other symbol to disable modules. Removing a related line from the list will also disable the module.
-
-Example:
-```
-...
-USE_ARRAY=n
-USE_CRYPT=n
-USE_XTIME=n
-USE_EVENT=y
-USE_LIST=n
-USE_BUF=n
-USE_HASH=n
-USE_SOCK=n
-USE_LOG=y
-USE_STR=n
-...
-```
-After updating the configuration, use the `build.sh` script to generate the `Makefile` and build the project.
-
-```bash
-./build.sh --tool=cmake
-```
-
-You may notice that when you select only one module, several other modules may be also included in the build. Because some files depend on other files in the project, the `build.sh` script will automatically resolve these dependencies and include required files in the build as well.
-
-For example, if you only mark HTTP library for a build, the socket library will be automatically enabled because HTTP uses some functionality from sockets.
-
 ### Dependencies
 The only dependency that the library uses is the `openssl-devel` package for the `SSL` and `RSA` implementations.\
 You can either install the `openssl-devel` package or disable the `SSL` support in the library.
@@ -186,7 +155,7 @@ cmake . && make
 #### XTOP and more
 
 <p align="center">
-    <img src="https://raw.githubusercontent.com/kala13x/libxutils/main/misc/xtop.png" alt="alternate text">
+    <img src="https://raw.githubusercontent.com/kala13x/libxutils/main/examples/xtop.png" alt="alternate text">
 </p>
 
 `XTOP` is `HTOP` like performance monitor that supports to monitor CPU, memory, and network traffic into a single window. In addition, it has powerful `REST API` client/server mode and much more.

build.sh

@@ -7,7 +7,7 @@ TOOL_PATH=$PROJ_PATH/tools
 LIB_PATH=$PROJ_PATH
 
 INSTALL_PREFIX="/usr/local"
-MAKE_TOOL="make"
+MAKE_TOOL="cmake"
 USE_SSL="yes"
 
 EXAMPLES_DONE=0
@@ -111,20 +111,18 @@ build_examples() {
 }
 
 build_library() {
-    cd $PROJ_PATH/misc
-    ./generate.sh $MAKE_TOOL --prefix=$INSTALL_PREFIX --ssl=$USE_SSL
     cd $PROJ_PATH
 
     if [[ $MAKE_TOOL == "make" ]]; then
         make -j $CPU_COUNT
         LIB_PATH=$PROJ_PATH
+    elif [[ $MAKE_TOOL == "smake" ]]; then
+        smake . && make -j $CPU_COUNT
+        LIB_PATH=$PROJ_PATH
     elif [[ $MAKE_TOOL == "cmake" ]]; then
         mkdir -p build && cd build
         cmake .. && make -j $CPU_COUNT
         LIB_PATH=$PROJ_PATH/build
-    elif [[ $MAKE_TOOL == "smake" ]]; then
-        smake . && make -j $CPU_COUNT
-        LIB_PATH=$PROJ_PATH
     else
         echo "Unknown build tool: $MAKE_TOOL"
         echo "Specify cmake, smake or make)"