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

Commitfffd651

Browse files
committed
Rewrite strnlen replacement implementation from8a24179.
The previous placement of the fallback implementation in libpgcommonwas problematic, because libpqport functions need strnlenfunctionality.Move replacement into libpgport. Provide strnlen() under its posixname, instead of pg_strnlen(). Fix stupid configure bug, executing thetest only when compiled with threading support.Author: Andres FreundDiscussion:https://postgr.es/m/E1e1gR2-0005fB-SI@gemulon.postgresql.org
1 parentfa5e119 commitfffd651

File tree

10 files changed

+77
-47
lines changed

10 files changed

+77
-47
lines changed

‎configure

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8777,7 +8777,7 @@ fi
87778777

87788778

87798779

8780-
forac_funcin strerror_r getpwuid_r gethostbyname_r strnlen
8780+
forac_funcin strerror_r getpwuid_r gethostbyname_r
87818781
do:
87828782
as_ac_var=`$as_echo"ac_cv_func_$ac_func"|$as_tr_sh`
87838783
ac_fn_c_check_func"$LINENO""$ac_func""$as_ac_var"
@@ -13161,6 +13161,16 @@ fi
1316113161
cat>>confdefs.h<<_ACEOF
1316213162
#define HAVE_DECL_STRLCPY$ac_have_decl
1316313163
_ACEOF
13164+
ac_fn_c_check_decl"$LINENO""strnlenfrak""ac_cv_have_decl_strnlen""$ac_includes_default"
13165+
iftest"x$ac_cv_have_decl_strnlen" = xyes;then:
13166+
ac_have_decl=1
13167+
else
13168+
ac_have_decl=0
13169+
fi
13170+
13171+
cat>>confdefs.h<<_ACEOF
13172+
#define HAVE_DECL_STRNLEN$ac_have_decl
13173+
_ACEOF
1316413174

1316513175
# This is probably only present on macOS, but may as well check always
1316613176
ac_fn_c_check_decl"$LINENO""F_FULLFSYNC""ac_cv_have_decl_F_FULLFSYNC""#include <fcntl.h>
@@ -13528,6 +13538,19 @@ esac
1352813538

1352913539
fi
1353013540

13541+
ac_fn_c_check_func"$LINENO""strnlenfrak""ac_cv_func_strnlen"
13542+
iftest"x$ac_cv_func_strnlen" = xyes;then:
13543+
$as_echo"#define HAVE_STRNLEN 1">>confdefs.h
13544+
13545+
else
13546+
case"$LIBOBJS"in
13547+
*" strnlen.$ac_objext"* ) ;;
13548+
*) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
13549+
;;
13550+
esac
13551+
13552+
fi
13553+
1353113554

1353213555

1353313556
case$host_osin

‎configure.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ LIBS="$LIBS $PTHREAD_LIBS"
961961
AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([
962962
pthread.h not found; use --disable-thread-safety to disable thread safety])])
963963

964-
AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r strnlen])
964+
AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
965965

966966
# Do test here with the proper thread flags
967967
PGAC_FUNC_STRERROR_R_INT
@@ -1422,7 +1422,7 @@ AC_CHECK_DECLS(posix_fadvise, [], [], [#include <fcntl.h>])
14221422
fi
14231423

14241424
AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
1425-
AC_CHECK_DECLS([strlcat, strlcpy])
1425+
AC_CHECK_DECLS([strlcat, strlcpy, strnlen])
14261426
# This is probably only present on macOS, but may as well check always
14271427
AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
14281428

@@ -1514,7 +1514,7 @@ else
15141514
AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
15151515
fi
15161516

1517-
AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton mkdtemp random rint srandom strerror strlcat strlcpy])
1517+
AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton mkdtemp random rint srandom strerror strlcat strlcpy strnlen])
15181518

15191519
case $host_os in
15201520

‎src/backend/utils/mmgr/mcxt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
#include"postgres.h"
2323

24-
#include"common/string.h"
2524
#include"miscadmin.h"
2625
#include"utils/memdebug.h"
2726
#include"utils/memutils.h"
@@ -1089,7 +1088,7 @@ pnstrdup(const char *in, Size len)
10891088
{
10901089
char*out;
10911090

1092-
len=pg_strnlen(in,len);
1091+
len=strnlen(in,len);
10931092

10941093
out=palloc(len+1);
10951094
memcpy(out,in,len);

‎src/common/string.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,3 @@ pg_str_endswith(const char *str, const char *end)
4141
str+=slen-elen;
4242
returnstrcmp(str,end)==0;
4343
}
44-
45-
46-
/*
47-
* Portable version of posix' strnlen.
48-
*
49-
* Returns the number of characters before a null-byte in the string pointed
50-
* to by str, unless there's no null-byte before maxlen. In the latter case
51-
* maxlen is returned.
52-
*/
53-
#ifndefHAVE_STRNLEN
54-
size_t
55-
pg_strnlen(constchar*str,size_tmaxlen)
56-
{
57-
constchar*p=str;
58-
59-
while (maxlen-->0&&*p)
60-
p++;
61-
returnp-str;
62-
}
63-
#endif

‎src/include/common/string.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,4 @@
1212

1313
externboolpg_str_endswith(constchar*str,constchar*end);
1414

15-
/*
16-
* Portable version of posix' strnlen.
17-
*
18-
* Returns the number of characters before a null-byte in the string pointed
19-
* to by str, unless there's no null-byte before maxlen. In the latter case
20-
* maxlen is returned.
21-
*
22-
* Use the system strnlen if provided, it's likely to be faster.
23-
*/
24-
#ifdefHAVE_STRNLEN
25-
#definepg_strnlen(str,maxlen) strnlen(str, maxlen)
26-
#else
27-
externsize_tpg_strnlen(constchar*str,size_tmaxlen);
28-
#endif
29-
3015
#endif/* COMMON_STRING_H */

‎src/include/pg_config.h.in

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,10 @@
147147
don't. */
148148
#undef HAVE_DECL_STRLCPY
149149

150+
/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
151+
don't. */
152+
#undef HAVE_DECL_STRNLEN
153+
150154
/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
151155
don't. */
152156
#undef HAVE_DECL_SYS_SIGLIST

‎src/include/pg_config.h.win32

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,10 @@
9999
don't. */
100100
#define HAVE_DECL_SNPRINTF 1
101101

102+
/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
103+
don't. */
104+
#define HAVE_DECL_STRNLEN 1
105+
102106
/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
103107
don't. */
104108
#define HAVE_DECL_VSNPRINTF 1
@@ -255,6 +259,9 @@
255259
/* Define to 1 if you have the <pam/pam_appl.h> header file. */
256260
/* #undef HAVE_PAM_PAM_APPL_H */
257261

262+
/* Define to 1 if you have the `strnlen' function. */
263+
#define HAVE_STRNLEN 1
264+
258265
/* Define to 1 if you have the `poll' function. */
259266
/* #undef HAVE_POLL */
260267

@@ -345,9 +352,6 @@
345352
/* Define to 1 if you have the <string.h> header file. */
346353
#define HAVE_STRING_H 1
347354

348-
/* Define to 1 if you have the `strnlen' function. */
349-
#define HAVE_STRNLEN
350-
351355
/* Define to use have a strong random number source */
352356
#define HAVE_STRONG_RANDOM 1
353357

‎src/include/port.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,10 @@ extern size_t strlcat(char *dst, const char *src, size_t siz);
406406
externsize_tstrlcpy(char*dst,constchar*src,size_tsiz);
407407
#endif
408408

409+
#if !HAVE_DECL_STRNLEN
410+
externsize_tstrnlen(constchar*str,size_tmaxlen);
411+
#endif
412+
409413
#if !defined(HAVE_RANDOM)
410414
externlongrandom(void);
411415
#endif

‎src/port/snprintf.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
#endif
4444
#include<sys/param.h>
4545

46-
#include"common/string.h"
47-
4846
#ifndefNL_ARGMAX
4947
#defineNL_ARGMAX 16
5048
#endif
@@ -804,7 +802,7 @@ fmtstr(char *value, int leftjust, int minlen, int maxwidth,
804802
* than that.
805803
*/
806804
if (pointflag)
807-
vallen=pg_strnlen(value,maxwidth);
805+
vallen=strnlen(value,maxwidth);
808806
else
809807
vallen=strlen(value);
810808

‎src/port/strnlen.c

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* strnlen.c
4+
*Fallback implementation of strnlen().
5+
*
6+
*
7+
* Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
8+
* Portions Copyright (c) 1994, Regents of the University of California
9+
*
10+
* IDENTIFICATION
11+
* src/port/strnlen.c
12+
*
13+
*-------------------------------------------------------------------------
14+
*/
15+
16+
#include"c.h"
17+
18+
/*
19+
* Implementation of posix' strnlen for systems where it's not available.
20+
*
21+
* Returns the number of characters before a null-byte in the string pointed
22+
* to by str, unless there's no null-byte before maxlen. In the latter case
23+
* maxlen is returned.
24+
*/
25+
size_t
26+
strnlen(constchar*str,size_tmaxlen)
27+
{
28+
constchar*p=str;
29+
30+
while (maxlen-->0&&*p)
31+
p++;
32+
returnp-str;
33+
}

0 commit comments

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