diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 0b608497c..8c838e311 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -290,7 +290,7 @@ static void getPackageCountsBedrock(FFstrbuf* baseDir, FFPackagesResult* package ffStrbufAppendS(baseDir, "/bedrock/strata"); - DIR* dir = opendir(baseDir->chars); + FF_AUTO_CLOSE_DIR DIR* dir = opendir(baseDir->chars); if(dir == NULL) { ffStrbufSubstrBefore(baseDir, baseDirLength); @@ -313,7 +313,6 @@ static void getPackageCountsBedrock(FFstrbuf* baseDir, FFPackagesResult* package ffStrbufSubstrBefore(baseDir, baseDirLength2); } - closedir(dir); ffStrbufSubstrBefore(baseDir, baseDirLength); } diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c index 20a304fa7..1417148b6 100644 --- a/src/modules/packages/packages.c +++ b/src/modules/packages/packages.c @@ -28,7 +28,7 @@ void ffPrintPackages(FFPackagesOptions* options) { \ printf("%u (%s)", counts.var, (name)); \ if((all -= counts.var) > 0) \ - printf(", "); \ + fputs(", ", stdout); \ }; #define FF_PRINT_PACKAGE(name) FF_PRINT_PACKAGE_NAME(name, #name) @@ -40,7 +40,7 @@ void ffPrintPackages(FFPackagesOptions* options) if(counts.pacmanBranch.length > 0) printf("[%s]", counts.pacmanBranch.chars); if((all -= counts.pacman) > 0) - printf(", "); + fputs(", ", stdout); }; FF_PRINT_PACKAGE(dpkg)