From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Thu, 25 Feb 2016 13:21:23 +0000 (+0100)
Subject: lib: include strutils.h for mempcpy()
X-Git-Tag: v2.28-rc1~64^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab753d8feef06cd564e597ac2f155f89c0645a5f;p=thirdparty%2Futil-linux.git

lib: include strutils.h for mempcpy()

We have that mempcpy fallback since 2013 (02887b73) but forgot to
include it.

This fixes a segfault of cal(1) on FreeBSD and OSX.

Compiler warning was:
lib/mbsalign.c:468:14: warning: implicit declaration of function 'mempcpy' is invalid in C99 [-Wimplicit-function-declaration]
      dest = mempcpy (dest, str_to_print, min (n_used_bytes, space_left));
             ^
lib/mbsalign.c:468:12: warning: incompatible integer to pointer conversion assigning to 'char *' from 'int' [-Wint-conversion]
      dest = mempcpy (dest, str_to_print, min (n_used_bytes, space_left));

CC: Daniel Trebbien <dtrebbien@gmail.com>
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/lib/mbsalign.c b/lib/mbsalign.c
index 2a8de2f59f..f9babba111 100644
--- a/lib/mbsalign.c
+++ b/lib/mbsalign.c
@@ -27,6 +27,7 @@
 
 #include "c.h"
 #include "mbsalign.h"
+#include "strutils.h"
 #include "widechar.h"
 
 #ifdef HAVE_WIDECHAR