Skip to content

Commit bb2e2ce

Browse files
committed
Add pg_string_endswith as the start of a string helper library in src/common.
Backpatch to 9.3 where src/common was introduce, because a bugfix that needs to be backpatched, requires the function. Earlier branches will have to duplicate the code.
1 parent 1533154 commit bb2e2ce

File tree

4 files changed

+60
-2
lines changed

4 files changed

+60
-2
lines changed

src/common/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
2323
override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
2424
LIBS += $(PTHREAD_LIBS)
2525

26-
OBJS_COMMON = relpath.o
26+
OBJS_COMMON = relpath.o string.o
2727

2828
OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o
2929

src/common/string.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*-------------------------------------------------------------------------
2+
*
3+
* string.c
4+
* string handling helpers
5+
*
6+
*
7+
* Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
8+
* Portions Copyright (c) 1994, Regents of the University of California
9+
*
10+
*
11+
* IDENTIFICATION
12+
* src/common/string.c
13+
*
14+
*-------------------------------------------------------------------------
15+
*/
16+
17+
18+
#ifndef FRONTEND
19+
#include "postgres.h"
20+
#else
21+
#include "postgres_fe.h"
22+
#endif
23+
24+
#include "common/string.h"
25+
26+
27+
/*
28+
* Returns whether the string `str' has the postfix `end'.
29+
*/
30+
bool
31+
pg_str_endswith(const char *str, const char *end)
32+
{
33+
size_t slen = strlen(str);
34+
size_t elen = strlen(end);
35+
36+
/* can't be a postfix if longer */
37+
if (elen > slen)
38+
return false;
39+
40+
/* compare the end of the strings */
41+
str += slen - elen;
42+
return strcmp(str, end) == 0;
43+
}

src/include/common/string.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* string.h
3+
* string handling helpers
4+
*
5+
* Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
6+
* Portions Copyright (c) 1994, Regents of the University of California
7+
*
8+
* src/include/common/string.h
9+
*/
10+
#ifndef COMMON_STRING_H
11+
#define COMMON_STRING_H
12+
13+
extern bool pg_str_endswith(const char *str, const char *end);
14+
15+
#endif /* COMMON_STRING_H */

src/tools/msvc/Mkvcbuild.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ sub mkvcbuild
7676
push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00');
7777

7878
our @pgcommonallfiles = qw(
79-
relpath.c);
79+
relpath.c string.c);
8080

8181
our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));
8282

0 commit comments

Comments
 (0)