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
Appearance settings

Commit ce4887b

Browse filesBrowse files
tglsfdctglsfdc
committed
Fix another portability issue from commit 758ce9b.
strerror.c now requires strlcpy() in some cases, and a couple of the ecpg libraries did not have that at hand. Pull it in from src/port/ following the usual recipe. Per buildfarm.
1 parent ba16aad commit ce4887b
Copy full SHA for ce4887b

File tree

Expand file treeCollapse file tree

4 files changed

+8
-6
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+8
-6
lines changed

‎src/interfaces/ecpg/compatlib/.gitignore

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/compatlib/.gitignore
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
/exports.list
44
/snprintf.c
55
/strerror.c
6+
/strlcpy.c
67
/strnlen.c

‎src/interfaces/ecpg/compatlib/Makefile

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/compatlib/Makefile
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SHLIB_EXPORTS = exports.txt
3232
LIBS := $(filter-out -lpgport, $(LIBS))
3333

3434
OBJS= informix.o snprintf.o strerror.o \
35-
$(filter strnlen.o, $(LIBOBJS)) $(WIN32RES)
35+
$(filter strlcpy.o strnlen.o, $(LIBOBJS)) $(WIN32RES)
3636

3737
PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
3838

@@ -49,7 +49,7 @@ submake-pgtypeslib:
4949
# Shared library stuff
5050
include $(top_srcdir)/src/Makefile.shlib
5151

52-
snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/%
52+
snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/%
5353
rm -f $@ && $(LN_S) $< .
5454

5555
install: all installdirs install-lib
@@ -59,6 +59,6 @@ installdirs: installdirs-lib
5959
uninstall: uninstall-lib
6060

6161
clean distclean: clean-lib
62-
rm -f $(OBJS) snprintf.c strerror.c strnlen.c
62+
rm -f $(OBJS) snprintf.c strerror.c strlcpy.c strnlen.c
6363

6464
maintainer-clean: distclean maintainer-clean-lib

‎src/interfaces/ecpg/pgtypeslib/.gitignore

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/pgtypeslib/.gitignore
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
/rint.c
66
/snprintf.c
77
/strerror.c
8+
/strlcpy.c
89
/string.c
910
/strnlen.c

‎src/interfaces/ecpg/pgtypeslib/Makefile

Copy file name to clipboardExpand all lines: src/interfaces/ecpg/pgtypeslib/Makefile
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SHLIB_EXPORTS = exports.txt
3131

3232
OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
3333
pgstrcasecmp.o snprintf.o strerror.o \
34-
$(filter rint.o strnlen.o, $(LIBOBJS)) \
34+
$(filter rint.o strlcpy.o strnlen.o, $(LIBOBJS)) \
3535
string.o \
3636
$(WIN32RES)
3737

@@ -45,7 +45,7 @@ include $(top_srcdir)/src/Makefile.shlib
4545
# necessarily use the same object files as the backend uses. Instead,
4646
# symlink the source files in here and build our own object file.
4747

48-
pgstrcasecmp.c rint.c snprintf.c strerror.c strnlen.c: % : $(top_srcdir)/src/port/%
48+
pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c: % : $(top_srcdir)/src/port/%
4949
rm -f $@ && $(LN_S) $< .
5050

5151
string.c: % : $(top_srcdir)/src/common/%
@@ -58,6 +58,6 @@ installdirs: installdirs-lib
5858
uninstall: uninstall-lib
5959

6060
clean distclean: clean-lib
61-
rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strnlen.c string.c
61+
rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strerror.c strlcpy.c strnlen.c string.c
6262

6363
maintainer-clean: distclean maintainer-clean-lib

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.