From 96931643a4da9a552a3796bd601df1c5cee88180 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 24 Feb 2022 12:01:26 +0000
Subject: [PATCH] Use strings.h for strcasecmp, except on Windows.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes #2420. Thanks to Frédéric Fauberteau.
---
 apps/mosquitto_ctrl/dynsec.c         |  4 ++++
 apps/mosquitto_ctrl/dynsec_role.c    |  4 ++++
 apps/mosquitto_ctrl/example.c        |  4 ++++
 apps/mosquitto_ctrl/mosquitto_ctrl.c |  4 ++++
 lib/strings_mosq.c                   |  4 ++++
 plugins/dynamic-security/plugin.c    |  4 ++++
 plugins/dynamic-security/roles.c     |  4 ++++
 src/net.c                            | 25 +++++++++++++------------
 8 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/apps/mosquitto_ctrl/dynsec.c b/apps/mosquitto_ctrl/dynsec.c
index 3a5f4f1c..c74147b6 100644
--- a/apps/mosquitto_ctrl/dynsec.c
+++ b/apps/mosquitto_ctrl/dynsec.c
@@ -22,6 +22,10 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "mosquitto_ctrl.h"
 #include "mosquitto.h"
 #include "password_mosq.h"
diff --git a/apps/mosquitto_ctrl/dynsec_role.c b/apps/mosquitto_ctrl/dynsec_role.c
index 14eebcaa..6f103f7c 100644
--- a/apps/mosquitto_ctrl/dynsec_role.c
+++ b/apps/mosquitto_ctrl/dynsec_role.c
@@ -22,6 +22,10 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "mosquitto.h"
 #include "mosquitto_ctrl.h"
 #include "password_mosq.h"
diff --git a/apps/mosquitto_ctrl/example.c b/apps/mosquitto_ctrl/example.c
index 01b8d580..b4d0a732 100644
--- a/apps/mosquitto_ctrl/example.c
+++ b/apps/mosquitto_ctrl/example.c
@@ -22,6 +22,10 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "mosquitto_ctrl.h"
 
 void ctrl_help(void)
diff --git a/apps/mosquitto_ctrl/mosquitto_ctrl.c b/apps/mosquitto_ctrl/mosquitto_ctrl.c
index 837470d2..45a41d86 100644
--- a/apps/mosquitto_ctrl/mosquitto_ctrl.c
+++ b/apps/mosquitto_ctrl/mosquitto_ctrl.c
@@ -24,6 +24,10 @@ Contributors:
 #include <stdlib.h>
 #include <string.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "lib_load.h"
 #include "mosquitto.h"
 #include "mosquitto_ctrl.h"
diff --git a/lib/strings_mosq.c b/lib/strings_mosq.c
index 292a1a74..419294a6 100644
--- a/lib/strings_mosq.c
+++ b/lib/strings_mosq.c
@@ -21,6 +21,10 @@ Contributors:
 #include <errno.h>
 #include <string.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "mosquitto.h"
 #include "mqtt_protocol.h"
 
diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
index 27c3904d..ae9f2e7d 100644
--- a/plugins/dynamic-security/plugin.c
+++ b/plugins/dynamic-security/plugin.c
@@ -25,6 +25,10 @@ Contributors:
 #include <string.h>
 #include <sys/stat.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "json_help.h"
 #include "mosquitto.h"
 #include "mosquitto_broker.h"
diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c
index 4d5accfc..6a393bc0 100644
--- a/plugins/dynamic-security/roles.c
+++ b/plugins/dynamic-security/roles.c
@@ -24,6 +24,10 @@ Contributors:
 #include <uthash.h>
 #include <utlist.h>
 
+#ifndef WIN32
+#  include <strings.h>
+#endif
+
 #include "dynamic_security.h"
 #include "json_help.h"
 #include "mosquitto.h"
diff --git a/src/net.c b/src/net.c
index ad9d53da..71bf54c8 100644
--- a/src/net.c
+++ b/src/net.c
@@ -19,15 +19,16 @@ Contributors:
 #include "config.h"
 
 #ifndef WIN32
-#include <netdb.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <ifaddrs.h>
+#  include <arpa/inet.h>
+#  include <ifaddrs.h>
+#  include <netdb.h>
+#  include <netinet/tcp.h>
+#  include <strings.h>
+#  include <sys/socket.h>
+#  include <unistd.h>
 #else
-#include <winsock2.h>
-#include <ws2tcpip.h>
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
 #endif
 
 #include <assert.h>
@@ -36,7 +37,7 @@ Contributors:
 #include <stdio.h>
 #include <string.h>
 #ifdef WITH_WRAP
-#include <tcpd.h>
+#  include <tcpd.h>
 #endif
 
 #ifdef HAVE_NETINET_IN_H
@@ -49,7 +50,7 @@ Contributors:
 #endif
 
 #ifdef __QNX__
-#include <net/netbyte.h>
+#  include <net/netbyte.h>
 #endif
 
 #include "mosquitto_broker_internal.h"
@@ -59,8 +60,8 @@ Contributors:
 #include "util_mosq.h"
 
 #ifdef WITH_TLS
-#include "tls_mosq.h"
-#include <openssl/err.h>
+#  include "tls_mosq.h"
+#  include <openssl/err.h>
 static int tls_ex_index_context = -1;
 static int tls_ex_index_listener = -1;
 #endif