NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commit751f532

committed

Try another way to detect the result type of strerror_r().

The method we've traditionally used, of redeclaring strerror_r() tosee if the compiler complains of inconsistent declarations, turns outnot to work reliably because some compilers only report a warning,not an error. Amazingly, this has gone undetected for years, eventhough it certainly breaks our detection of whether strerror_rsucceeded.Let's instead test whether the compiler will take the result ofstrerror_r() as a switch() argument. It's possible this won'twork universally either, but it's the best idea I could come up withon the spur of the moment.We should probably back-patch this once the dust settles, butfirst let's see what the buildfarm thinks of it.Discussion:https://postgr.es/m/10877.1537993279@sss.pgh.pa.us

1 parent8b91d25 commit751f532Copy full SHA for 751f532

File tree

4 files changed

+15

-17

lines changed

config
- c-library.m4
configure
src/include
- pg_config.h.in
- pg_config.h.win32

4 files changed

+15

-17

lines changed

`‎config/c-library.m4`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,23 +82,23 @@ AH_VERBATIM(GETTIMEOFDAY_1ARG_,`
`82`	`82`
`83`	`83`	`# PGAC_FUNC_STRERROR_R_INT`
`84`	`84`	`# ---------------------------`
`85`		`-# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)`
`86`		`-# If so, define STRERROR_R_INT`
	`85`	`+# Check if strerror_r() returns int (POSIX) rather than char * (GNU libc).`
	`86`	`+# If so, define STRERROR_R_INT.`
	`87`	`+# The result is uncertain if strerror_r() isn't provided,`
	`88`	`+# but we don't much care.`
`87`	`89`	`AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],`
`88`	`90`	`[AC_CACHE_CHECK(whetherstrerror_rreturnsint,`
`89`	`91`	`pgac_cv_func_strerror_r_int,`
`90`	`92`	`[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <string.h>],`
`91`		`-[#ifndef _AIX`
`92`		`-int strerror_r(int, char *, size_t);`
`93`		`-#else`
`94`		`-/* Older AIX has 'int' for the third argument so we don't test the args. */`
`95`		`-int strerror_r();`
`96`		`-#endif])],`
	`93`	`+[[char buf[100];`
	`94`	`+ switch (strerror_r(1, buf, sizeof(buf)))`
	`95`	`+ { case 0: break; default: break; }`
	`96`	`+]])],`
`97`	`97`	`[pgac_cv_func_strerror_r_int=yes],`
`98`	`98`	`[pgac_cv_func_strerror_r_int=no])])`
`99`	`99`	`if test x"$pgac_cv_func_strerror_r_int" = xyes ; then`
`100`	`100`	`AC_DEFINE(STRERROR_R_INT,1,`
`101`		`-[Define to 1 if strerror_r() returnsaint.])`
	`101`	`+[Define to 1 if strerror_r() returns int.])`
`102`	`102`	`fi`
`103`	`103`	`])# PGAC_FUNC_STRERROR_R_INT`
`104`	`104`

`‎configure`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -10792,12 +10792,10 @@ else`
`10792`	`10792`	`int`
`10793`	`10793`	`main ()`
`10794`	`10794`	`{`
`10795`		`-#ifndef _AIX`
`10796`		`-int strerror_r(int, char *, size_t);`
`10797`		`-#else`
`10798`		`-/* Older AIX has 'int' for the third argument so we don't test the args. */`
`10799`		`-int strerror_r();`
`10800`		`-#endif`
	`10795`	`+char buf[100];`
	`10796`	`+ switch (strerror_r(1, buf, sizeof(buf)))`
	`10797`	`+ { case 0: break; default: break; }`
	`10798`	`+`
`10801`	`10799`	`;`
`10802`	`10800`	`return 0;`
`10803`	`10801`	`}`

`‎src/include/pg_config.h.in`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -852,7 +852,7 @@`
`852`	`852`	`/* Define to 1 if you have the ANSI C header files. */`
`853`	`853`	`#undef STDC_HEADERS`
`854`	`854`
`855`		`-/* Define to 1 if strerror_r() returnsaint. */`
	`855`	`+/* Define to 1 if strerror_r() returns int. */`
`856`	`856`	`#undef STRERROR_R_INT`
`857`	`857`
`858`	`858`	/* Define to 1 if your <sys/time.h> declares `struct tm'. */

`‎src/include/pg_config.h.win32`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -665,7 +665,7 @@`
`665`	`665`	`/* Define to 1 if you have the ANSI C header files. */`
`666`	`666`	`#define STDC_HEADERS 1`
`667`	`667`
`668`		`-/* Define to 1 if strerror_r() returnsaint. */`
	`668`	`+/* Define to 1 if strerror_r() returns int. */`
`669`	`669`	`/* #undef STRERROR_R_INT */`
`670`	`670`
`671`	`671`	/* Define to 1 if your <sys/time.h> declares `struct tm'. */

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit751f532

File tree

4 files changed

4 files changed

`‎config/c-library.m4`

`‎configure`

`‎src/include/pg_config.h.in`

`‎src/include/pg_config.h.win32`

0 commit comments