Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,7 @@ if(LINUX)
src/detection/os/os_linux.c
src/detection/packages/packages_linux.c
src/detection/packages/packages_nix.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_linux.c
src/detection/processes/processes_linux.c
src/detection/gtk_qt/qt.c
Expand Down Expand Up @@ -692,6 +693,7 @@ elseif(ANDROID)
src/detection/os/os_android.c
src/detection/packages/packages_linux.c
src/detection/packages/packages_nix.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_nosupport.c
src/detection/processes/processes_linux.c
src/detection/sound/sound_linux.c
Expand Down Expand Up @@ -869,6 +871,7 @@ elseif(NetBSD)
src/detection/opengl/opengl_linux.c
src/detection/os/os_nbsd.c
src/detection/packages/packages_nbsd.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_nosupport.c
src/detection/processes/processes_nbsd.c
src/detection/gtk_qt/qt.c
Expand Down Expand Up @@ -1024,6 +1027,7 @@ elseif(APPLE)
src/detection/os/os_apple.m
src/detection/packages/packages_apple.c
src/detection/packages/packages_nix.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_apple.c
src/detection/processes/processes_bsd.c
src/detection/sound/sound_apple.c
Expand Down Expand Up @@ -1197,6 +1201,7 @@ elseif(SunOS)
src/detection/opengl/opengl_linux.c
src/detection/os/os_sunos.c
src/detection/packages/packages_sunos.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_nosupport.c
src/detection/processes/processes_linux.c
src/detection/gtk_qt/qt.c
Expand Down Expand Up @@ -1345,6 +1350,7 @@ elseif(GNU)
src/detection/os/os_linux.c
src/detection/packages/packages_linux.c
src/detection/packages/packages_nix.c
src/detection/packages/packages_pkgsrc.c
src/detection/poweradapter/poweradapter_nosupport.c
src/detection/processes/processes_linux.c
src/detection/gtk_qt/qt.c
Expand Down
3 changes: 3 additions & 0 deletions src/detection/packages/packages.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ uint32_t ffPackagesGetNix(FFstrbuf* baseDir, const char* dirname);
#ifndef _WIN32
uint32_t ffPackagesGetNumElements(const char* dirname, bool isdir);
#endif
#if defined(__linux__) || defined(__NetBSD__) || defined(__sun) || defined(__APPLE__)
uint32_t ffPackagesGetPkgsrc(FFstrbuf* baseDir);
#endif
4 changes: 4 additions & 0 deletions src/detection/packages/packages_apple.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,8 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
ffStrbufSet(&baseDir, &instance.state.platform.homeDir);
result->nixUser = ffPackagesGetNix(&baseDir, "/.nix-profile");
}
if (FF_PACKAGES_IS_ENABLED(options, PKGSRC)) {
ffStrbufSetS(&baseDir, FASTFETCH_TARGET_DIR_ROOT);
result->pkgsrc = ffPackagesGetPkgsrc(&baseDir);
}
}
2 changes: 1 addition & 1 deletion src/detection/packages/packages_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true);
}
if (FF_PACKAGES_IS_ENABLED(options, PKGSRC)) {
packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR);
packageCounts->pkgsrc += ffPackagesGetPkgsrc(baseDir);
}
if (FF_PACKAGES_IS_ENABLED(options, MOSS)) {
packageCounts->moss += getSQLite3Int(baseDir, "/.moss/db/state", "SELECT COUNT(*) FROM state_selections WHERE state_id = (SELECT MAX(id) FROM state)", "moss");
Expand Down
5 changes: 2 additions & 3 deletions src/detection/packages/packages_nbsd.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#include "packages.h"

#include "common/io.h"

void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options) {
if (FF_PACKAGES_IS_ENABLED(options, PKGSRC)) {
result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true);
FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateStatic(FASTFETCH_TARGET_DIR_ROOT);
result->pkgsrc = ffPackagesGetPkgsrc(&baseDir);
}
}
34 changes: 34 additions & 0 deletions src/detection/packages/packages_pkgsrc.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#include "packages.h"
#include "common/path.h"
#include "common/properties.h"

uint32_t ffPackagesGetPkgsrc(FFstrbuf* baseDir) {
uint32_t baseDirLength = baseDir->length;
FF_STRBUF_AUTO_DESTROY pkginPath = ffStrbufCreate();

if (ffFindExecutableInPath("pkgin", &pkginPath) != NULL) {
return 0;
}

ffStrbufSubstrBeforeLastC(&pkginPath, '/'); // remove /pkgin
ffStrbufSubstrBeforeLastC(&pkginPath, '/'); // remove /bin
uint32_t pkginPathLength = pkginPath.length;

ffStrbufAppendS(&pkginPath, "/etc/mk.conf");

FF_STRBUF_AUTO_DESTROY dbdir = ffStrbufCreate();
ffParsePropFile(pkginPath.chars, "PKG_DBDIR=", &dbdir);
ffStrbufSubstrBefore(&pkginPath, pkginPathLength); // remove /etc/mk.conf

if (dbdir.length > 0) {
ffStrbufAppend(baseDir, &dbdir);
} else {
ffStrbufAppend(baseDir, &pkginPath);
ffStrbufAppendS(baseDir, "/pkgdb");
}

uint32_t result = ffPackagesGetNumElements(baseDir->chars, true);
ffStrbufSubstrBefore(baseDir, baseDirLength);

return result;
}
3 changes: 2 additions & 1 deletion src/detection/packages/packages_sunos.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
}
}
if (FF_PACKAGES_IS_ENABLED(options, PKGSRC)) {
result->pkgsrc = ffPackagesGetNumElements(FASTFETCH_TARGET_DIR_ROOT "/usr/pkg/pkgdb", true);
FF_STRBUF_AUTO_DESTROY baseDir = ffStrbufCreateStatic(FASTFETCH_TARGET_DIR_ROOT);
result->pkgsrc = ffPackagesGetPkgsrc(&baseDir);
}
}