Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Gpdb
提交
4f64a07b
G
Gpdb
项目概览
Greenplum
/
Gpdb
通知
7
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gpdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4f64a07b
编写于
2月 07, 2007
作者:
P
Peter Eisentraut
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add strlcat() from OpenBSD, to be used for replacing strncat and other
strange coding practices.
上级
5b706ba4
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
144 addition
and
7 deletion
+144
-7
configure
configure
+72
-1
configure.in
configure.in
+3
-3
src/bin/pg_config/pg_config.c
src/bin/pg_config/pg_config.c
+2
-2
src/include/pg_config.h.in
src/include/pg_config.h.in
+7
-0
src/include/port.h
src/include/port.h
+5
-1
src/port/strlcat.c
src/port/strlcat.c
+55
-0
未找到文件。
configure
浏览文件 @
4f64a07b
...
...
@@ -13973,6 +13973,76 @@ _ACEOF
fi
echo "$as_me:$LINENO: checking whether strlcat is declared" >&5
echo $ECHO_N "checking whether strlcat is declared... $ECHO_C" >&6
if test "${ac_cv_have_decl_strlcat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
int
main ()
{
#ifndef strlcat
char *p = (char *) strlcat;
#endif
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_have_decl_strlcat=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_have_decl_strlcat=no
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: $ac_cv_have_decl_strlcat" >&5
echo "${ECHO_T}$ac_cv_have_decl_strlcat" >&6
if test $ac_cv_have_decl_strlcat = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_STRLCAT 1
_ACEOF
else
cat >>confdefs.h <<_ACEOF
#define HAVE_DECL_STRLCAT 0
_ACEOF
fi
echo "$as_me:$LINENO: checking whether strlcpy is declared" >&5
echo $ECHO_N "checking whether strlcpy is declared... $ECHO_C" >&6
if test "${ac_cv_have_decl_strlcpy+set}" = set; then
...
...
@@ -14850,7 +14920,8 @@ LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv
for ac_func in crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcat strlcpy strtol strtoul unsetenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
...
...
configure.in
浏览文件 @
4f64a07b
dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.50
0 2007/02/03 02:43:38 momjian
Exp $
dnl $PostgreSQL: pgsql/configure.in,v 1.50
1 2007/02/07 00:28:54 petere
Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
...
...
@@ -905,7 +905,7 @@ AC_CHECK_FUNCS([cbrt dlopen fcvt fdatasync getpeereid getrlimit memmove poll pst
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
AC_CHECK_DECLS(posix_fadvise, [], [], [#include <fcntl.h>])
AC_CHECK_DECLS(
strlcpy
)
AC_CHECK_DECLS(
[strlcat, strlcpy]
)
# This is probably only present on Darwin, but may as well check always
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
...
...
@@ -1002,7 +1002,7 @@ fi
pgac_save_LIBS="$LIBS"
LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlcpy strtol strtoul unsetenv])
AC_REPLACE_FUNCS([crypt fseeko getopt getrusage inet_aton random rint srandom strdup strerror strlc
at strlc
py strtol strtoul unsetenv])
LIBS="$pgac_save_LIBS"
...
...
src/bin/pg_config/pg_config.c
浏览文件 @
4f64a07b
...
...
@@ -17,7 +17,7 @@
*
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2
3 2007/01/05 22:19:48 momjian
Exp $
* $PostgreSQL: pgsql/src/bin/pg_config/pg_config.c,v 1.2
4 2007/02/07 00:28:54 petere
Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -213,7 +213,7 @@ show_pgxs(bool all)
if
(
all
)
printf
(
"PGXS = "
);
get_pkglib_path
(
mypath
,
path
);
str
ncat
(
path
,
"/pgxs/src/makefiles/pgxs.mk"
,
MAXPGPATH
-
1
-
strlen
(
path
));
str
lcat
(
path
,
"/pgxs/src/makefiles/pgxs.mk"
,
sizeof
(
path
));
cleanup_path
(
path
);
printf
(
"%s
\n
"
,
path
);
}
...
...
src/include/pg_config.h.in
浏览文件 @
4f64a07b
...
...
@@ -87,6 +87,10 @@
don't. */
#undef HAVE_DECL_SNPRINTF
/* Define to 1 if you have the declaration of `strlcat', and to 0 if you
don't. */
#undef HAVE_DECL_STRLCAT
/* Define to 1 if you have the declaration of `strlcpy', and to 0 if you
don't. */
#undef HAVE_DECL_STRLCPY
...
...
@@ -389,6 +393,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
/* Define to 1 if you have the `strlcat' function. */
#undef HAVE_STRLCAT
/* Define to 1 if you have the `strlcpy' function. */
#undef HAVE_STRLCPY
...
...
src/include/port.h
浏览文件 @
4f64a07b
...
...
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* $PostgreSQL: pgsql/src/include/port.h,v 1.1
09 2007/01/19 16:42:24 alvher
re Exp $
* $PostgreSQL: pgsql/src/include/port.h,v 1.1
10 2007/02/07 00:28:55 pete
re Exp $
*
*-------------------------------------------------------------------------
*/
...
...
@@ -343,6 +343,10 @@ extern int inet_aton(const char *cp, struct in_addr * addr);
extern
char
*
strdup
(
const
char
*
str
);
#endif
#if !HAVE_DECL_STRLCAT
extern
size_t
strlcat
(
char
*
dst
,
const
char
*
src
,
size_t
siz
);
#endif
#if !HAVE_DECL_STRLCPY
extern
size_t
strlcpy
(
char
*
dst
,
const
char
*
src
,
size_t
siz
);
#endif
...
...
src/port/strlcat.c
0 → 100644
浏览文件 @
4f64a07b
/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
/*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include "c.h"
/*
* Appends src to string dst of size siz (unlike strncat, siz is the
* full size of dst, not space left). At most siz-1 characters
* will be copied. Always NUL terminates (unless siz <= strlen(dst)).
* Returns strlen(src) + MIN(siz, strlen(initial dst)).
* If retval >= siz, truncation occurred.
*/
size_t
strlcat
(
char
*
dst
,
const
char
*
src
,
size_t
siz
)
{
char
*
d
=
dst
;
const
char
*
s
=
src
;
size_t
n
=
siz
;
size_t
dlen
;
/* Find the end of dst and adjust bytes left but don't go past end */
while
(
n
--
!=
0
&&
*
d
!=
'\0'
)
d
++
;
dlen
=
d
-
dst
;
n
=
siz
-
dlen
;
if
(
n
==
0
)
return
(
dlen
+
strlen
(
s
));
while
(
*
s
!=
'\0'
)
{
if
(
n
!=
1
)
{
*
d
++
=
*
s
;
n
--
;
}
s
++
;
}
*
d
=
'\0'
;
return
(
dlen
+
(
s
-
src
));
/* count does not include NUL */
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录