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.
This commit is contained in:
Andres Freund 2015-01-03 20:51:52 +01:00
parent e7c1188756
commit 70e36adb0d
5 changed files with 62 additions and 21 deletions

View File

@ -40,6 +40,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include "access/transam.h" #include "access/transam.h"
#include "common/string.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "replication/slot.h" #include "replication/slot.h"
#include "storage/fd.h" #include "storage/fd.h"
@ -779,24 +780,6 @@ CheckSlotRequirements(void)
errmsg("replication slots can only be used if wal_level >= archive"))); errmsg("replication slots can only be used if wal_level >= archive")));
} }
/*
* Returns whether the string `str' has the postfix `end'.
*/
static bool
string_endswith(const char *str, const char *end)
{
size_t slen = strlen(str);
size_t elen = strlen(end);
/* can't be a postfix if longer */
if (elen > slen)
return false;
/* compare the end of the strings */
str += slen - elen;
return strcmp(str, end) == 0;
}
/* /*
* Flush all replication slots to disk. * Flush all replication slots to disk.
* *
@ -864,7 +847,7 @@ StartupReplicationSlots(void)
continue; continue;
/* we crashed while a slot was being setup or deleted, clean up */ /* we crashed while a slot was being setup or deleted, clean up */
if (string_endswith(replication_de->d_name, ".tmp")) if (pg_str_endswith(replication_de->d_name, ".tmp"))
{ {
if (!rmtree(path, true)) if (!rmtree(path, true))
{ {

View File

@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
override CPPFLAGS := -DFRONTEND $(CPPFLAGS) override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
LIBS += $(PTHREAD_LIBS) LIBS += $(PTHREAD_LIBS)
OBJS_COMMON = exec.o pgfnames.o psprintf.o relpath.o rmtree.o username.o wait_error.o OBJS_COMMON = exec.o pgfnames.o psprintf.o relpath.o rmtree.o string.o username.o wait_error.o
OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o

43
src/common/string.c Normal file
View File

@ -0,0 +1,43 @@
/*-------------------------------------------------------------------------
*
* string.c
* string handling helpers
*
*
* Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
* src/common/string.c
*
*-------------------------------------------------------------------------
*/
#ifndef FRONTEND
#include "postgres.h"
#else
#include "postgres_fe.h"
#endif
#include "common/string.h"
/*
* Returns whether the string `str' has the postfix `end'.
*/
bool
pg_str_endswith(const char *str, const char *end)
{
size_t slen = strlen(str);
size_t elen = strlen(end);
/* can't be a postfix if longer */
if (elen > slen)
return false;
/* compare the end of the strings */
str += slen - elen;
return strcmp(str, end) == 0;
}

View File

@ -0,0 +1,15 @@
/*
* string.h
* string handling helpers
*
* Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
* src/include/common/string.h
*/
#ifndef COMMON_STRING_H
#define COMMON_STRING_H
extern bool pg_str_endswith(const char *str, const char *end);
#endif /* COMMON_STRING_H */

View File

@ -76,7 +76,7 @@ sub mkvcbuild
push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00'); push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00');
our @pgcommonallfiles = qw( our @pgcommonallfiles = qw(
exec.c pgfnames.c psprintf.c relpath.c rmtree.c username.c wait_error.c); exec.c pgfnames.c psprintf.c relpath.c rmtree.c string.c username.c wait_error.c);
our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c)); our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));