pass env from main and check FreeBSD for endian include (fix #650)

This commit is contained in:
John
2023-01-06 10:51:21 +01:00
parent d6854ff877
commit be574f1f8c
2 changed files with 10 additions and 5 deletions
+5 -4
View File
@@ -1334,15 +1334,16 @@ bool parseMessage(const string& arg, bool onlyMasterSlave, MasterSymbolString* m
* Main function.
* @param argc the number of command line arguments.
* @param argv the command line arguments.
* @param envp the environment variables.
* @return the exit code.
*/
int main(int argc, char* argv[]) {
int main(int argc, char* argv[], char* envp[]) {
struct argp aargp = { argpoptions, parse_opt, nullptr, argpdoc, datahandler_getargs(), nullptr, nullptr };
setenv("ARGP_HELP_FMT", "no-dup-args-note", 0);
char envname[32] = "--"; // needs to cover at least max length of any option name plus "--"
char* envopt = envname+2;
for (char ** env = environ; *env; env++) {
for (char ** env = envp; *env; env++) {
char* pos = strchr(*env, '=');
if (!pos || strncmp(*env, "EBUSD_", sizeof("EBUSD_")-1) != 0) {
continue;
@@ -1569,6 +1570,6 @@ int main(int argc, char* argv[]) {
} // namespace ebusd
int main(int argc, char* argv[]) {
return ebusd::main(argc, argv);
int main(int argc, char* argv[], char* envp[]) {
return ebusd::main(argc, argv, envp);
}
+5 -1
View File
@@ -31,7 +31,11 @@
#include <fcntl.h>
#include <errno.h>
#include <string.h>
#include <endian.h>
#ifdef __FreeBSD__
#include <machine/endian.h>
#else
#include <endian.h>
#endif
#include <string>
#include <cstdio>
#include <ctime>