Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Provide access to _res in the non-threaded case, and abort in the threaded

Browse Source 
case.
This commit is contained in:
christos 2004-05-22 15:44:26 +00:00
parent c5167ccf84
commit 7168861fac
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libc/resolv/res_state.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: res_state.c,v 1.2 2004/05/21 16:02:40 christos Exp $ */
/* $NetBSD: res_state.c,v 1.3 2004/05/22 15:44:26 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: res_state.c,v 1.2 2004/05/21 16:02:40 christos Exp $");
__RCSID("$NetBSD: res_state.c,v 1.3 2004/05/22 15:44:26 christos Exp $");
#endif
#include <sys/types.h>
@ -46,16 +46,19 @@ __RCSID("$NetBSD: res_state.c,v 1.2 2004/05/21 16:02:40 christos Exp $");
#include <arpa/nameser.h>
#include <resolv.h>
/* Binary Compatibility */
#undef _res
/* Binary Compatibility; this symbol does not appear in a header file */
struct __res_state _res;
#ifdef _REENTRANT
res_state __res_get_state_nothread(void);
void __res_put_state_nothread(res_state);
#ifdef __weak_alias
__weak_alias(__res_get_state, __res_get_state_nothread)
__weak_alias(__res_put_state, __res_put_state_nothread)
/* Source compatibility; only for single threaded programs */
__weak_alias(__res_state, __res_get_state_nothread)
#endif
res_state
@ -69,4 +72,3 @@ void
__res_put_state_nothread(res_state res)
{
}
#endif

19
lib/libpthread/res_state.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: res_state.c,v 1.1 2004/05/21 03:40:51 christos Exp $ */
/* $NetBSD: res_state.c,v 1.2 2004/05/22 15:44:26 christos Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: res_state.c,v 1.1 2004/05/21 03:40:51 christos Exp $");
__RCSID("$NetBSD: res_state.c,v 1.2 2004/05/22 15:44:26 christos Exp $");
#endif
#include <sys/types.h>
@ -72,6 +72,7 @@ union _res_st {
static pthread_mutex_t res_mtx = PTHREAD_MUTEX_INITIALIZER;
res_state __res_state(void);
res_state __res_get_state(void);
void __res_put_state(res_state);
@ -118,3 +119,17 @@ __res_put_state(res_state res)
LIST_INSERT_HEAD(&res_list, (union _res_st *)(void *)res, st_list);
pthread_mutex_unlock(&res_mtx);
}
/*
* This is aliased via a macro to _res; don't allow multi-threaded programs
* to use it.
*/
res_state
__res_state(void)
{
static const char res[] = "_res is not supported for multi-threaded"
" programs.\n";
(void)write(STDERR_FILENO, res, sizeof(res) - 1);
abort();
return NULL;
}