From 7a8ffb27bd8d26164928e4bb42a40d26cbc6b65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 26 May 2025 15:12:47 +0800 Subject: [PATCH] Packages: split code --- CMakeLists.txt | 2 +- src/detection/packages/packages_nbsd.c | 9 +++++++++ src/detection/packages/packages_obsd.c | 5 ----- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 src/detection/packages/packages_nbsd.c diff --git a/CMakeLists.txt b/CMakeLists.txt index b2103fbb7..80904490f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -787,7 +787,7 @@ elseif(NetBSD) src/detection/netio/netio_bsd.c src/detection/opengl/opengl_linux.c src/detection/os/os_nbsd.c - src/detection/packages/packages_obsd.c + src/detection/packages/packages_nbsd.c src/detection/poweradapter/poweradapter_nosupport.c src/detection/processes/processes_nbsd.c src/detection/gtk_qt/qt.c diff --git a/src/detection/packages/packages_nbsd.c b/src/detection/packages/packages_nbsd.c new file mode 100644 index 000000000..e4004bde6 --- /dev/null +++ b/src/detection/packages/packages_nbsd.c @@ -0,0 +1,9 @@ +#include "packages.h" + +#include "common/io/io.h" + +void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) +{ + if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) + result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true); +} diff --git a/src/detection/packages/packages_obsd.c b/src/detection/packages/packages_obsd.c index 46ec94d35..422b402a1 100644 --- a/src/detection/packages/packages_obsd.c +++ b/src/detection/packages/packages_obsd.c @@ -4,11 +4,6 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) { - #if __OpenBSD__ if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT)) result->pkg = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/var/db/pkg", true); - #elif __NetBSD__ - if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) - result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true); - #endif }