diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-11-28 14:39:50 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2020-11-28 14:39:50 +0000 |
| commit | fd5d388e506341bdd552cf8264756afdb69a03f1 (patch) | |
| tree | 8206baca7bf1f7d0f10db44064137ffaf7f2157e /lib/libX11/modules/lc/gen | |
| parent | ec07b47ab3b3e6e67ad00c9c5a6428079a3233f9 (diff) | |
Update to libX11 1.7.0. Tested by gkoehler@ and jsg@
Diffstat (limited to 'lib/libX11/modules/lc/gen')
| -rw-r--r-- | lib/libX11/modules/lc/gen/Makefile.in | 8 | ||||
| -rw-r--r-- | lib/libX11/modules/lc/gen/lcGenConv.c | 10 |
2 files changed, 10 insertions, 8 deletions
diff --git a/lib/libX11/modules/lc/gen/Makefile.in b/lib/libX11/modules/lc/gen/Makefile.in index c51afa9b2..255c6c567 100644 --- a/lib/libX11/modules/lc/gen/Makefile.in +++ b/lib/libX11/modules/lc/gen/Makefile.in @@ -55,9 +55,10 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac + $(top_srcdir)/m4/ax_gcc_builtin.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -329,6 +330,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ diff --git a/lib/libX11/modules/lc/gen/lcGenConv.c b/lib/libX11/modules/lc/gen/lcGenConv.c index eede76807..dff4269c9 100644 --- a/lib/libX11/modules/lc/gen/lcGenConv.c +++ b/lib/libX11/modules/lc/gen/lcGenConv.c @@ -940,7 +940,7 @@ wcstombs_org( if (*to_left < defstr_len) break; if (outbufptr) { - strncpy((char *)outbufptr, default_string, defstr_len); + memcpy(outbufptr, default_string, defstr_len); outbufptr += defstr_len; } (*to_left) -= defstr_len; @@ -976,7 +976,7 @@ wcstombs_org( if (*to_left < length) break; if (outbufptr) { - strncpy((char *)outbufptr, encoding, length); + memcpy(outbufptr, encoding, length); outbufptr += length; } (*to_left) -= length; @@ -1966,7 +1966,7 @@ wcstostr( if (*to_left < defstr_len) break; if (outbufptr) { - strncpy((char *)outbufptr, default_string, defstr_len); + memcpy(outbufptr, default_string, defstr_len); outbufptr += defstr_len; } (*to_left) -= defstr_len; @@ -2005,7 +2005,7 @@ wcstostr( break; if (outbufptr) { - strncpy((char *)outbufptr, encoding, length); + memcpy(outbufptr, encoding, length); outbufptr += length; } (*to_left) -= length; @@ -2462,7 +2462,7 @@ strtombs( if (*to_left < length) break; if (outbufptr) { - strncpy((char *)outbufptr, encoding, length); + memcpy(outbufptr, encoding, length); outbufptr += length; } (*to_left) -= length; |