Retrieve Postgres system configuration directory

manandre · manandre · commit 21e195f9c4e2 · 2023-03-05T21:03:44.000+01:00
diff --git a/src/Npgsql/NpgsqlConnectionStringBuilder.cs b/src/Npgsql/NpgsqlConnectionStringBuilder.cs
@@ -1747,7 +1747,7 @@ protected override void GetProperties(Hashtable propertyDescriptors)
 
         NpgsqlConnectionStringBuilder? GetConfigFromIniFile(string? filePath)
         {
-            if (filePath is null  || !File.Exists(filePath))
+            if (filePath is null || !File.Exists(filePath))
             {
                 return null;
             }
diff --git a/src/Npgsql/PostgresEnvironment.cs b/src/Npgsql/PostgresEnvironment.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 
@@ -81,5 +82,27 @@ internal static string? SslCertRootDefault
 
     static string? GetSystemPostgresDir() => Environment.GetEnvironmentVariable("PGSYSCONFDIR");
 
-    static string? GetDefaultSystemPostgresDir() => default; // Retrieve from "pg_config --sysconfdir"
+    static string? GetDefaultSystemPostgresDir() => ExecuteCommandSync("pg_config", "--sysconfdir");
+
+    static string? ExecuteCommandSync(string command, string arguments)
+    {
+        try
+        {
+            using var process = new Process();
+            process.StartInfo.FileName = command;
+            process.StartInfo.Arguments = arguments;
+            process.StartInfo.RedirectStandardOutput = true;
+            process.StartInfo.UseShellExecute = false;
+            process.Start();
+
+            var output = process.StandardOutput.ReadToEnd().Trim();
+            process.WaitForExit();
+
+            return process.ExitCode == 0 ? output : null;
+        }
+        catch (Exception)
+        {
+            return null;
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1747,7 +1747,7 @@ protected override void GetProperties(Hashtable propertyDescriptors)`
`1747`	`1747`
`1748`	`1748`	`NpgsqlConnectionStringBuilder? GetConfigFromIniFile(string? filePath)`
`1749`	`1749`	`{`
`1750`		`- if (filePath is null \|\| !File.Exists(filePath))`
	`1750`	`+ if (filePath is null \|\| !File.Exists(filePath))`
`1751`	`1751`	`{`
`1752`	`1752`	`return null;`
`1753`	`1753`	`}`