From a835e40c04a7a74b3d907dff9aed992788169050 Mon Sep 17 00:00:00 2001 From: TheComputerM Date: Thu, 15 Aug 2024 10:45:48 +0530 Subject: [PATCH 1/2] [ffigen] use listSync instead of running ls --- .../lib/src/config_provider/path_finder.dart | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/ffigen/lib/src/config_provider/path_finder.dart b/pkgs/ffigen/lib/src/config_provider/path_finder.dart index 51044103bc..482065c238 100644 --- a/pkgs/ffigen/lib/src/config_provider/path_finder.dart +++ b/pkgs/ffigen/lib/src/config_provider/path_finder.dart @@ -32,17 +32,14 @@ List getCStandardLibraryHeadersForMac() { for (final searchPath in searchPaths) { if (!Directory(searchPath).existsSync()) continue; - final result = Process.runSync('ls', [searchPath]); - final stdout = result.stdout as String; - if (stdout != '') { - final versions = stdout.split('\n').where((s) => s != ''); - for (final version in versions) { - final path = p.join(searchPath, version, 'include'); - if (Directory(path).existsSync()) { - _logger.fine('Added stdlib path: $path to compiler-opts.'); - includePaths.add('-I$path'); - return includePaths; - } + final versions = Directory(searchPath).listSync(); + if (versions.isEmpty) continue; + for (final version in versions) { + final path = p.join(version.path, 'include'); + if (Directory(path).existsSync()) { + _logger.fine('Added stdlib path: $path to compiler-opts.'); + includePaths.add('-I$path'); + return includePaths; } } } From 5f14a39987d8129fbf7da5dfdbd9e93661e6c4bd Mon Sep 17 00:00:00 2001 From: TheComputerM Date: Thu, 15 Aug 2024 10:47:24 +0530 Subject: [PATCH 2/2] [ffigen] remove useless conditional --- pkgs/ffigen/lib/src/config_provider/path_finder.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/ffigen/lib/src/config_provider/path_finder.dart b/pkgs/ffigen/lib/src/config_provider/path_finder.dart index 482065c238..7d7bd47ff2 100644 --- a/pkgs/ffigen/lib/src/config_provider/path_finder.dart +++ b/pkgs/ffigen/lib/src/config_provider/path_finder.dart @@ -33,7 +33,6 @@ List getCStandardLibraryHeadersForMac() { if (!Directory(searchPath).existsSync()) continue; final versions = Directory(searchPath).listSync(); - if (versions.isEmpty) continue; for (final version in versions) { final path = p.join(version.path, 'include'); if (Directory(path).existsSync()) {