AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/bits/local_lim.h: Undefined ARG_MAX if

Browse Source 
<linux/limits.h> has defined it.
	* sysdeps/unix/sysv/linux/sys/param.h: Define NCARGS to the legacy
	ARG_MAX value and prevent ARG_MAX from being defined by the kernel
	headers.
	* sysdeps/unix/sysv/linux/sysconf.c: Define legacy_ARG_MAX and use
	it instead of ARG_MAX.
This commit is contained in:
Ulrich Drepper 2008-03-27 15:20:38 +00:00
parent fde15fdc5b
commit f96853beaf
10 changed files with 95 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-03-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/local_lim.h: Undefined ARG_MAX if
<linux/limits.h> has defined it.
* sysdeps/unix/sysv/linux/sys/param.h: Define NCARGS to the legacy
ARG_MAX value and prevent ARG_MAX from being defined by the kernel
headers.
* sysdeps/unix/sysv/linux/sysconf.c: Define legacy_ARG_MAX and use
it instead of ARG_MAX.
2008-03-25 Jakub Jelinek <jakub@redhat.com> 2008-03-25 Jakub Jelinek <jakub@redhat.com>
* posix/gai.conf: Fix comment for scope nullbits. * posix/gai.conf: Fix comment for scope nullbits.

9
nptl/ChangeLog
View File

@ -1,3 +1,12 @@
2008-03-27 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/bits/local_lim.h: Undefined ARG_MAX if
<linux/limits.h> has defined it.
* sysdeps/unix/sysv/linux/alpha/bits/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/local_lim.h: Likewise.
2008-03-18 Jakub Jelinek <jakub@redhat.com> 2008-03-18 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: Use __ASSEMBLER__ instead * sysdeps/unix/sysv/linux/ia64/dl-sysdep.h: Use __ASSEMBLER__ instead

10
nptl/sysdeps/unix/sysv/linux/alpha/bits/local_lim.h
View File

@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/Alpha version. /* Minimum guaranteed maximum values for system limits. Linux/Alpha version.
Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +53,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */ /* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128 #define _POSIX_THREAD_KEYS_MAX 128

10
nptl/sysdeps/unix/sysv/linux/bits/local_lim.h
View File

@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version. /* Minimum guaranteed maximum values for system limits. Linux version.
Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +53,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */ /* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128 #define _POSIX_THREAD_KEYS_MAX 128

10
nptl/sysdeps/unix/sysv/linux/ia64/bits/local_lim.h
View File

@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/IA-64 version. /* Minimum guaranteed maximum values for system limits. Linux/IA-64 version.
Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +53,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */ /* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128 #define _POSIX_THREAD_KEYS_MAX 128

11
nptl/sysdeps/unix/sysv/linux/powerpc/bits/local_lim.h
View File

@ -1,5 +1,6 @@
/* Minimum guaranteed maximum values for system limits. Linux/PPC version. /* Minimum guaranteed maximum values for system limits. Linux/PPC version.
Copyright (C) 1993-1998,2000,2002-2004,2006 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2002-2004,2006,2008
Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +32,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +54,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */ /* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128 #define _POSIX_THREAD_KEYS_MAX 128

10
nptl/sysdeps/unix/sysv/linux/sparc/bits/local_lim.h
View File

@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux/SPARC version. /* Minimum guaranteed maximum values for system limits. Linux/SPARC version.
Copyright (C) 1993-1998,2000,2002,2003,2004 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2002-2004,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +53,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* The number of data keys per process. */ /* The number of data keys per process. */
#define _POSIX_THREAD_KEYS_MAX 128 #define _POSIX_THREAD_KEYS_MAX 128

10
sysdeps/unix/sysv/linux/bits/local_lim.h
View File

@ -1,5 +1,5 @@
/* Minimum guaranteed maximum values for system limits. Linux version. /* Minimum guaranteed maximum values for system limits. Linux version.
Copyright (C) 1993-1998, 2000, 2003, 2004 Free Software Foundation, Inc. Copyright (C) 1993-1998,2000,2003,2004,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -31,6 +31,9 @@
#ifndef OPEN_MAX #ifndef OPEN_MAX
# define __undef_OPEN_MAX # define __undef_OPEN_MAX
#endif #endif
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
/* The kernel sources contain a file with all the needed information. */ /* The kernel sources contain a file with all the needed information. */
#include <linux/limits.h> #include <linux/limits.h>
@ -50,6 +53,11 @@
# undef OPEN_MAX # undef OPEN_MAX
# undef __undef_OPEN_MAX # undef __undef_OPEN_MAX
#endif #endif
/* Have to remove ARG_MAX? */
#ifdef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* Maximum amount by which a process can descrease its asynchronous I/O /* Maximum amount by which a process can descrease its asynchronous I/O
priority level. */ priority level. */

18
sysdeps/unix/sysv/linux/sys/param.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc. /* Copyright (C) 1995-1997,2000,2001,2003,2008 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -19,10 +19,20 @@
#ifndef _SYS_PARAM_H #ifndef _SYS_PARAM_H
#define _SYS_PARAM_H 1 #define _SYS_PARAM_H 1
#ifndef ARG_MAX
# define __undef_ARG_MAX
#endif
#include <limits.h> #include <limits.h>
#include <linux/limits.h> #include <linux/limits.h>
#include <linux/param.h> #include <linux/param.h>
/* The kernel headers defines ARG_MAX. The value is wrong, though. */
#ifndef __undef_ARG_MAX
# undef ARG_MAX
# undef __undef_ARG_MAX
#endif
/* BSD names for some <limits.h> values. */ /* BSD names for some <limits.h> values. */
#define NBBY CHAR_BIT #define NBBY CHAR_BIT
@ -31,12 +41,12 @@
#endif #endif
#define MAXSYMLINKS 20 #define MAXSYMLINKS 20
#define CANBSIZ MAX_CANON #define CANBSIZ MAX_CANON
#define NCARGS ARG_MAX
#define MAXPATHLEN PATH_MAX #define MAXPATHLEN PATH_MAX
/* The following is not really correct but it is a value we used for a /* The following are not really correct but it is a value we used for a
long time and which seems to be usable. People should not use NOFILE long time and which seems to be usable. People should not use NOFILE
anyway. */ and NCARGS anyway. */
#define NOFILE 256 #define NOFILE 256
#define NCARGS 131072
#include <sys/types.h> #include <sys/types.h>

9
sysdeps/unix/sysv/linux/sysconf.c
View File

@ -27,6 +27,11 @@
#include <not-cancel.h> #include <not-cancel.h>
#include <ldsodefs.h> #include <ldsodefs.h>
/* Legacy value of ARG_MAX. The macro is now not defined since the
actual value varies based on the stack size. */
#define legacy_ARG_MAX 131072
static long int posix_sysconf (int name); static long int posix_sysconf (int name);
@ -83,10 +88,10 @@ __sysconf (int name)
/* Use getrlimit to get the stack limit. */ /* Use getrlimit to get the stack limit. */
struct rlimit rlimit; struct rlimit rlimit;
if (__getrlimit (RLIMIT_STACK, &rlimit) == 0) if (__getrlimit (RLIMIT_STACK, &rlimit) == 0)
return MAX (ARG_MAX, rlimit.rlim_cur / 4); return MAX (legacy_ARG_MAX, rlimit.rlim_cur / 4);
} }
return ARG_MAX; return legacy_ARG_MAX;
case _SC_NGROUPS_MAX: case _SC_NGROUPS_MAX:
/* Try to read the information from the /proc/sys/kernel/ngroups_max /* Try to read the information from the /proc/sys/kernel/ngroups_max