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.

diff --git a/src/common/Makefile b/src/common/Makefile
index cd97980ce663147087c133d6ff16ab75b8a0443e..b5889f7380f7a035cbe73b3a641ab70b8216a210 100644 (file)
--- a/src/common/Makefile
+++ b/src/common/Makefile
@@ -23,7 +23,7 @@ include $(top_builddir)/src/Makefile.global
 override CPPFLAGS := -DFRONTEND $(CPPFLAGS)
 LIBS += $(PTHREAD_LIBS)
 
-OBJS_COMMON = relpath.o
+OBJS_COMMON = relpath.o string.o
 
 OBJS_FRONTEND = $(OBJS_COMMON) fe_memutils.o
 

diff --git a/src/common/string.c b/src/common/string.c
new file mode 100644 (file)
index 0000000..27e0743
--- /dev/null
+++ b/src/common/string.c
@@ -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;
+}

diff --git a/src/include/common/string.h b/src/include/common/string.h
new file mode 100644 (file)
index 0000000..0233858
--- /dev/null
+++ b/src/include/common/string.h
@@ -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 */

diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 00a25b9f87e05d8c589814741e4bfa4b6b33e126..94c7fee855692a822629561b010aee46f724f1a6 100644 (file)
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -76,7 +76,7 @@ sub mkvcbuild
    push(@pgportfiles, 'rint.c') if ($vsVersion < '12.00');
 
    our @pgcommonallfiles = qw(
-     relpath.c);
+     relpath.c string.c);
 
    our @pgcommonfrontendfiles = (@pgcommonallfiles, qw(fe_memutils.c));