Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

NEWS

@@ -1,5 +1,8 @@
 1.32.11
 ------
+- compat: Map strtok use to strtok_r or strtok_s (MS platforms), if possible.
+  users only in control_generic and libout123 so far. Out123 itself uses mytok.
+  Shall fix bug 376 (build with MSVC again).
 - mpg123: Fix printout of filenames at end (convert/limit text encoding).
 - libout123:
 -- modules/win32: Align waveOutGetDevCapsA to WAVEOUTCAPSA, in anticipation

configure.ac

@@ -1491,7 +1491,8 @@ AC_CHECK_FUNCS( sched_setscheduler setuid getuid)
 # Check for setpriority
 AC_CHECK_FUNCS( setpriority )
 
-AC_CHECK_FUNCS( strerror strerror_l uselocale )
+# strtok_s for MSVCRT, not the C11 variant
+AC_CHECK_FUNCS( strerror strerror_l uselocale strtok_r strtok_s)
 
 AC_CHECK_FUNCS( setlocale nl_langinfo mbstowcs wcstombs wcswidth iswprint )
 

ports/cmake/src/CMakeLists.txt

@@ -67,6 +67,8 @@ check_function_exists(shmdt HAVE_SHMDT)
 check_function_exists(shmctl HAVE_SHMCTL)
 check_function_exists(strerror HAVE_STRERROR)
 check_function_exists(strerror_l HAVE_STRERROR_L)
+check_function_exists(strtok_r HAVE_STRTOK_R)
+check_function_exists(strtok_s HAVE_STRTOK_S)
 check_function_exists(fork HAVE_FORK)
 check_function_exists(execvp HAVE_EXECVP)
 check_function_exists(ctermid HAVE_CTERMID)

ports/cmake/src/config.cmake.h.in

@@ -43,6 +43,8 @@
 #cmakedefine HAVE_SIGNAL_H 1
 #cmakedefine HAVE_STRERROR 1
 #cmakedefine HAVE_STRERROR_L 1
+#cmakedefine HAVE_STRTOK_R 1
+#cmakedefine HAVE_STRTOK_S 1
 #cmakedefine HAVE_FORK 1
 #cmakedefine HAVE_EXECVP 1
 #cmakedefine HAVE_CTERMID 1

src/compat/compat.h

@@ -110,8 +110,17 @@
 
 typedef unsigned char byte;
 
+// Annoying hackery to select a safe strtok variant. MS decided to call their strtok_r strtok_s, while
+// C11 declares another strtok_s with different prototype. Thanks to you all.
+#ifdef HAVE_STRTOK_R
+#define INT123_compat_strtok(a, b, c) strtok_r((a), (b), (c))
+#endif
+
 #if (defined(_UCRT) || defined(_MSC_VER) || (defined(__MINGW32__) || defined(__MINGW64__)) || (defined(__WATCOMC__) && defined(__NT__))) && !defined(__CYGWIN__)
 #define MPG123_COMPAT_MSVCRT_IO
+#ifndef INT123_compat_strtok
+#define INT123_compat_strtok(a, b, c) strtok_s((a), (b), (c))
+#endif
 #endif
 
 #if defined(MPG123_COMPAT_MSVCRT_IO)
@@ -150,6 +159,11 @@ typedef unsigned char byte;
 #include <io.h>
 #endif
 
+#ifndef INT123_compat_strtok
+#warning "no safe strtok found"
+#define INT123_compat_strtok(a, b, c) strtok((a), (b))
+#endif
+
 /* A safe realloc also for very old systems where realloc(NULL, size) returns NULL. */
 void *INT123_safe_realloc(void *ptr, size_t size);
 // Also freeing ptr if result is NULL. You can do

src/control_generic.c

@@ -780,8 +780,9 @@ int control_generic (mpg123_handle *fr)
 				/* commands with arguments */
 				cmd = NULL;
 				arg = NULL;
-				cmd = strtok(comstr," \t"); /* get the main command */
-				arg = strtok(NULL,""); /* get the args */
+				char *toksave = NULL;
+				cmd = INT123_compat_strtok(comstr, " \t", &toksave); /* get the main command */
+				arg = INT123_compat_strtok(NULL, "", &toksave); /* get the args */
 
 				if (cmd && strlen(cmd) && arg && strlen(arg))
 				{

src/libout123/libout123.c

@@ -456,11 +456,11 @@ out123_open(out123_handle *ao, const char* driver, const char* device)
 
 		/* Now loop over the list of possible modules to find one that works. */
 		char *toksave = NULL;
-		nextname = strtok_r(modnames, ",", &toksave);
+		nextname = INT123_compat_strtok(modnames, ",", &toksave);
 		while(!ao->open && nextname)
 		{
 			char *curname = nextname;
-			nextname = strtok_r(NULL, ",", &toksave);
+			nextname = INT123_compat_strtok(NULL, ",", &toksave);
 			check_output_module(ao, curname, device, !nextname);
 			if(ao->open)
 			{