getenv is buggy. so replaced with GLib.Environment.get_variable

turkman-linux · Aug 21, 2024 · 3bbab97 · 3bbab97
1 parent 6b4f437
commit 3bbab97
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/ccode.vala b/src/ccode.vala
@@ -210,5 +210,4 @@ private extern void exit(int status);
 private extern void save_env();
 private extern void clear_env();
 private extern void restore_env();
-private extern string getenv(string name);
 private extern int setenv(string name, string value, int override);
diff --git a/src/operations/package-manager/template.vala b/src/operations/package-manager/template.vala
@@ -84,7 +84,7 @@ private static int template_main (string[] args) {
 }
 
 private string get_gitconfig_variable (string variable) {
-    string gitconfig = srealpath (getenv ("HOME") + "/.gitconfig");
+    string gitconfig = srealpath (GLib.Environment.get_variable ("HOME") + "/.gitconfig");
     if (isfile (gitconfig)) {
         info (_ ("Reading gitconfig: %s").printf (gitconfig));
         foreach (string line in readfile (gitconfig).split ("\n")) {

diff --git a/src/settings.vala b/src/settings.vala
@@ -53,8 +53,8 @@ private static void settings_init () {
     }else {
         warning (_ ("Config file does not exists: %s").printf (CONFIG));
     }
-    if (getenv ("USE") != null) {
-        set_value ("USE", getenv ("USE"));
+    if (GLib.Environment.get_variable ("USE") != null) {
+        set_value ("USE", GLib.Environment.get_variable ("USE"));
     }else {
         area = config_yaml.get_area (config_yaml.data, "ymp");
         set_value ("USE", config_yaml.get_value (area, "use"));
@@ -159,7 +159,7 @@ private static void parse_args (string[] args) {
             }
         }
     }
-    if (getenv ("NO_COLOR") != null) {
+    if (GLib.Environment.get_variable ("NO_COLOR") != null) {
         set_bool ("no-color", true);
     }
 }