Add #ifndef __NETBSD_SYSCALLS around calls to issetugid() which
do not exist in NetBSD 1.3.
This commit is contained in:
@@ -33,12 +33,12 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: setlocale.c,v 1.20 1997/02/22 14:59:56 peter Exp $
|
||||
* $Id: setlocale.c,v 1.21 1997/04/07 08:54:35 ache Exp $
|
||||
*/
|
||||
|
||||
#ifdef LIBC_RCS
|
||||
static const char rcsid[] =
|
||||
"$Id: setlocale.c,v 1.20 1997/02/22 14:59:56 peter Exp $";
|
||||
"$Id: setlocale.c,v 1.21 1997/04/07 08:54:35 ache Exp $";
|
||||
#endif
|
||||
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
@@ -225,7 +225,11 @@ loadlocale(category)
|
||||
if (_PathLocale == NULL) {
|
||||
char *p = getenv("PATH_LOCALE");
|
||||
|
||||
if (p != NULL && !issetugid()) {
|
||||
if (p != NULL
|
||||
#ifndef __NETBSD_SYSCALLS
|
||||
&& !issetugid()
|
||||
#endif
|
||||
) {
|
||||
if (strlen(p) + 1/*"/"*/ + ENCODING_LEN +
|
||||
1/*"/"*/ + CATEGORY_LEN >= PATH_MAX)
|
||||
return (NULL);
|
||||
|
||||
@@ -87,7 +87,11 @@ _xpg4_setrunelocale(encoding)
|
||||
if (_PathLocale == NULL) {
|
||||
char *p = getenv("PATH_LOCALE");
|
||||
|
||||
if (p != NULL && !issetugid()) {
|
||||
if (p != NULL
|
||||
#ifndef __NETBSD_SYSCALLS
|
||||
&& !issetugid()
|
||||
#endif
|
||||
) {
|
||||
if (strlen(p) + 1/*"/"*/ + ENCODING_LEN +
|
||||
1/*"/"*/ + CATEGORY_LEN >= PATH_MAX)
|
||||
return(EFAULT);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/* $Id: msgcat.c,v 1.10 1997/05/10 04:28:17 ache Exp $ */
|
||||
/* $Id: msgcat.c,v 1.11 1997/05/10 04:40:40 ache Exp $ */
|
||||
|
||||
/***********************************************************
|
||||
Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
|
||||
@@ -101,7 +101,11 @@ int type;
|
||||
} else {
|
||||
if ((lang = (char *) getenv("LANG")) == NULL)
|
||||
lang = "C";
|
||||
if ((nlspath = (char *) getenv("NLSPATH")) == NULL || issetugid())
|
||||
if ((nlspath = (char *) getenv("NLSPATH")) == NULL
|
||||
#ifndef __NETBSD_SYSCALLS
|
||||
|| issetugid()
|
||||
#endif
|
||||
)
|
||||
nlspath = "/usr/share/nls/%L/%N.cat:/usr/share/nls/%N/%L:/usr/local/share/nls/%L/%N.cat:/usr/local/share/nls/%N/%L";
|
||||
|
||||
len = strlen(nlspath);
|
||||
|
||||
Reference in New Issue
Block a user