From c219f96c1d3ea911ac1c0b99385d1a1c3c6ee328 Mon Sep 17 00:00:00 2001
From: Nick Chan <towinchenmi@gmail.com>
Date: Tue, 7 Feb 2023 16:53:44 +0800
Subject: [PATCH] more fixes

---
 src/optparse.c |  8 ++++----
 src/tui_main.c | 35 ++++++++++++++++++-----------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/optparse.c b/src/optparse.c
index 6fc9b30..986bb58 100644
--- a/src/optparse.c
+++ b/src/optparse.c
@@ -269,17 +269,17 @@ int optparse(int argc, char* argv[]) {
 			usage(1, argv[0]);
 		}
 	}
-	if (verbose >= 2) putenv("LIBUSB_DEBUG=1");
+	if (verbose >= 2) setenv("LIBUSB_DEBUG", "1", 1);
 	if (verbose >= 3)
 	{
 		irecv_set_debug_level(1);
-		putenv("LIBUSB_DEBUG=2");
+		setenv("LIBUSB_DEBUG", "2", 1);
 	}
 	if (verbose >= 4) {
 		idevice_set_debug_level(1);
-		putenv("LIBUSB_DEBUG=3");
+		setenv("LIBUSB_DEBUG", "3", 1);
 	}
 	if (verbose >= 5)
-		putenv("LIBUSB_DEBUG=4");
+		setenv("LIBUSB_DEBUG", "4", 1);
     return 0;
 }
diff --git a/src/tui_main.c b/src/tui_main.c
index 8d55731..754ad30 100644
--- a/src/tui_main.c
+++ b/src/tui_main.c
@@ -22,23 +22,24 @@ int destroy_window() {
 
 int init_window() {
     setlocale(LC_ALL, NULL);
-    if (getenv("NEWT_COLORS") == NULL)
-        putenv(
-            "NEWT_COLORS=root=,black\n"
-            "border=lightgray,black\n"
-            "title=lightgray,black\n"
-            "roottext=red,black\n"
-            "label=lightgray,black\n"
-            "entry=lightgray,black\n"
-            "window=red,black\n"
-            "textbox=lightgray,black\n"
-            "button=black,lightgray\n"
-            "compactbutton=lightgray,black\n"
-            "listbox=lightgray,black\n"
-            "actlistbox=black,lightgray\n"
-            "actsellistbox=black,lightgray\n"
-            "checkbox=lightgray,black\n"
-            "actcheckbox=black,lightgray\n");
+    setenv(
+        "NEWT_COLORS",
+        "root=,black\n"
+        "border=lightgray,black\n"
+        "title=lightgray,black\n"
+        "roottext=red,black\n"
+        "label=lightgray,black\n"
+        "entry=lightgray,black\n"
+        "window=red,black\n"
+        "textbox=lightgray,black\n"
+        "button=black,lightgray\n"
+        "compactbutton=lightgray,black\n"
+        "listbox=lightgray,black\n"
+        "actlistbox=black,lightgray\n"
+        "actsellistbox=black,lightgray\n"
+        "checkbox=lightgray,black\n"
+        "actcheckbox=black,lightgray\n",
+        0);
 
     tui_started = true;
     newtInit();