1*4882a593SmuzhiyunFrom ccf93148aa3587dd98a02e253cdc42a7af14df1e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 3*4882a593SmuzhiyunDate: Sat, 29 Aug 2020 16:04:15 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Provide replacement function for strerror_l() 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunstrerror_l() is not implemented in some C libraries, such as uClibc, 7*4882a593Smuzhiyunso let's provide a simple replacement function that falls back on 8*4882a593Smuzhiyunstrerror(). 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun configure.ac | 2 ++ 13*4882a593Smuzhiyun src/plugins/crypto.c | 7 +++++++ 14*4882a593Smuzhiyun src/utils/module.c | 8 ++++++++ 15*4882a593Smuzhiyun 3 files changed, 17 insertions(+) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/configure.ac b/configure.ac 18*4882a593Smuzhiyunindex c2d22c2..36aeb51 100644 19*4882a593Smuzhiyun--- a/configure.ac 20*4882a593Smuzhiyun+++ b/configure.ac 21*4882a593Smuzhiyun@@ -137,6 +137,8 @@ AC_CHECK_HEADERS([dlfcn.h string.h unistd.h sys/fcntl.h sys/ioctl.h linux/random 22*4882a593Smuzhiyun [LIBBLOCKDEV_SOFT_FAILURE([Header file $ac_header not found.])], 23*4882a593Smuzhiyun []) 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun+AC_CHECK_FUNCS([strerror_l]) 26*4882a593Smuzhiyun+ 27*4882a593Smuzhiyun AC_ARG_WITH([bcache], 28*4882a593Smuzhiyun AS_HELP_STRING([--with-bcache], [support bcache @<:@default=yes@:>@]), 29*4882a593Smuzhiyun [], 30*4882a593Smuzhiyundiff --git a/src/plugins/crypto.c b/src/plugins/crypto.c 31*4882a593Smuzhiyunindex f4a2e8f..c1bd7b5 100644 32*4882a593Smuzhiyun--- a/src/plugins/crypto.c 33*4882a593Smuzhiyun+++ b/src/plugins/crypto.c 34*4882a593Smuzhiyun@@ -52,6 +52,13 @@ 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun #define UNUSED __attribute__((unused)) 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun+#if !defined(HAVE_STRERROR_L) 39*4882a593Smuzhiyun+static char *strerror_l(int errnum, locale_t locale UNUSED) 40*4882a593Smuzhiyun+{ 41*4882a593Smuzhiyun+ return strerror(errnum); 42*4882a593Smuzhiyun+} 43*4882a593Smuzhiyun+#endif 44*4882a593Smuzhiyun+ 45*4882a593Smuzhiyun /** 46*4882a593Smuzhiyun * SECTION: crypto 47*4882a593Smuzhiyun * @short_description: plugin for operations with encrypted devices 48*4882a593Smuzhiyundiff --git a/src/utils/module.c b/src/utils/module.c 49*4882a593Smuzhiyunindex 9750e24..086bec0 100644 50*4882a593Smuzhiyun--- a/src/utils/module.c 51*4882a593Smuzhiyun+++ b/src/utils/module.c 52*4882a593Smuzhiyun@@ -27,6 +27,14 @@ 53*4882a593Smuzhiyun 54*4882a593Smuzhiyun #include "module.h" 55*4882a593Smuzhiyun 56*4882a593Smuzhiyun+#define UNUSED __attribute__((unused)) 57*4882a593Smuzhiyun+ 58*4882a593Smuzhiyun+#if !defined(HAVE_STRERROR_L) 59*4882a593Smuzhiyun+static char *strerror_l(int errnum, locale_t locale UNUSED) 60*4882a593Smuzhiyun+{ 61*4882a593Smuzhiyun+ return strerror(errnum); 62*4882a593Smuzhiyun+} 63*4882a593Smuzhiyun+#endif 64*4882a593Smuzhiyun 65*4882a593Smuzhiyun /** 66*4882a593Smuzhiyun * bd_utils_module_error_quark: (skip) 67*4882a593Smuzhiyun-- 68*4882a593Smuzhiyun2.26.2 69*4882a593Smuzhiyun 70