From 7aa110475ed354f35c3b7af36744a4150a1c1cf8 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Sat, 22 Aug 2020 19:05:24 +0100
Subject: [PATCH] Replace all instances of C's getenv with C++'s std::getenv

---
 src/lib/arch/unix/ArchDaemonUnix.cpp    | 2 +-
 src/lib/common/unix/DataDirectories.cpp | 4 ++--
 src/lib/platform/XWindowsScreen.cpp     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/arch/unix/ArchDaemonUnix.cpp b/src/lib/arch/unix/ArchDaemonUnix.cpp
index a03bf7a9..6884b20a 100644
--- a/src/lib/arch/unix/ArchDaemonUnix.cpp
+++ b/src/lib/arch/unix/ArchDaemonUnix.cpp
@@ -61,7 +61,7 @@ execSelfNonDaemonized()
 }
 
 bool alreadyDaemonized() {
-    return getenv("_BARRIER_DAEMONIZED") != NULL;
+    return std::getenv("_BARRIER_DAEMONIZED") != NULL;
 }
 
 #endif
diff --git a/src/lib/common/unix/DataDirectories.cpp b/src/lib/common/unix/DataDirectories.cpp
index 72e510af..608db05c 100644
--- a/src/lib/common/unix/DataDirectories.cpp
+++ b/src/lib/common/unix/DataDirectories.cpp
@@ -18,7 +18,7 @@
 #include "../DataDirectories.h"
 
 #include <unistd.h>    // sysconf
-#include <stdlib.h>    // getenv
+#include <cstdlib>     // getenv
 #include <sys/types.h> // getpwuid(_r)
 #include <pwd.h>       // getpwuid(_r)
 
@@ -63,7 +63,7 @@ static std::string profile_basedir()
 #ifdef WINAPI_XWINDOWS
     // linux/bsd adheres to freedesktop standards
     // https://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-    const char* dir = getenv("XDG_DATA_HOME");
+    const char* dir = std::getenv("XDG_DATA_HOME");
     if (dir != NULL)
         return dir;
     return unix_home() + "/.local/share";
diff --git a/src/lib/platform/XWindowsScreen.cpp b/src/lib/platform/XWindowsScreen.cpp
index 5f1724c6..97110b5b 100644
--- a/src/lib/platform/XWindowsScreen.cpp
+++ b/src/lib/platform/XWindowsScreen.cpp
@@ -877,7 +877,7 @@ XWindowsScreen::openDisplay(const char* displayName)
 {
 	// get the DISPLAY
 	if (displayName == NULL) {
-		displayName = getenv("DISPLAY");
+		displayName = std::getenv("DISPLAY");
 		if (displayName == NULL) {
 			displayName = ":0.0";
 		}