nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/652'

Browse Source
This commit is contained in:
David Goulet 2022-11-28 09:37:12 -05:00
commit 21121eb231
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bsd_libc Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compilation):
- Fix returning something other than "Unknown N/A" as libc version if we
build tor on an O.S. like DragonFlyBSD, FreeBSD, OpenBSD or NetBSD.

18
src/lib/osinfo/libc.c
View File

@ -31,6 +31,9 @@
const char * const char *
tor_libc_get_name(void) tor_libc_get_name(void)
{ {
#if defined(__BSD_VISIBLE) || defined(__NETBSD_SOURCE)
return "BSD";
#endif /* defined(__BSD_VISIBLE) || defined(__NETBSD_SOURCE) */
#ifdef __GLIBC__ #ifdef __GLIBC__
return "Glibc"; return "Glibc";
#else /* !defined(__GLIBC__) */ #else /* !defined(__GLIBC__) */
@ -43,6 +46,21 @@ tor_libc_get_name(void)
const char * const char *
tor_libc_get_version_str(void) tor_libc_get_version_str(void)
{ {
#if defined(__BSD_VISIBLE) || defined(__NETBSD_SOURCE)
#include <sys/param.h>
#ifdef __DragonFly_version
return STR(__DragonFly_version);
#endif
#ifdef __FreeBSD__
return STR(__FreeBSD_version);
#endif
#ifdef __NetBSD_Version__
return STR(__NetBSD_Version__);
#endif
#ifdef OpenBSD
return STR(OpenBSD);
#endif
#endif /* defined(__BSD_VISIBLE) || defined(__NETBSD_SOURCE) */
#ifdef CHECK_LIBC_VERSION #ifdef CHECK_LIBC_VERSION
const char *version = gnu_get_libc_version(); const char *version = gnu_get_libc_version();
if (version == NULL) if (version == NULL)