use strerror() on Windows

dunglas · dunglas · commit 12d099714471 · 2022-12-27T10:44:00.000+01:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1630,9 +1630,12 @@ ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *
 
 ZEND_API ZEND_COLD void zend_strerror_noreturn(int type, int errn, const char *message)
 {
+#ifdef HAVE_STR_ERROR_R
 	char buf[1024];
-	if (strerror_r(errn, buf, sizeof(buf)) != 0)
-		zend_error_noreturn(type, "%s: %d", message, errn);
+	strerror_r(errn, buf, sizeof(buf)) != 0;
+#else
+	char *buf = strerror(errn);
+#endif
 
 	zend_error_noreturn(type, "%s: %s (%d)", message, buf, errn);
 }
diff --git a/configure.ac b/configure.ac
@@ -609,6 +609,7 @@ vasprintf \
 asprintf \
 nanosleep \
 memmem \
+strerror_r \
 )
 
 AX_FUNC_WHICH_GETHOSTBYNAME_R

Original file line number	Diff line number	Diff line change
`@@ -1630,9 +1630,12 @@ ZEND_API ZEND_COLD ZEND_NORETURN void zend_error_noreturn(int type, const char *`
`1630`	`1630`
`1631`	`1631`	`ZEND_API ZEND_COLD void zend_strerror_noreturn(int type, int errn, const char *message)`
`1632`	`1632`	`{`
	`1633`	`+#ifdef HAVE_STR_ERROR_R`
`1633`	`1634`	`char buf[1024];`
`1634`		`- if (strerror_r(errn, buf, sizeof(buf)) != 0)`
`1635`		`- zend_error_noreturn(type, "%s: %d", message, errn);`
	`1635`	`+ strerror_r(errn, buf, sizeof(buf)) != 0;`
	`1636`	`+#else`
	`1637`	`+ char *buf = strerror(errn);`
	`1638`	`+#endif`
`1636`	`1639`
`1637`	`1640`	`zend_error_noreturn(type, "%s: %s (%d)", message, buf, errn);`
`1638`	`1641`	`}`
Original file line number	Diff line number	Diff line change
`@@ -609,6 +609,7 @@ vasprintf \`
`609`	`609`	`asprintf \`
`610`	`610`	`nanosleep \`
`611`	`611`	`memmem \`
	`612`	`+strerror_r \`
`612`	`613`	`)`
`613`	`614`
`614`	`615`	`AX_FUNC_WHICH_GETHOSTBYNAME_R`