Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1e05359

Browse files
committed
Properly handle the case where strlcpy() exists in libc but isn't
declared in the system headers. Per report from Bruce than some BSDenare like this.
1 parent7ceec34 commit1e05359

File tree

4 files changed

+156
-79
lines changed

4 files changed

+156
-79
lines changed

‎configure‎

Lines changed: 146 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -13191,80 +13191,6 @@ fi
1319113191

1319213192
fi
1319313193

13194-
# This is probably only present on Darwin, but may as well check always
13195-
echo "$as_me:$LINENO: checking whether F_FULLFSYNC is declared" >&5
13196-
echo $ECHO_N "checking whether F_FULLFSYNC is declared... $ECHO_C" >&6
13197-
if test "${ac_cv_have_decl_F_FULLFSYNC+set}" = set; then
13198-
echo $ECHO_N "(cached) $ECHO_C" >&6
13199-
else
13200-
cat >conftest.$ac_ext <<_ACEOF
13201-
/* confdefs.h. */
13202-
_ACEOF
13203-
cat confdefs.h >>conftest.$ac_ext
13204-
cat >>conftest.$ac_ext <<_ACEOF
13205-
/* end confdefs.h. */
13206-
#include <fcntl.h>
13207-
13208-
int
13209-
main ()
13210-
{
13211-
#ifndef F_FULLFSYNC
13212-
char *p = (char *) F_FULLFSYNC;
13213-
#endif
13214-
13215-
;
13216-
return 0;
13217-
}
13218-
_ACEOF
13219-
rm -f conftest.$ac_objext
13220-
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13221-
(eval $ac_compile) 2>conftest.er1
13222-
ac_status=$?
13223-
grep -v '^ *+' conftest.er1 >conftest.err
13224-
rm -f conftest.er1
13225-
cat conftest.err >&5
13226-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13227-
(exit $ac_status); } &&
13228-
{ ac_try='test -z "$ac_c_werror_flag"
13229-
|| test ! -s conftest.err'
13230-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13231-
(eval $ac_try) 2>&5
13232-
ac_status=$?
13233-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13234-
(exit $ac_status); }; } &&
13235-
{ ac_try='test -s conftest.$ac_objext'
13236-
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13237-
(eval $ac_try) 2>&5
13238-
ac_status=$?
13239-
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13240-
(exit $ac_status); }; }; then
13241-
ac_cv_have_decl_F_FULLFSYNC=yes
13242-
else
13243-
echo "$as_me: failed program was:" >&5
13244-
sed 's/^/| /' conftest.$ac_ext >&5
13245-
13246-
ac_cv_have_decl_F_FULLFSYNC=no
13247-
fi
13248-
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13249-
fi
13250-
echo "$as_me:$LINENO: result: $ac_cv_have_decl_F_FULLFSYNC" >&5
13251-
echo "${ECHO_T}$ac_cv_have_decl_F_FULLFSYNC" >&6
13252-
if test $ac_cv_have_decl_F_FULLFSYNC = yes; then
13253-
13254-
cat >>confdefs.h <<_ACEOF
13255-
#define HAVE_DECL_F_FULLFSYNC 1
13256-
_ACEOF
13257-
13258-
13259-
else
13260-
cat >>confdefs.h <<_ACEOF
13261-
#define HAVE_DECL_F_FULLFSYNC 0
13262-
_ACEOF
13263-
13264-
13265-
fi
13266-
13267-
1326813194

1326913195
##
1327013196
## Functions, global variables
@@ -13780,6 +13706,152 @@ _ACEOF
1378013706
fi
1378113707

1378213708

13709+
echo "$as_me:$LINENO: checking whether strlcpy is declared" >&5
13710+
echo $ECHO_N "checking whether strlcpy is declared... $ECHO_C" >&6
13711+
if test "${ac_cv_have_decl_strlcpy+set}" = set; then
13712+
echo $ECHO_N "(cached) $ECHO_C" >&6
13713+
else
13714+
cat >conftest.$ac_ext <<_ACEOF
13715+
/* confdefs.h. */
13716+
_ACEOF
13717+
cat confdefs.h >>conftest.$ac_ext
13718+
cat >>conftest.$ac_ext <<_ACEOF
13719+
/* end confdefs.h. */
13720+
$ac_includes_default
13721+
int
13722+
main ()
13723+
{
13724+
#ifndef strlcpy
13725+
char *p = (char *) strlcpy;
13726+
#endif
13727+
13728+
;
13729+
return 0;
13730+
}
13731+
_ACEOF
13732+
rm -f conftest.$ac_objext
13733+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13734+
(eval $ac_compile) 2>conftest.er1
13735+
ac_status=$?
13736+
grep -v '^ *+' conftest.er1 >conftest.err
13737+
rm -f conftest.er1
13738+
cat conftest.err >&5
13739+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13740+
(exit $ac_status); } &&
13741+
{ ac_try='test -z "$ac_c_werror_flag"
13742+
|| test ! -s conftest.err'
13743+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13744+
(eval $ac_try) 2>&5
13745+
ac_status=$?
13746+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13747+
(exit $ac_status); }; } &&
13748+
{ ac_try='test -s conftest.$ac_objext'
13749+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13750+
(eval $ac_try) 2>&5
13751+
ac_status=$?
13752+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13753+
(exit $ac_status); }; }; then
13754+
ac_cv_have_decl_strlcpy=yes
13755+
else
13756+
echo "$as_me: failed program was:" >&5
13757+
sed 's/^/| /' conftest.$ac_ext >&5
13758+
13759+
ac_cv_have_decl_strlcpy=no
13760+
fi
13761+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13762+
fi
13763+
echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcpy" >&5
13764+
echo "${ECHO_T}$ac_cv_have_decl_strlcpy" >&6
13765+
if test $ac_cv_have_decl_strlcpy = yes; then
13766+
13767+
cat >>confdefs.h <<_ACEOF
13768+
#define HAVE_DECL_STRLCPY 1
13769+
_ACEOF
13770+
13771+
13772+
else
13773+
cat >>confdefs.h <<_ACEOF
13774+
#define HAVE_DECL_STRLCPY 0
13775+
_ACEOF
13776+
13777+
13778+
fi
13779+
13780+
13781+
# This is probably only present on Darwin, but may as well check always
13782+
echo "$as_me:$LINENO: checking whether F_FULLFSYNC is declared" >&5
13783+
echo $ECHO_N "checking whether F_FULLFSYNC is declared... $ECHO_C" >&6
13784+
if test "${ac_cv_have_decl_F_FULLFSYNC+set}" = set; then
13785+
echo $ECHO_N "(cached) $ECHO_C" >&6
13786+
else
13787+
cat >conftest.$ac_ext <<_ACEOF
13788+
/* confdefs.h. */
13789+
_ACEOF
13790+
cat confdefs.h >>conftest.$ac_ext
13791+
cat >>conftest.$ac_ext <<_ACEOF
13792+
/* end confdefs.h. */
13793+
#include <fcntl.h>
13794+
13795+
int
13796+
main ()
13797+
{
13798+
#ifndef F_FULLFSYNC
13799+
char *p = (char *) F_FULLFSYNC;
13800+
#endif
13801+
13802+
;
13803+
return 0;
13804+
}
13805+
_ACEOF
13806+
rm -f conftest.$ac_objext
13807+
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
13808+
(eval $ac_compile) 2>conftest.er1
13809+
ac_status=$?
13810+
grep -v '^ *+' conftest.er1 >conftest.err
13811+
rm -f conftest.er1
13812+
cat conftest.err >&5
13813+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13814+
(exit $ac_status); } &&
13815+
{ ac_try='test -z "$ac_c_werror_flag"
13816+
|| test ! -s conftest.err'
13817+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13818+
(eval $ac_try) 2>&5
13819+
ac_status=$?
13820+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13821+
(exit $ac_status); }; } &&
13822+
{ ac_try='test -s conftest.$ac_objext'
13823+
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
13824+
(eval $ac_try) 2>&5
13825+
ac_status=$?
13826+
echo "$as_me:$LINENO: \$? = $ac_status" >&5
13827+
(exit $ac_status); }; }; then
13828+
ac_cv_have_decl_F_FULLFSYNC=yes
13829+
else
13830+
echo "$as_me: failed program was:" >&5
13831+
sed 's/^/| /' conftest.$ac_ext >&5
13832+
13833+
ac_cv_have_decl_F_FULLFSYNC=no
13834+
fi
13835+
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
13836+
fi
13837+
echo "$as_me:$LINENO: result: $ac_cv_have_decl_F_FULLFSYNC" >&5
13838+
echo "${ECHO_T}$ac_cv_have_decl_F_FULLFSYNC" >&6
13839+
if test $ac_cv_have_decl_F_FULLFSYNC = yes; then
13840+
13841+
cat >>confdefs.h <<_ACEOF
13842+
#define HAVE_DECL_F_FULLFSYNC 1
13843+
_ACEOF
13844+
13845+
13846+
else
13847+
cat >>confdefs.h <<_ACEOF
13848+
#define HAVE_DECL_F_FULLFSYNC 0
13849+
_ACEOF
13850+
13851+
13852+
fi
13853+
13854+
1378313855

1378413856
HAVE_IPV6=no
1378513857
echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5

‎configure.in‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.477 2006/10/01 23:47:16 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.478 2006/10/02 00:06:18 tgl Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -854,8 +854,6 @@ if test "$with_krb5" = yes; then
854854
[#include <krb5.h>])
855855
fi
856856

857-
# This is probably only present on Darwin, but may as well check always
858-
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
859857

860858
##
861859
## Functions, global variables
@@ -869,6 +867,9 @@ AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid memmove poll pstat readlin
869867

870868
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
871869
AC_CHECK_DECLS(posix_fadvise, [], [], [#include <fcntl.h>])
870+
AC_CHECK_DECLS(strlcpy)
871+
# This is probably only present on Darwin, but may as well check always
872+
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
872873

873874
HAVE_IPV6=no
874875
AC_CHECK_TYPE([struct sockaddr_in6],

‎src/include/pg_config.h.in‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,10 @@
8787
don't. */
8888
#undef HAVE_DECL_SNPRINTF
8989

90+
/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
91+
don't. */
92+
#undef HAVE_DECL_STRLCPY
93+
9094
/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
9195
don't. */
9296
#undef HAVE_DECL_VSNPRINTF

‎src/include/port.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/port.h,v 1.101 2006/09/30 12:06:42 momjian Exp $
9+
* $PostgreSQL: pgsql/src/include/port.h,v 1.102 2006/10/02 00:06:18 tgl Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -332,7 +332,7 @@ extern intinet_aton(const char *cp, struct in_addr * addr);
332332
externchar*strdup(constchar*str);
333333
#endif
334334

335-
#if !defined(HAVE_STRLCPY)|| defined(bsdi)/* bsdi doesn't have the prototype */
335+
#if !HAVE_DECL_STRLCPY
336336
externsize_tstrlcpy(char*dst,constchar*src,size_tsiz);
337337
#endif
338338

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp