openharmony/third_party_libnl
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_libnl synced 2024-11-24 10:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: escape usage of strerror_l() if it doesn't exist in libc

Browse Source 
uClibc doesn't implement strerror_l() and thus libnl starting from
3.2.29 couldn't be compiled with it any longer.

To work-around that problem we'll just do a check on strerror_l()
availability during configuration and if it's not there just fall back
to locale-less strerror().

See-also: 6c2d111177

http://lists.infradead.org/pipermail/libnl/2017-March/002301.html

Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Alexey Brodkin 2017-03-10 17:44:22 +03:00 committed by Thomas Haller
parent bcdf874adb
commit e15966ac7f
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -121,6 +121,8 @@ fi
AC_CONFIG_SUBDIRS([doc])
AC_CHECK_FUNCS([strerror_l])
AC_CONFIG_FILES([
Makefile
libnl-3.0.pc

8
lib/utils.c
View File

@ -30,7 +30,9 @@
#include <netlink/utils.h>
#include <linux/socket.h>
#include <stdlib.h> /* exit() */
#ifdef HAVE_STRERROR_L
#include <locale.h>
#endif
/**
* Global variable indicating the desired level of debugging output.
@ -123,9 +125,10 @@ int __nl_read_num_str_file(const char *path, int (*cb)(long, const char *))
const char *nl_strerror_l(int err)
{
const char *buf;
#ifdef HAVE_STRERROR_L
int errno_save = errno;
locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
const char *buf;
if (loc == (locale_t)0) {
if (errno == ENOENT)
@ -140,6 +143,9 @@ const char *nl_strerror_l(int err)
}
errno = errno_save;
#else
buf = strerror(err);
#endif
return buf;
}
/** @endcond */

6
src/lib/utils.c
View File

@ -81,6 +81,7 @@ void nl_cli_fatal(int err, const char *fmt, ...)
fprintf(stderr, "\n");
} else {
char *buf;
#ifdef HAVE_STRERROR_L
locale_t loc = newlocale(LC_MESSAGES_MASK, "", (locale_t)0);
if (loc == (locale_t)0) {
if (errno == ENOENT)
@ -91,9 +92,14 @@ void nl_cli_fatal(int err, const char *fmt, ...)
}
if (loc != (locale_t)0)
buf = strerror_l(err, loc);
#else
buf = strerror(err);
#endif
fprintf(stderr, "%s\n", buf);
#ifdef HAVE_STRERROR_L
if (loc != (locale_t)0)
freelocale(loc);
#endif
}
exit(abs(err));