From: Roy Marples <roy@marples.name>
Date: Sat, 10 Oct 2020 13:44:00 +0000 (+0100)
Subject: setproctitle compat requires envp, not environ
X-Git-Tag: v9.3.1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05e9264a61165bfeee1a7f03e31c1b7cbefbefd4;p=thirdparty%2Fdhcpcd.git

setproctitle compat requires envp, not environ

The two could be different!
envp is NOT C or POSIX standard, but does appear to be a UNIX standard.
---

diff --git a/src/dhcpcd.c b/src/dhcpcd.c
index 8220219d..82559933 100644
--- a/src/dhcpcd.c
+++ b/src/dhcpcd.c
@@ -1767,7 +1767,7 @@ dhcpcd_stderr_cb(void *arg)
 }
 
 int
-main(int argc, char **argv)
+main(int argc, char **argv, char **envp)
 {
 	struct dhcpcd_ctx ctx;
 	struct ifaddrs *ifaddrs = NULL;
@@ -1788,7 +1788,7 @@ main(int argc, char **argv)
 #endif
 
 #ifdef SETPROCTITLE_H
-	setproctitle_init(argc, argv, environ);
+	setproctitle_init(argc, argv, envp);
 #endif
 
 	/* Test for --help and --version */