Skip to content

Commit 7a8ffb2

Browse files
committed
Packages: split code
1 parent 73c0347 commit 7a8ffb2

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ elseif(NetBSD)
787787
src/detection/netio/netio_bsd.c
788788
src/detection/opengl/opengl_linux.c
789789
src/detection/os/os_nbsd.c
790-
src/detection/packages/packages_obsd.c
790+
src/detection/packages/packages_nbsd.c
791791
src/detection/poweradapter/poweradapter_nosupport.c
792792
src/detection/processes/processes_nbsd.c
793793
src/detection/gtk_qt/qt.c
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#include "packages.h"
2+
3+
#include "common/io/io.h"
4+
5+
void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
6+
{
7+
if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT))
8+
result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true);
9+
}

src/detection/packages/packages_obsd.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
66
{
7-
#if __OpenBSD__
87
if (!(options->disabled & FF_PACKAGES_FLAG_PKG_BIT))
98
result->pkg = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/var/db/pkg", true);
10-
#elif __NetBSD__
11-
if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT))
12-
result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true);
13-
#endif
149
}

0 commit comments

Comments
 (0)