diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-12-08 08:01:13 +0000 |
| commit | f65fd747b440ae2d8a7481ecc50e668c5e4d0cc9 (patch) | |
| tree | f64c3eeda0e9acc58b96c28ca852a014c822047f | |
| parent | 42054ddb496798d9b936490cf0050f6619f86bc1 (diff) | |
| download | glibc-cvs/libc-961208.tar.gz glibc-cvs/libc-961208.tar.xz glibc-cvs/libc-961208.zip | |
update from main archive 961207 cvs/libc-961208
Sun Dec 8 06:56:49 1996 Ulrich Drepper <drepper@cygnus.com> * io/getwd.c: Use PATH_MAX not LOCAL_PATH_MAX. Fix typo in comment. * stdlib/canonicalize.c: Correct bugs in last change. Patch by HJ Lu. * libio/Makefile (routines): Remove ioprims. (aux): Remove cleanup. Add IO_DEBUG option for .o files. * libio/cleanups.c: Removed. * libio/ioprims.c: Removed. * libio/filedoalloc.c: More updates from libg++-2.8b5. * libio/fileops.c: Likewise. * libio/genops.c: Likewise. * libio/iolibio.h: Likewise. * libio/iopopen.c: Likewise. * libio/iovsprintf.c: Likewise. * libio/iovsscanf.c: Likewise. * libio/libio.h: Likewise. * libio/libioP.h: Likewise. * libio/memstream.c: Likewise. * libio/strfile.h: Likewise. * libio/vasprintf.c: Likewise. * libio/vsnprintf.c: Likewise. * libio/stdio.h: Define P_tmpdir only is __USE_SVID. * manual/arith.texi: Change references to ANSI C to ISO C. * manual/conf.texi: Likewise. * manual/creature.texi: Likewise. * manual/ctype.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/intro.texi. Likewise. * manual/io.texi: Likewise. * manual/lang.texi: Likewise. * manual/libc.texinfo: Likewise. * manual/locale.texi: Likewise. * manual/maint.texi: Likewise. * manual/mbyte.texi: Likewise. * manual/memory.texi: Likewise. * manual/process.texi: Likewise. * manual/process.texi: Likewise. * manual/search.texi: Likewise. * manual/setjmp.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/string.texi: Likewise. * manual/time.texi: Likewise. * manual/locale.texi: Remove description of LC_RESPONSE and add LC_MESSAGES. * Makefile (subdirs): Change malloc in $(malloc). * config.make.in: Add variable malloc which is initialized from @malloc@. * configure.in: Add new option --enable-new-malloc to use new malloc. This is the default on Linux. * sysdeps/unix/sysv/linux/configure.in: Define malloc to new-malloc by default. * new-malloc/Makefile: New file. Improved malloc implementation. * new-malloc/malloc.c: Likewise. * new-malloc/malloc.h: Likewise. * new-malloc/mallocbug.c: Likewise. * new-malloc/obstack.c: Likewise. * new-malloc/obstack.h: Likewise. * new-malloc/thread-m.h: Likewise. * time/Makefile: Compile ap.c with NO_MCHECK flag for now. * time/ap.c: Don't call mcheck if NO_MCHECK is defined. * resolv/Makefile: Add rule to rebuiild libresolv.so when libc.so changed. * stdio/feof.c: Update copyright. * stdio/stdio.h: Add field for lock to FILE structure. Add cast to *MAGIC constants to prevent warnings. * stdio-common/bug7.c: Correct test. Stream must not be closed twice. * stdlib/Makefile (routines): Add secure-getenv. * stdlib/secure-getenv.c: New file. __secure_getenv function moved to here from sysdeps/generic/getenv.c. Otherwise an application cannot replace the getenv function in the libc. * sysdeps/generic/getenv.c: Remove __secure_getenv function. * sysdeps/stub/getenv.c: Remove __secure_getenv alias. * sysdeps/mach/libc-lock.h: Define__libc_mutex_lock to __mutex_lock. * sysdeps/posix/fdopen.c: Update copyright. Don't use EXFUN. * time/test-tz.c: Comment fifth test out. PROBLEM. * time/tzset.c: De-ANSI-declfy. (__tzset): Don't increment pointer tz when no DST information is given. Sat Dec 7 23:47:54 1996 Ulrich Drepper <drepper@cygnus.com> * sysdeps/mach/libc-lock.h [_LIBC]: Add definition of __libc_mutex_lock. Patch by Thomas Bushnell. * sysdeps/unix/sysv/linux/timebits.h: Load <asm/param.h> only if __USE_MISC. * sysdeps/unix/sysv/linux/Dist: Add llseek.c. Sat Dec 7 12:18:56 1996 Ulrich Drepper <drepper@cygnus.com> * time/strftime (%c format): Remove %Z from default string. Reported by Paul Eggert * io/getwd.c: Don't apply getcwd on user supplied buffer.
82 files changed, 6247 insertions, 1169 deletions
diff --git a/ChangeLog b/ChangeLog index 573b618221..47494122c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,124 @@ +Sun Dec 8 06:56:49 1996 Ulrich Drepper <drepper@cygnus.com> + + * io/getwd.c: Use PATH_MAX not LOCAL_PATH_MAX. Fix typo in + comment. + * stdlib/canonicalize.c: Correct bugs in last change. + Patch by HJ Lu. + + * libio/Makefile (routines): Remove ioprims. + (aux): Remove cleanup. + Add IO_DEBUG option for .o files. + * libio/cleanups.c: Removed. + * libio/ioprims.c: Removed. + * libio/filedoalloc.c: More updates from libg++-2.8b5. + * libio/fileops.c: Likewise. + * libio/genops.c: Likewise. + * libio/iolibio.h: Likewise. + * libio/iopopen.c: Likewise. + * libio/iovsprintf.c: Likewise. + * libio/iovsscanf.c: Likewise. + * libio/libio.h: Likewise. + * libio/libioP.h: Likewise. + * libio/memstream.c: Likewise. + * libio/strfile.h: Likewise. + * libio/vasprintf.c: Likewise. + * libio/vsnprintf.c: Likewise. + + * libio/stdio.h: Define P_tmpdir only is __USE_SVID. + + * manual/arith.texi: Change references to ANSI C to ISO C. + * manual/conf.texi: Likewise. + * manual/creature.texi: Likewise. + * manual/ctype.texi: Likewise. + * manual/errno.texi: Likewise. + * manual/filesys.texi: Likewise. + * manual/intro.texi. Likewise. + * manual/io.texi: Likewise. + * manual/lang.texi: Likewise. + * manual/libc.texinfo: Likewise. + * manual/locale.texi: Likewise. + * manual/maint.texi: Likewise. + * manual/mbyte.texi: Likewise. + * manual/memory.texi: Likewise. + * manual/process.texi: Likewise. + * manual/process.texi: Likewise. + * manual/search.texi: Likewise. + * manual/setjmp.texi: Likewise. + * manual/signal.texi: Likewise. + * manual/startup.texi: Likewise. + * manual/stdio.texi: Likewise. + * manual/string.texi: Likewise. + * manual/time.texi: Likewise. + + * manual/locale.texi: Remove description of LC_RESPONSE and add + LC_MESSAGES. + + * Makefile (subdirs): Change malloc in $(malloc). + * config.make.in: Add variable malloc which is initialized from + @malloc@. + * configure.in: Add new option --enable-new-malloc to use new + malloc. This is the default on Linux. + * sysdeps/unix/sysv/linux/configure.in: Define malloc to new-malloc + by default. + * new-malloc/Makefile: New file. Improved malloc implementation. + * new-malloc/malloc.c: Likewise. + * new-malloc/malloc.h: Likewise. + * new-malloc/mallocbug.c: Likewise. + * new-malloc/obstack.c: Likewise. + * new-malloc/obstack.h: Likewise. + * new-malloc/thread-m.h: Likewise. + * time/Makefile: Compile ap.c with NO_MCHECK flag for now. + * time/ap.c: Don't call mcheck if NO_MCHECK is defined. + + * resolv/Makefile: Add rule to rebuiild libresolv.so when libc.so + changed. + + * stdio/feof.c: Update copyright. + * stdio/stdio.h: Add field for lock to FILE structure. + Add cast to *MAGIC constants to prevent warnings. + + * stdio-common/bug7.c: Correct test. Stream must not be closed + twice. + + * stdlib/Makefile (routines): Add secure-getenv. + * stdlib/secure-getenv.c: New file. __secure_getenv function + moved to here from sysdeps/generic/getenv.c. Otherwise an + application cannot replace the getenv function in the libc. + * sysdeps/generic/getenv.c: Remove __secure_getenv function. + * sysdeps/stub/getenv.c: Remove __secure_getenv alias. + + * sysdeps/mach/libc-lock.h: Define__libc_mutex_lock to __mutex_lock. + + * sysdeps/posix/fdopen.c: Update copyright. Don't use EXFUN. + + * time/test-tz.c: Comment fifth test out. PROBLEM. + + * time/tzset.c: De-ANSI-declfy. + (__tzset): Don't increment pointer tz when no DST information is + given. + +Sat Dec 7 23:47:54 1996 Ulrich Drepper <drepper@cygnus.com> + + * sysdeps/mach/libc-lock.h [_LIBC]: Add definition of + __libc_mutex_lock. + Patch by Thomas Bushnell. + + * sysdeps/unix/sysv/linux/timebits.h: Load <asm/param.h> only + if __USE_MISC. + + * sysdeps/unix/sysv/linux/Dist: Add llseek.c. + +Sat Dec 7 12:18:56 1996 Ulrich Drepper <drepper@cygnus.com> + + * time/strftime (%c format): Remove %Z from default string. + Reported by Paul Eggert + Sat Dec 7 03:24:36 1996 Ulrich Drepper <drepper@cygnus.com> * configure.in: Discard error message from test in test for bash-2.0. - * io/getpw.c: Don't apply getcwd on user supplied buffer. + * io/getwd.c: Don't apply getcwd on user supplied buffer. Instead always use temporary buffer and only copy the result. Patch by HJ Lu. * stdlib/canonicalize.c: Likewise. diff --git a/Makefile b/Makefile index cd253734a6..7ebd3b7bd1 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ endif # These are the subdirectories containing the library source. subdirs = csu assert ctype db locale intl catgets math setjmp signal stdlib \ - stdio-common $(stdio) malloc string wcsmbs time dirent grp pwd\ + stdio-common $(stdio) $(malloc) string wcsmbs time dirent grp pwd \ posix io termios resource misc login socket sysvipc gmon gnulib \ wctype manual shadow crypt $(sysdep-subdirs) nss elf po $(add-ons) export subdirs := $(subdirs) # Benign, useless in GNU make before 3.63. diff --git a/config.make.in b/config.make.in index f4c70caead..401289270b 100644 --- a/config.make.in +++ b/config.make.in @@ -31,6 +31,7 @@ build-shared = @shared@ build-profile = @profile@ build-omitfp = @omitfp@ stdio = @stdio@ +malloc = @malloc@ add-ons = @subdirs@ # Build tools. diff --git a/configure b/configure index ea10dce407..67948b6516 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # From configure.in CVSid # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.11.2 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -29,6 +29,9 @@ ac_help="$ac_help ac_help="$ac_help --enable-libio build in GNU libio instead of GNU stdio" ac_help="$ac_help + --enable-new-malloc use the new malloc implementation. This is the + default for Linux, others use the old malloc." +ac_help="$ac_help --disable-sanity-checks really do not use threads (should not be used except in special situations) [default=yes]" ac_help="$ac_help @@ -360,7 +363,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.11.2" + echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) @@ -643,6 +646,19 @@ else fi +# Check whether --enable-new-malloc or --disable-new-malloc was given. +if test "${enable_new_malloc+set}" = set; then + enableval="$enable_new_malloc" + if test $enableval = yes; then + malloc=new-malloc + else + malloc=malloc + fi +else + malloc=default +fi + + # Check whether --enable-sanity-checks or --disable-sanity-checks was given. if test "${enable_sanity_checks+set}" = set; then enableval="$enable_sanity_checks" @@ -720,7 +736,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:724: checking host system type" >&5 +echo "configure:740: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -800,7 +816,7 @@ esac # This can take a while to compute. sysdep_dir=$srcdir/sysdeps echo $ac_n "checking sysdep dirs""... $ac_c" 1>&6 -echo "configure:804: checking sysdep dirs" >&5 +echo "configure:820: checking sysdep dirs" >&5 # Make sco3.2v4 become sco3.2.4 and sunos4.1.1_U1 become sunos4.1.1.U1. os="`echo $os | sed 's/\([0-9A-Z]\)[v_]\([0-9A-Z]\)/\1.\2/g'`" @@ -1001,7 +1017,7 @@ echo "$ac_t""sysdeps/generic sysdeps/stub" 1>&6 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1005: checking for a BSD compatible install" >&5 +echo "configure:1021: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1055,7 +1071,7 @@ if test "$INSTALL" = "${srcdir}/install-sh -c"; then INSTALL='$(..)./install-sh -c' fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1059: checking whether ln -s works" >&5 +echo "configure:1075: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1080,7 +1096,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1084: checking for $ac_word" >&5 +echo "configure:1100: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1111,7 +1127,7 @@ test -n "$MSGFMT" || MSGFMT=":" echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1115: checking build system type" >&5 +echo "configure:1131: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1137,7 +1153,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1141: checking for $ac_word" >&5 +echo "configure:1157: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1169,7 +1185,7 @@ if test $host != $build; then # Extract the first word of "gcc cc", so it can be a program name with args. set dummy gcc cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1173: checking for $ac_word" >&5 +echo "configure:1189: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1196,7 +1212,7 @@ fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1200: checking how to run the C preprocessor" >&5 +echo "configure:1216: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1211,13 +1227,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1215 "configure" +#line 1231 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1228,13 +1244,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1232 "configure" +#line 1248 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1254: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1259,7 +1275,7 @@ echo "$ac_t""$CPP" 1>&6 # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1263: checking for $ac_word" >&5 +echo "configure:1279: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1290,7 +1306,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1294: checking for $ac_word" >&5 +echo "configure:1310: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1321,7 +1337,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1325: checking for $ac_word" >&5 +echo "configure:1341: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1356,7 +1372,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1360: checking for $ac_word" >&5 +echo "configure:1376: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1394,7 +1410,7 @@ fi echo $ac_n "checking for signed size_t type""... $ac_c" 1>&6 -echo "configure:1398: checking for signed size_t type" >&5 +echo "configure:1414: checking for signed size_t type" >&5 if eval "test \"`echo '$''{'libc_cv_signed_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1418,12 +1434,12 @@ EOF fi echo $ac_n "checking for libc-friendly stddef.h""... $ac_c" 1>&6 -echo "configure:1422: checking for libc-friendly stddef.h" >&5 +echo "configure:1438: checking for libc-friendly stddef.h" >&5 if eval "test \"`echo '$''{'libc_cv_friendly_stddef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1427 "configure" +#line 1443 "configure" #include "confdefs.h" #define __need_size_t #define __need_wchar_t @@ -1438,7 +1454,7 @@ size_t size; wchar_t wchar; if (&size == NULL || &wchar == NULL) abort (); ; return 0; } EOF -if { (eval echo configure:1442: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_friendly_stddef=yes else @@ -1457,7 +1473,7 @@ override stddef.h = # The installed <stddef.h> seems to be libc-friendly." fi echo $ac_n "checking whether we need to use -P to assemble .S files""... $ac_c" 1>&6 -echo "configure:1461: checking whether we need to use -P to assemble .S files" >&5 +echo "configure:1477: checking whether we need to use -P to assemble .S files" >&5 if eval "test \"`echo '$''{'libc_cv_need_minus_P'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1480,7 +1496,7 @@ asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives." fi echo $ac_n "checking for assembler global-symbol directive""... $ac_c" 1>&6 -echo "configure:1484: checking for assembler global-symbol directive" >&5 +echo "configure:1500: checking for assembler global-symbol directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_global_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1510,7 +1526,7 @@ EOF fi echo $ac_n "checking for .set assembler directive""... $ac_c" 1>&6 -echo "configure:1514: checking for .set assembler directive" >&5 +echo "configure:1530: checking for .set assembler directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_set_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1545,12 +1561,12 @@ fi if test $elf != yes; then echo $ac_n "checking for .init and .fini sections""... $ac_c" 1>&6 -echo "configure:1549: checking for .init and .fini sections" >&5 +echo "configure:1565: checking for .init and .fini sections" >&5 if eval "test \"`echo '$''{'libc_cv_have_initfini'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1554 "configure" +#line 1570 "configure" #include "confdefs.h" int main() { @@ -1559,7 +1575,7 @@ asm (".section .init"); asm (".text"); ; return 0; } EOF -if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_have_initfini=yes else @@ -1584,19 +1600,19 @@ if test $elf = yes; then libc_cv_asm_underscores=no else echo $ac_n "checking for _ prefix on C symbol names""... $ac_c" 1>&6 -echo "configure:1588: checking for _ prefix on C symbol names" >&5 +echo "configure:1604: checking for _ prefix on C symbol names" >&5 if eval "test \"`echo '$''{'libc_cv_asm_underscores'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1593 "configure" +#line 1609 "configure" #include "confdefs.h" asm ("_glibc_foobar:"); int main() { glibc_foobar (); ; return 0; } EOF -if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* libc_cv_asm_underscores=yes else @@ -1623,7 +1639,7 @@ if test $elf = yes; then libc_cv_asm_weakext_directive=no else echo $ac_n "checking for assembler .weak directive""... $ac_c" 1>&6 -echo "configure:1627: checking for assembler .weak directive" >&5 +echo "configure:1643: checking for assembler .weak directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weak_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1646,7 +1662,7 @@ echo "$ac_t""$libc_cv_asm_weak_directive" 1>&6 if test $libc_cv_asm_weak_directive = no; then echo $ac_n "checking for assembler .weakext directive""... $ac_c" 1>&6 -echo "configure:1650: checking for assembler .weakext directive" >&5 +echo "configure:1666: checking for assembler .weakext directive" >&5 if eval "test \"`echo '$''{'libc_cv_asm_weakext_directive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1683,7 +1699,7 @@ EOF fi echo $ac_n "checking for ld --no-whole-archive""... $ac_c" 1>&6 -echo "configure:1687: checking for ld --no-whole-archive" >&5 +echo "configure:1703: checking for ld --no-whole-archive" >&5 if eval "test \"`echo '$''{'libc_cv_ld_no_whole_archive'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1694,7 +1710,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -Wl,--no-whole-archive - -o conftest conftest.c'; { (eval echo configure:1698: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_ld_no_whole_archive=yes else libc_cv_ld_no_whole_archive=no @@ -1705,7 +1721,7 @@ fi echo "$ac_t""$libc_cv_ld_no_whole_archive" 1>&6 echo $ac_n "checking for gcc -fno-exceptions""... $ac_c" 1>&6 -echo "configure:1709: checking for gcc -fno-exceptions" >&5 +echo "configure:1725: checking for gcc -fno-exceptions" >&5 if eval "test \"`echo '$''{'libc_cv_gcc_no_exceptions'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1716,7 +1732,7 @@ __throw () {} EOF if { ac_try='${CC-cc} $CFLAGS -nostdlib -nostartfiles -fno-exceptions - -o conftest conftest.c'; { (eval echo configure:1720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + -o conftest conftest.c'; { (eval echo configure:1736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then libc_cv_gcc_no_exceptions=yes else libc_cv_gcc_no_exceptions=no @@ -1768,7 +1784,7 @@ if test "$uname" = generic; then fi echo $ac_n "checking OS release for uname""... $ac_c" 1>&6 -echo "configure:1772: checking OS release for uname" >&5 +echo "configure:1788: checking OS release for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_release'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1790,7 +1806,7 @@ echo "$ac_t""$libc_cv_uname_release" 1>&6 uname_release="$libc_cv_uname_release" echo $ac_n "checking OS version for uname""... $ac_c" 1>&6 -echo "configure:1794: checking OS version for uname" >&5 +echo "configure:1810: checking OS version for uname" >&5 if eval "test \"`echo '$''{'libc_cv_uname_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1812,7 +1828,7 @@ else fi echo $ac_n "checking stdio selection""... $ac_c" 1>&6 -echo "configure:1816: checking stdio selection" >&5 +echo "configure:1832: checking stdio selection" >&5 case $stdio in libio) cat >> confdefs.h <<\EOF @@ -1823,6 +1839,13 @@ default) stdio=stdio ;; esac echo "$ac_t""$stdio" 1>&6 +echo $ac_n "checking malloc selection""... $ac_c" 1>&6 +echo "configure:1844: checking malloc selection" >&5 + +test $malloc = default && malloc=malloc +echo "$ac_t""$malloc" 1>&6 + + @@ -1850,6 +1873,10 @@ fi if test $shared = default; then if test $gnu_ld = yes; then shared=$elf + else + # For now we do not assume shared libs are available. In future more + # tests might become available. + shared=no fi fi @@ -1953,7 +1980,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.11.2" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -2025,6 +2052,7 @@ s%@uname_sysname@%$uname_sysname%g s%@uname_release@%$uname_release%g s%@uname_version@%$uname_version%g s%@stdio@%$stdio%g +s%@malloc@%$malloc%g s%@libc_cv_slibdir@%$libc_cv_slibdir%g s%@libc_cv_sysconfdir@%$libc_cv_sysconfdir%g s%@gnu_ld@%$gnu_ld%g diff --git a/configure.in b/configure.in index 3a4d200e71..70d62b41c0 100644 --- a/configure.in +++ b/configure.in @@ -59,6 +59,16 @@ AC_ARG_ENABLE(libio, dnl fi], stdio=default) +AC_ARG_ENABLE(new-malloc, dnl +[ --enable-new-malloc use the new malloc implementation. This is the + default for Linux, others use the old malloc.], + [if test $enableval = yes; then + malloc=new-malloc + else + malloc=malloc + fi], + malloc=default) + AC_ARG_ENABLE(sanity-checks, dnl [ --disable-sanity-checks really do not use threads (should not be used except in special situations) [default=yes]], @@ -677,6 +687,12 @@ default) stdio=stdio ;; esac AC_MSG_RESULT($stdio) +AC_MSG_CHECKING(malloc selection) +AC_SUBST(malloc) +test $malloc = default && malloc=malloc +AC_MSG_RESULT($malloc) + + AC_SUBST(libc_cv_slibdir) AC_SUBST(libc_cv_sysconfdir) @@ -695,6 +711,10 @@ AC_SUBST(shared) if test $shared = default; then if test $gnu_ld = yes; then shared=$elf + else + # For now we do not assume shared libs are available. In future more + # tests might become available. + shared=no fi fi AC_SUBST(profile) diff --git a/io/getwd.c b/io/getwd.c index 510a681d78..506aac8472 100644 --- a/io/getwd.c +++ b/io/getwd.c @@ -38,10 +38,10 @@ getwd (buf) return NULL; } - if (getcwd (tmpbuf, LOCAL_PATH_MAX) == NULL) + if (getcwd (tmpbuf, PATH_MAX) == NULL) { /* We use 1024 here since it should really be enough and because - this is a save value. */ + this is a safe value. */ __strerror_r (errno, buf, 1024); return NULL; } diff --git a/libio/Makefile b/libio/Makefile index 4266ad4e59..53a1d7d843 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -12,9 +12,9 @@ # Library General Public License for more details. # You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., 675 Mass Ave, -# Cambridge, MA 02139, USA. +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Specific makefile for libio. @@ -26,7 +26,7 @@ headers := stdio.h libio.h _G_config.h routines := \ filedoalloc iofclose iofdopen iofflush iofgetpos iofgets iofopen \ iofopncook iofprintf iofputs iofread iofsetpos ioftell \ - iofwrite iogetdelim iogetline iogets iopadn iopopen ioprims ioputs \ + iofwrite iogetdelim iogetline iogets iopadn iopopen ioputs \ ioseekoff ioseekpos iosetbuffer iosetvbuf iosprintf ioungetc \ iovsprintf iovsscanf \ \ @@ -40,6 +40,8 @@ all: # Make this the default target; it will be defined in Rules. include ../Makeconfig +CPPFLAGS-.o += -DIO_DEBUG + ifneq (,$(filter %REENTRANT, $(defines))) routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \ iofflush_u putc_u putchar_u peekc @@ -48,7 +50,7 @@ CPPFLAGS += -D_IO_MTSAFE_IO endif aux := \ - cleanup fileops genops stdfiles stdio strops + fileops genops stdfiles stdio strops distribute := iolibio.h libioP.h strfile.h Banner diff --git a/libio/filedoalloc.c b/libio/filedoalloc.c index 045bff697d..eee489b825 100644 --- a/libio/filedoalloc.c +++ b/libio/filedoalloc.c @@ -71,12 +71,14 @@ DEFUN(_IO_file_doallocate, (fp), register char *p; struct stat st; +#ifndef _LIBC /* If _IO_cleanup_registration_needed is non-zero, we should call the function it points to. This is to make sure _IO_cleanup gets called on exit. We call it from _IO_file_doallocate, since that is likely to get called by any program that does buffered I/O. */ if (_IO_cleanup_registration_needed) (*_IO_cleanup_registration_needed)(); +#endif if (fp->_fileno < 0 || _IO_SYSSTAT (fp, &st) < 0) { diff --git a/libio/fileops.c b/libio/fileops.c index d3f4831e2d..ce0e2bb524 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -47,7 +47,6 @@ extern int errno; The position in the buffer that corresponds to the position in external file system is normally _IO_read_end, except in putback mode, when it is _IO_save_end. - when it is _IO_save_end. If the field _fb._offset is >= 0, it gives the offset in the file as a whole corresponding to eGptr(). (?) @@ -185,7 +184,7 @@ DEFUN(_IO_file_fopen, (fp, filename, mode), _IO_mask_flags(fp, read_write,_IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); if (read_write & _IO_IS_APPENDING) if (_IO_SEEKOFF (fp, (_IO_off_t)0, _IO_seek_end, _IOS_INPUT|_IOS_OUTPUT) - == _IO_pos_BAD) + == _IO_pos_BAD && errno != ESPIPE) return NULL; _IO_link_in(fp); return fp; @@ -200,7 +199,12 @@ DEFUN(_IO_file_attach, (fp, fd), fp->_fileno = fd; fp->_flags &= ~(_IO_NO_READS+_IO_NO_WRITES); fp->_flags |= _IO_DELETE_DONT_CLOSE; + /* Get the current position of the file. */ + /* We have to do that since that may be junk. */ fp->_offset = _IO_pos_BAD; + if (_IO_SEEKOFF (fp, (_IO_off_t)0, _IO_seek_cur, _IOS_INPUT|_IOS_OUTPUT) + == _IO_pos_BAD && errno != ESPIPE) + return NULL; return fp; } diff --git a/libio/genops.c b/libio/genops.c index fc4c61d9a4..3a58cd2eaf 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -861,3 +861,7 @@ __io_defs io_defs__; #ifdef weak_alias weak_alias (_IO_cleanup, _cleanup) #endif + +#ifdef text_set_element +text_set_element(__libc_atexit, _cleanup); +#endif diff --git a/libio/iolibio.h b/libio/iolibio.h index 92df6a6fd2..ca863b51b3 100644 --- a/libio/iolibio.h +++ b/libio/iolibio.h @@ -56,3 +56,22 @@ extern _IO_FILE* _IO_popen __P((const char*, const char*)); #ifdef __cplusplus } #endif + +#define _IO_open __open +#define _IO_close __close +#define _IO_fork __fork +#define _IO_fcntl __fcntl +#define _IO__exit _exit +#define _IO_read __read +#define _IO_write __write +#define _IO_lseek __lseek +#define _IO_getdtablesize __getdtablesize +#define _IO_pipe __pipe +#define _IO_dup2 __dup2 +#define _IO_execl execl +#define _IO_waitpid __waitpid +#define _IO_stat __stat +#define _IO_getpid __getpid +#define _IO_geteuid __geteuid +#define _IO_getegid __getegid +#define _IO_fstat __fstat diff --git a/libio/iopopen.c b/libio/iopopen.c index dc1e74d3eb..5703c99d47 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -123,7 +123,7 @@ DEFUN(_IO_proc_open, (fp, command, mode), proc_file_chain = proc_file_chain->next; } - _IO_execl("/bin/sh", "sh", "-c", command, NULL); + _IO_execl("/bin/sh", "sh", "-c", command, (char *) 0); _IO__exit(127); } _IO_close(child_end); diff --git a/libio/iovsprintf.c b/libio/iovsprintf.c index b2e8b67a96..f0c9889724 100644 --- a/libio/iovsprintf.c +++ b/libio/iovsprintf.c @@ -38,7 +38,7 @@ _IO_vsprintf (string, format, args) int ret; #ifdef _IO_MTSAFE_IO - sf._f._lock = &lock; + sf._sbf._f._lock = &lock; #endif _IO_init ((_IO_FILE *) &sf, 0); _IO_JUMPS ((_IO_FILE *) &sf) = &_IO_str_jumps; diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c index 6e7d8c59e2..473b714f21 100644 --- a/libio/iovsscanf.c +++ b/libio/iovsscanf.c @@ -32,7 +32,7 @@ DEFUN(_IO_vsscanf, (string, format, args), _IO_strfile sf; #ifdef _IO_MTSAFE_IO _IO_lock_t lock; - sf._f._lock = &lock; + sf._sbf._f._lock = &lock; #endif _IO_init((_IO_FILE*)&sf, 0); _IO_JUMPS((_IO_FILE*)&sf) = &_IO_str_jumps; diff --git a/libio/libio.h b/libio/libio.h index 7dd47db9fa..acc34c0d7a 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -52,11 +52,15 @@ the executable file might be covered by the GNU General Public License. */ #endif #ifndef __P +#if _G_HAVE_SYS_CDEFS +#include <sys/cdefs.h> +#else #ifdef __STDC__ #define __P(protos) protos #else #define __P(protos) () #endif +#endif #endif /*!__P*/ /* For backward compatibility */ @@ -79,12 +83,16 @@ the executable file might be covered by the GNU General Public License. */ #define EOF (-1) #endif #ifndef NULL -#if !defined(__cplusplus) || defined(__GNUC__) +#ifdef __GNUG__ +#define NULL (__null) +#else +#if !defined(__cplusplus) #define NULL ((void*)0) #else #define NULL (0) #endif #endif +#endif #define _IOS_INPUT 1 #define _IOS_OUTPUT 2 @@ -183,6 +191,7 @@ struct _IO_FILE { #define _IO_file_flags _flags /* The following pointers correspond to the C++ streambuf protocol. */ + /* Note: Tk uses the _IO_read_ptr and _IO_read_end fields directly. */ char* _IO_read_ptr; /* Current read pointer */ char* _IO_read_end; /* End of get area. */ char* _IO_read_base; /* Start of putback+get area. */ @@ -200,10 +209,6 @@ struct _IO_FILE { struct _IO_FILE *_chain; -#if !_IO_UNIFIED_JUMPTABLES - struct _IO_jump_t *_jumps; /* Jump table */ -#endif - int _fileno; int _blksize; _IO_off_t _offset; diff --git a/libio/libioP.h b/libio/libioP.h index d3c871fbeb..008f9b7edf 100644 --- a/libio/libioP.h +++ b/libio/libioP.h @@ -57,71 +57,180 @@ extern "C" { #define _IO_seek_cur 1 #define _IO_seek_end 2 -typedef int (*_IO_overflow_t) __P((_IO_FILE*, int)); -typedef int (*_IO_underflow_t) __P((_IO_FILE*)); -typedef _IO_size_t (*_IO_xsputn_t) __P((_IO_FILE*,const void*,_IO_size_t)); -typedef _IO_size_t (*_IO_xsgetn_t) __P((_IO_FILE*, void*, _IO_size_t)); -typedef _IO_ssize_t (*_IO_read_t) __P((_IO_FILE*, void*, _IO_ssize_t)); -typedef _IO_ssize_t (*_IO_write_t) __P((_IO_FILE*,const void*,_IO_ssize_t)); -typedef int (*_IO_stat_t) __P((_IO_FILE*, void*)); -typedef _IO_fpos_t (*_IO_seek_t) __P((_IO_FILE*, _IO_off_t, int)); -typedef int (*_IO_doallocate_t) __P((_IO_FILE*)); -typedef int (*_IO_pbackfail_t) __P((_IO_FILE*, int)); -typedef _IO_FILE* (*_IO_setbuf_t) __P((_IO_FILE*, char *, _IO_ssize_t)); -typedef int (*_IO_sync_t) __P((_IO_FILE*)); -typedef void (*_IO_finish_t) __P((_IO_FILE*)); /* finalize */ -typedef int (*_IO_close_t) __P((_IO_FILE*)); /* finalize */ -typedef _IO_fpos_t (*_IO_seekoff_t) __P((_IO_FILE*, _IO_off_t, int, int)); - -/* The _IO_seek_cur and _IO_seek_end options are not allowed. */ -typedef _IO_fpos_t (*_IO_seekpos_t) __P((_IO_FILE*, _IO_fpos_t, int)); +/* THE JUMPTABLE FUNCTIONS. + + * The _IO_FILE type is used to implement the FILE type in GNU libc, + * as well as the streambuf class in GNU iostreams for C++. + * These are all the same, just used differently. + * An _IO_FILE (or FILE) object is allows followed by a pointer to + * a jump table (of pointers to functions). The pointer is accessed + * with the _IO_JUMPS macro. The jump table has a eccentric format, + * so as to be compatible with the layout of a C++ virtual function table. + * (as implemented by g++). When a pointer to a steambuf object is + * coerced to an (_IO_FILE*), then _IO_JUMPS on the result just + * happens to point to the virtual function table of the streambuf. + * Thus the _IO_JUMPS function table used for C stdio/libio does + * double duty as the virtual functiuon table for C++ streambuf. + * + * The entries in the _IO_JUMPS function table (and hence also the + * virtual functions of a streambuf) are described below. + * The first parameter of each function entry is the _IO_FILE/streambuf + * object being acted on (i.e. the 'this' parameter). + */ -#if !_IO_UNIFIED_JUMPTABLES -#define _IO_JUMPS(THIS) (THIS)->_jumps -#else #define _IO_JUMPS(THIS) ((struct _IO_FILE_plus*)(THIS))->vtable -#endif - -#if !_IO_UNIFIED_JUMPTABLES +#ifdef _G_USING_THUNKS #define JUMP_FIELD(TYPE, NAME) TYPE NAME #define JUMP0(FUNC, THIS) _IO_JUMPS(THIS)->FUNC(THIS) #define JUMP1(FUNC, THIS, X1) _IO_JUMPS(THIS)->FUNC(THIS, X1) #define JUMP2(FUNC, THIS, X1, X2) _IO_JUMPS(THIS)->FUNC(THIS, X1, X2) -#define JUMP3(FUNC, THIS, X1, X2, X3) _IO_JUMPS(THIS)->FUNC(THIS, X1, X2, X3) +#define JUMP3(FUNC, THIS, X1,X2,X3) _IO_JUMPS(THIS)->FUNC(THIS, X1,X2, X3) #define JUMP_INIT(NAME, VALUE) VALUE +#define JUMP_INIT_DUMMY JUMP_INIT(dummy, 0), JUMP_INIT(dummy2, 0) #else +/* These macros will change when we re-implement vtables to use "thunks"! */ #define JUMP_FIELD(TYPE, NAME) struct { short delta1, delta2; TYPE pfn; } NAME #define JUMP0(FUNC, THIS) _IO_JUMPS(THIS)->FUNC.pfn(THIS) #define JUMP1(FUNC, THIS, X1) _IO_JUMPS(THIS)->FUNC.pfn(THIS, X1) #define JUMP2(FUNC, THIS, X1, X2) _IO_JUMPS(THIS)->FUNC.pfn(THIS, X1, X2) #define JUMP3(FUNC, THIS, X1,X2,X3) _IO_JUMPS(THIS)->FUNC.pfn(THIS, X1,X2, X3) #define JUMP_INIT(NAME, VALUE) {0, 0, VALUE} -#endif #define JUMP_INIT_DUMMY JUMP_INIT(dummy, 0) +#endif +/* The 'finish' function does any final cleaning up of an _IO_FILE object. + It does not delete (free) it, but does everything else to finalize it/ + It matches the streambuf::~streambuf virtual destructor. */ +typedef void (*_IO_finish_t) __P((_IO_FILE*)); /* finalize */ #define _IO_FINISH(FP) JUMP0(__finish, FP) + +/* The 'overflow' hook flushes the buffer. + The second argument is a character, or EOF. + It matches the streambuf::overflow virtual function. */ +typedef int (*_IO_overflow_t) __P((_IO_FILE*, int)); #define _IO_OVERFLOW(FP, CH) JUMP1(__overflow, FP, CH) + +/* The 'underflow' hook tries to fills the get buffer. + It returns the next character (as an unsigned char) or EOF. The next + character remains in the get buffer, and the get postion is not changed. + It matches the streambuf::underflow virtual function. */ +typedef int (*_IO_underflow_t) __P((_IO_FILE*)); #define _IO_UNDERFLOW(FP) JUMP0(__underflow, FP) + +/* The 'uflow' hook returns the next character in the input stream + (cast to unsigned char), and increments the read position; + EOF is returned on failure. + It matches the streambuf::uflow virtual function, which is not in the + cfront implementation, but was added to C++ by the ANSI/ISO committee. */ #define _IO_UFLOW(FP) JUMP0(__uflow, FP) + +/* The 'pbackfail' hook handles backing up. + It matches the streambuf::pbackfail virtual function. */ +typedef int (*_IO_pbackfail_t) __P((_IO_FILE*, int)); #define _IO_PBACKFAIL(FP, CH) JUMP1(__pbackfail, FP, CH) + +/* The 'xsputn' hook writes upto N characters from buffer DATA. + Returns the number of character actually written. + It matches the streambuf::xsputn virtual function. */ +typedef _IO_size_t (*_IO_xsputn_t) + __P((_IO_FILE *FP, const void *DATA, _IO_size_t N)); #define _IO_XSPUTN(FP, DATA, N) JUMP2(__xsputn, FP, DATA, N) + +/* The 'xsgetn' hook reads upto N characters into buffer DATA. + Returns the number of character actually read. + It matches the streambuf::xsgetn virtual function. */ +typedef _IO_size_t (*_IO_xsgetn_t) __P((_IO_FILE*FP, void*DATA, _IO_size_t N)); #define _IO_XSGETN(FP, DATA, N) JUMP2(__xsgetn, FP, DATA, N) + +/* The 'seekoff' hook moves the stream position to a new position + relative to the start of the file (if DIR==0), the current position + (MODE==1), or the end of the file (MODE==2). + It matches the streambuf::seekoff virtual function. + It is also used for the ANSI fseek function. */ +typedef _IO_fpos_t (*_IO_seekoff_t) + __P((_IO_FILE* FP, _IO_off_t OFF, int DIR, int MODE)); #define _IO_SEEKOFF(FP, OFF, DIR, MODE) JUMP3(__seekoff, FP, OFF, DIR, MODE) + +/* The 'seekpos' hook also moves the stream position, + but to an absolute position given by a fpos_t (seekpos). + It matches the streambuf::seekpos virtual function. + It is also used for the ANSI fgetpos and fsetpos functions. */ +/* The _IO_seek_cur and _IO_seek_end options are not allowed. */ +typedef _IO_fpos_t (*_IO_seekpos_t) __P((_IO_FILE*, _IO_fpos_t, int)); #define _IO_SEEKPOS(FP, POS, FLAGS) JUMP2(__seekpos, FP, POS, FLAGS) + +/* The 'setbuf' hook gives a buffer to the file. + It matches the streambuf::setbuf virtual function. */ +typedef _IO_FILE* (*_IO_setbuf_t) __P((_IO_FILE*, char *, _IO_ssize_t)); #define _IO_SETBUF(FP, BUFFER, LENGTH) JUMP2(__setbuf, FP, BUFFER, LENGTH) + +/* The 'sync' hook attempts to synchronize the internal data structures + of the file with the external state. + It matches the streambuf::sync virtual function. */ +typedef int (*_IO_sync_t) __P((_IO_FILE*)); #define _IO_SYNC(FP) JUMP0(__sync, FP) + +/* The 'doallocate' hook is used to tell the file to allocate a buffer. + It matches the streambuf::doallocate virtual function, which is not + in the ANSI/ISO C++ standard, but is part traditional implementations. */ +typedef int (*_IO_doallocate_t) __P((_IO_FILE*)); #define _IO_DOALLOCATE(FP) JUMP0(__doallocate, FP) + +/* The following four hooks (sysread, syswrite, sysclose, sysseek, and + sysstat) are low-level hooks specific to this implementation. + There is no correspondance in the ANSI/ISO C++ standard library. + The hooks basically correspond to the Unix system functions + (read, write, close, lseek, and stat) except that a _IO_FILE* + parameter is used instead of a integer file descriptor; the default + implementation used for normal files just calls those functions. + The advantage of overriding these functions instead of the higher-level + ones (underflow, overflow etc) is that you can leave all the buffering + higher-level functions. */ + +/* The 'sysread' hook is used to read data from the external file into + an existing buffer. It generalizes the Unix read(2) function. + It matches the streambuf::sys_read virtual function, which is + specific to this implementaion. */ +typedef _IO_ssize_t (*_IO_read_t) __P((_IO_FILE*, void*, _IO_ssize_t)); #define _IO_SYSREAD(FP, DATA, LEN) JUMP2(__read, FP, DATA, LEN) + +/* The 'syswrite' hook is used to write data from an existing buffer + to an external file. It generalizes the Unix write(2) function. + It matches the streambuf::sys_write virtual function, which is + specific to this implementaion. */ +typedef _IO_ssize_t (*_IO_write_t) __P((_IO_FILE*,const void*,_IO_ssize_t)); #define _IO_SYSWRITE(FP, DATA, LEN) JUMP2(__write, FP, DATA, LEN) + +/* The 'sysseek' hook is used to re-position an external file. + It generalizes the Unix lseek(2) function. + It matches the streambuf::sys_seek virtual function, which is + specific to this implementaion. */ +typedef _IO_fpos_t (*_IO_seek_t) __P((_IO_FILE*, _IO_off_t, int)); #define _IO_SYSSEEK(FP, OFFSET, MODE) JUMP2(__seek, FP, OFFSET, MODE) + +/* The 'sysclose' hook is used to finalize (close, finish up) an + external file. It generalizes the Unix close(2) function. + It matches the streambuf::sys_close virtual function, which is + specific to this implementation. */ +typedef int (*_IO_close_t) __P((_IO_FILE*)); /* finalize */ #define _IO_SYSCLOSE(FP) JUMP0(__close, FP) + +/* The 'sysstat' hook is used to get information about an external file + into a struct stat buffer. It generalizes the Unix fstat(2) call. + It matches the streambuf::sys_stat virtual function, which is + specific to this implementaion. */ +typedef int (*_IO_stat_t) __P((_IO_FILE*, void*)); #define _IO_SYSSTAT(FP, BUF) JUMP1(__stat, FP, BUF) + #define _IO_CHAR_TYPE char /* unsigned char ? */ #define _IO_INT_TYPE int struct _IO_jump_t { JUMP_FIELD(_G_size_t, __dummy); +#ifdef _G_USING_THUNKS + JUMP_FIELD(_G_size_t, __dummy2); +#endif JUMP_FIELD(_IO_finish_t, __finish); JUMP_FIELD(_IO_overflow_t, __overflow); JUMP_FIELD(_IO_underflow_t, __underflow); @@ -147,16 +256,13 @@ struct _IO_jump_t { }; /* We always allocate an extra word following an _IO_FILE. + This contains a pointer to the function jump table used. This is for compatibility with C++ streambuf; the word can be used to smash to a pointer to a virtual function table. */ struct _IO_FILE_plus { _IO_FILE file; -#if _IO_UNIFIED_JUMPTABLES const struct _IO_jump_t *vtable; -#else - const void *vtable; -#endif }; /* Generic functions */ @@ -225,7 +331,7 @@ extern void _IO_flush_all_linebuffered __P((void)); #define _IO_have_backup(fp) ((fp)->_IO_save_base != NULL) #define _IO_in_backup(fp) ((fp)->_flags & _IO_IN_BACKUP) #define _IO_have_markers(fp) ((fp)->_markers != NULL) -#define _IO_blen(p) ((fp)->_IO_buf_end - (fp)->_IO_buf_base) +#define _IO_blen(fp) ((fp)->_IO_buf_end - (fp)->_IO_buf_base) /* Jumptable functions for files. */ @@ -290,12 +396,16 @@ extern void (*_IO_cleanup_registration_needed) __P ((void)); #define EOF (-1) #endif #ifndef NULL -#if !defined(__cplusplus) || defined(__GNUC__) +#ifdef __GNUG__ +#define NULL (__null) +#else +#if !defined(__cplusplus) #define NULL ((void*)0) #else #define NULL (0) #endif #endif +#endif #define FREE_BUF(_B) free(_B) #define ALLOC_BUF(_S) (char*)malloc(_S) @@ -337,22 +447,17 @@ extern int _IO_vscanf __P((const char *, _IO_va_list)); } #endif -#if _IO_UNIFIED_JUMPTABLES -#define _IO_FJUMP /* nothing */ -#else -#define _IO_FJUMP &_IO_file_jumps, -#endif #ifdef _IO_MTSAFE_IO /* check following! */ #define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, _IO_FJUMP FD, \ + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD, \ 0, 0, 0, 0, { 0 }, &_IO_stdfile_##FD##_lock } #else /* check following! */ #define FILEBUF_LITERAL(CHAIN, FLAGS, FD) \ { _IO_MAGIC+_IO_LINKED+_IO_IS_FILEBUF+FLAGS, \ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, _IO_FJUMP FD } + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, CHAIN, FD } #endif /* VTABLE_LABEL defines NAME as of the CLASS class. @@ -402,7 +507,7 @@ extern struct _IO_fake_stdiobuf _IO_stdin_buf, _IO_stdout_buf, _IO_stderr_buf; #define MAYBE_SET_EINVAL /* nothing */ #endif -#ifdef DEBUG +#ifdef IO_DEBUG #define CHECK_FILE(FILE,RET) \ if ((FILE) == NULL) { MAYBE_SET_EINVAL; return RET; } \ else { COERCE_FILE(FILE); \ diff --git a/libio/memstream.c b/libio/memstream.c index 8f9c8ac92c..ddcce676cb 100644 --- a/libio/memstream.c +++ b/libio/memstream.c @@ -77,21 +77,21 @@ open_memstream (bufloc, sizeloc) if (new_f == NULL) return NULL; #ifdef _IO_MTSAFE_IO - new_f->fp._sf._f._lock = &new_f->lock; + new_f->fp._sf._sbf._f._lock = &new_f->lock; #endif buf = ALLOC_BUF (_IO_BUFSIZ); - _IO_init (&new_f->fp._sf._f, 0); - _IO_JUMPS (&new_f->fp._sf._f) = &_IO_mem_jumps; - _IO_str_init_static (&new_f->fp._sf._f, buf, _IO_BUFSIZ, buf); - new_f->fp._sf._f._flags &= ~_IO_USER_BUF; + _IO_init (&new_f->fp._sf._sbf._f, 0); + _IO_JUMPS (&new_f->fp._sf._sbf._f) = &_IO_mem_jumps; + _IO_str_init_static (&new_f->fp._sf._sbf._f, buf, _IO_BUFSIZ, buf); + new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF; new_f->fp._sf._s._allocate_buffer = (_IO_alloc_type) malloc; new_f->fp._sf._s._free_buffer = (_IO_free_type) free; new_f->fp.bufloc = bufloc; new_f->fp.sizeloc = sizeloc; - return &new_f->fp._sf._f; + return &new_f->fp._sf._sbf._f; } diff --git a/libio/stdio.h b/libio/stdio.h index 75d22f94c0..ba5fa5438e 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -73,7 +73,10 @@ typedef _IO_fpos_t fpos_t; #include <stdio_lim.h> +#ifdef __USE_SVID +/* Default path prefix for `tempnam' and `tmpnam'. */ #define P_tmpdir "/tmp" +#endif /* For use by debuggers. These are linked in if printf or fprintf are used. */ extern FILE *stdin, *stdout, *stderr; /* TODO */ diff --git a/libio/strfile.h b/libio/strfile.h index 4934a06e3c..76044f8927 100644 --- a/libio/strfile.h +++ b/libio/strfile.h @@ -36,9 +36,27 @@ struct _IO_str_fields _IO_free_type _free_buffer; }; -typedef struct _IO_strfile_ +/* This is needed for the Irix6 N32 ABI, which has a 64 bit off_t type, + but a 32 bit pointer type. In this case, we get 4 bytes of padding + after the vtable pointer. Putting them in a structure together solves + this problem. */ + +struct _IO_streambuf { struct _IO_FILE _f; const void *_vtable; +}; + +typedef struct _IO_strfile_ +{ + struct _IO_streambuf _sbf; struct _IO_str_fields _s; } _IO_strfile; + +/* dynamic: set when the array object is allocated (or reallocated) as + necessary to hold a character sequence that can change in length. */ +#define _IO_STR_DYNAMIC(FP) ((FP)->_s._allocate_buffer != (_IO_alloc_type)0) + +/* frozen: set when the program has requested that the array object not + be altered, reallocated, or freed. */ +#define _IO_STR_FROZEN(FP) ((FP)->_f._IO_file_flags & _IO_USER_BUF) diff --git a/libio/vasprintf.c b/libio/vasprintf.c index 57a3b08eba..f8dba80c38 100644 --- a/libio/vasprintf.c +++ b/libio/vasprintf.c @@ -46,22 +46,22 @@ _IO_vasprintf (result_ptr, format, args) if (string == NULL) return -1; #ifdef _IO_MTSAFE_IO - sf._f._lock = &lock; + sf._sbf._f._lock = &lock; #endif _IO_init((_IO_FILE*)&sf, 0); _IO_JUMPS((_IO_FILE*)&sf) = &_IO_str_jumps; _IO_str_init_static ((_IO_FILE*)&sf, string, init_string_size, string); - sf._f._flags &= ~_IO_USER_BUF; + sf._sbf._f._flags &= ~_IO_USER_BUF; sf._s._allocate_buffer = (_IO_alloc_type)malloc; sf._s._free_buffer = (_IO_free_type)free; ret = _IO_vfprintf((_IO_FILE*)&sf, format, args); if (ret < 0) return ret; - *result_ptr = (char*)realloc(sf._f._IO_buf_base, - (sf._f._IO_write_ptr - sf._f._IO_write_base) +1); + *result_ptr = (char*)realloc(sf._sbf._f._IO_buf_base, + (sf._sbf._f._IO_write_ptr - sf._sbf._f._IO_write_base) +1); if (*result_ptr == NULL) - *result_ptr = sf._f._IO_buf_base; - (*result_ptr)[sf._f._IO_write_ptr-sf._f._IO_write_base] = '\0'; + *result_ptr = sf._sbf._f._IO_buf_base; + (*result_ptr)[sf._sbf._f._IO_write_ptr-sf._sbf._f._IO_write_base] = '\0'; return ret; } weak_alias (_IO_vasprintf, vasprintf) diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c index 9f767b5b06..9ec06914c0 100644 --- a/libio/vsnprintf.c +++ b/libio/vsnprintf.c @@ -36,7 +36,7 @@ _IO_vsnprintf (string, maxlen, format, args) int ret; #ifdef _IO_MTSAFE_IO _IO_lock_t lock; - sf._f._lock = &lock; + sf._sbf._f._lock = &lock; #endif _IO_init ((_IO_FILE *) &sf, 0); _IO_JUMPS ((_IO_FILE *) &sf) = &_IO_str_jumps; diff --git a/login/endutent.c b/login/endutent.c deleted file mode 100644 index 3df95bef93..0000000000 --- a/login/endutent.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - - -/* The global data defined in setutent.c. */ -extern struct utmp_data __utmp_data; - - -void -endutent (void) -{ - __endutent_r (&__utmp_data); -} diff --git a/login/endutent_r.c b/login/endutent_r.c deleted file mode 100644 index a531054a2a..0000000000 --- a/login/endutent_r.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <unistd.h> -#include <utmp.h> - - -void -__endutent_r (struct utmp_data *utmp_data) -{ - if (utmp_data->ut_fd != -1) - { - close (utmp_data->ut_fd); - utmp_data->ut_fd = -1; - } -} -weak_alias (__endutent_r, endutent_r) diff --git a/login/pututline.c b/login/pututline.c deleted file mode 100644 index 7af3efbb46..0000000000 --- a/login/pututline.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - - -/* The global data defined in setutent.c. */ -extern struct utmp_data __utmp_data; - - -struct utmp * -pututline (const struct utmp *utmp) -{ - if (__pututline_r (utmp, &__utmp_data) < 0) - return NULL; - - return (struct utmp *) utmp; -} diff --git a/login/pututline_r.c b/login/pututline_r.c deleted file mode 100644 index 33ba96f461..0000000000 --- a/login/pututline_r.c +++ /dev/null @@ -1,133 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <alloca.h> -#include <errno.h> -#include <stdlib.h> -#include <string.h> -#include <unistd.h> -#include <utmp.h> -#include <sys/file.h> -#include <sys/stat.h> - - -/* XXX An alternative solution would be to call a SUID root program - which write the new value. */ - -int -__pututline_r (const struct utmp *id, struct utmp_data *utmp_data) -{ - struct stat st; - int result = 0; - -#if _HAVE_UT_TYPE - 0 - /* Test whether ID has any of the legal types because we have to - prevent illegal entries. */ - if (id->ut_type != RUN_LVL && id->ut_type != BOOT_TIME - && id->ut_type != OLD_TIME && id->ut_type != NEW_TIME - && id->ut_type != INIT_PROCESS && id->ut_type != LOGIN_PROCESS - && id->ut_type != USER_PROCESS && id->ut_type != DEAD_PROCESS) - /* No, using '<' and '>' for the test is not possible. */ - { - __set_errno (EINVAL); - return -1; - } -#endif - - /* Open utmp file if not already done. */ - if (utmp_data->ut_fd == -1) - { - setutent_r (utmp_data); - if (utmp_data->ut_fd == -1) - return -1; - } - -#if _HAVE_UT_ID - 0 - /* Check whether we need to reposition. Repositioning is necessary - either if the data in UTMP_DATA is not valid or if the ids don't - match: */ - if (id->ut_id[0] - && (utmp_data->loc_utmp < (off_t) sizeof (struct utmp) - || strncmp (utmp_data->ubuf.ut_id, id->ut_id, - sizeof (id->ut_id)) != 0)) - { - /* We must not overwrite the data in UTMP_DATA since ID may be - aliasing it. */ - struct utmp_data *data_tmp = alloca (sizeof (*data_tmp)); - struct utmp *dummy; - - *data_tmp = *utmp_data; - utmp_data = data_tmp; - - if (getutid_r (id, &dummy, utmp_data) < 0 && errno != ESRCH) - return -1; - } -#endif - - /* Try to lock the file. */ - if (flock (utmp_data->ut_fd, LOCK_EX | LOCK_NB) < 0 && errno != ENOSYS) - { - /* Oh, oh. The file is already locked. Wait a bit and try again. */ - sleep (1); - - /* This time we ignore the error. */ - (void) flock (utmp_data->ut_fd, LOCK_EX | LOCK_NB); - } - - /* Find out how large the file is. */ - result = fstat (utmp_data->ut_fd, &st); - - if (result >= 0) - /* Position file correctly. */ - if (utmp_data->loc_utmp < (off_t) sizeof (struct utmp) - || (off_t) (utmp_data->loc_utmp - sizeof (struct utmp)) > st.st_size) - /* Not located at any valid entry. Add at the end. */ - { - result = lseek (utmp_data->ut_fd, 0L, SEEK_END); - if (result >= 0) - /* Where we'll be if the write succeeds. */ - utmp_data->loc_utmp = st.st_size + sizeof (struct utmp); - } - else - result = - lseek (utmp_data->ut_fd, utmp_data->loc_utmp - sizeof (struct utmp), - SEEK_SET); - - if (result >= 0) - /* Write the new data. */ - if (write (utmp_data->ut_fd, id, sizeof (struct utmp)) - != sizeof (struct utmp)) - { - /* If we appended a new record this is only partially written. - Remove it. */ - if (utmp_data->loc_utmp > st.st_size) - { - (void) ftruncate (utmp_data->ut_fd, st.st_size); - utmp_data->loc_utmp = st.st_size; - } - - result = -1; - } - - /* And unlock the file. */ - (void) flock (utmp_data->ut_fd, LOCK_UN); - - return result; -} -weak_alias (__pututline_r, pututline_r) diff --git a/login/setutent.c b/login/setutent.c deleted file mode 100644 index 32d2f8c1f7..0000000000 --- a/login/setutent.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <utmp.h> - -/* Global variable with values for non-reentrent functions. If must - be initialized so that field `ut_fd' is set to -1. */ -struct utmp_data __utmp_data = { ut_fd: -1 }; - - -void -setutent (void) -{ - __setutent_r (&__utmp_data); -} diff --git a/login/setutent_r.c b/login/setutent_r.c deleted file mode 100644 index 46700e700f..0000000000 --- a/login/setutent_r.c +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <utmp.h> - -/* This is the default name. */ -static const char default_utmp_name[] = _PATH_UTMP; - -/* Current file name. */ -static const char *utmp_file_name = (const char *) default_utmp_name; - - -void -__setutent_r (struct utmp_data *utmp_data) -{ - /* Before the UTMP_DATA is used before the first time the UT_FD - field must be set to -1. */ - if (utmp_data->ut_fd == -1) - { - utmp_data->ut_fd = open (utmp_file_name, O_RDWR); - if (utmp_data->ut_fd == -1) - { - /* Hhm, read-write access did not work. Try read-only. */ - utmp_data->ut_fd = open (utmp_file_name, O_RDONLY); - if (utmp_data->ut_fd == -1) - { - perror (_("while opening UTMP file")); - return; - } - } - } - - /* Remember we are at beginning of file. */ - utmp_data->loc_utmp = 0; -#if _HAVE_UT_TYPE - 0 - utmp_data->ubuf.ut_type = UT_UNKNOWN; -#endif -} -weak_alias (__setutent_r, setutent_r) - - -int -__utmpname (const char *file) -{ - char *fname = __strdup (file); - if (fname == NULL) - return 0; - - if (utmp_file_name != default_utmp_name) - free ((void *) utmp_file_name); - - utmp_file_name = fname; - - return 1; -} -weak_alias (__utmpname, utmpname) diff --git a/malloc/Makefile b/malloc/Makefile new file mode 100644 index 0000000000..a6213949e1 --- /dev/null +++ b/malloc/Makefile @@ -0,0 +1,40 @@ +# Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. +# This file is part of the GNU C Library. + +# The GNU C Library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Library General Public License as +# published by the Free Software Foundation; either version 2 of the +# License, or (at your option) any later version. + +# The GNU C Library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. + +# You should have received a copy of the GNU Library General Public +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# +# Makefile for malloc routines +# +subdir := new-malloc + +all: + +dist-headers := malloc.h +headers := $(dist-headers) obstack.h +tests := mallocbug + +distribute = thread-m.h + +# Things which get pasted together into gmalloc.c. +gmalloc-routines := malloc morecore +# Things to include in the standalone distribution. +dist-routines = $(gmalloc-routines) +routines = $(dist-routines) obstack + +include ../Rules + +CFLAGS-obstack.c = -Wno-strict-prototypes diff --git a/malloc/malloc.c b/malloc/malloc.c new file mode 100644 index 0000000000..ed24d5d76d --- /dev/null +++ b/malloc/malloc.c @@ -0,0 +1,3443 @@ +/* Malloc implementation for multiple threads without lock contention. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>, 1996. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* VERSION 2.6.4-pt Wed Dec 4 00:35:54 MET 1996 + + This work is mainly derived from malloc-2.6.4 by Doug Lea + <dl@cs.oswego.edu>, which is available from: + + ftp://g.oswego.edu/pub/misc/malloc.c + + Most of the original comments are reproduced in the code below. + +* Why use this malloc? + + This is not the fastest, most space-conserving, most portable, or + most tunable malloc ever written. However it is among the fastest + while also being among the most space-conserving, portable and tunable. + Consistent balance across these factors results in a good general-purpose + allocator. For a high-level description, see + http://g.oswego.edu/dl/html/malloc.html + + On many systems, the standard malloc implementation is by itself not + thread-safe, and therefore wrapped with a single global lock around + all malloc-related functions. In some applications, especially with + multiple available processors, this can lead to contention problems + and bad performance. This malloc version was designed with the goal + to avoid waiting for locks as much as possible. Statistics indicate + that this goal is achieved in many cases. + +* Synopsis of public routines + + (Much fuller descriptions are contained in the program documentation below.) + + ptmalloc_init(); + Initialize global configuration. When compiled for multiple threads, + this function must be called once before any other function in the + package. It is not required otherwise. It is called automatically + in the Linux/GNU C libray. + malloc(size_t n); + Return a pointer to a newly allocated chunk of at least n bytes, or null + if no space is available. + free(Void_t* p); + Release the chunk of memory pointed to by p, or no effect if p is null. + realloc(Void_t* p, size_t n); + Return a pointer to a chunk of size n that contains the same data + as does chunk p up to the minimum of (n, p's size) bytes, or null + if no space is available. The returned pointer may or may not be + the same as p. If p is null, equivalent to malloc. Unless the + #define REALLOC_ZERO_BYTES_FREES below is set, realloc with a + size argument of zero (re)allocates a minimum-sized chunk. + memalign(size_t alignment, size_t n); + Return a pointer to a newly allocated chunk of n bytes, aligned + in accord with the alignment argument, which must be a power of + two. + valloc(size_t n); + Equivalent to memalign(pagesize, n), where pagesize is the page + size of the system (or as near to this as can be figured out from + all the includes/defines below.) + pvalloc(size_t n); + Equivalent to valloc(minimum-page-that-holds(n)), that is, + round up n to nearest pagesize. + calloc(size_t unit, size_t quantity); + Returns a pointer to quantity * unit bytes, with all locations + set to zero. + cfree(Void_t* p); + Equivalent to free(p). + malloc_trim(size_t pad); + Release all but pad bytes of freed top-most memory back + to the system. Return 1 if successful, else 0. + malloc_usable_size(Void_t* p); + Report the number usable allocated bytes associated with allocated + chunk p. This may or may not report more bytes than were requested, + due to alignment and minimum size constraints. + malloc_stats(); + Prints brief summary statistics on stderr. + mallinfo() + Returns (by copy) a struct containing various summary statistics. + mallopt(int parameter_number, int parameter_value) + Changes one of the tunable parameters described below. Returns + 1 if successful in changing the parameter, else 0. + +* Vital statistics: + + Alignment: 8-byte + 8 byte alignment is currently hardwired into the design. This + seems to suffice for all current machines and C compilers. + + Assumed pointer representation: 4 or 8 bytes + Code for 8-byte pointers is untested by me but has worked + reliably by Wolfram Gloger, who contributed most of the + changes supporting this. + + Assumed size_t representation: 4 or 8 bytes + Note that size_t is allowed to be 4 bytes even if pointers are 8. + + Minimum overhead per allocated chunk: 4 or 8 bytes + Each malloced chunk has a hidden overhead of 4 bytes holding size + and status information. + + Minimum allocated size: 4-byte ptrs: 16 bytes (including 4 overhead) + 8-byte ptrs: 24/32 bytes (including, 4/8 overhead) + + When a chunk is freed, 12 (for 4byte ptrs) or 20 (for 8 byte + ptrs but 4 byte size) or 24 (for 8/8) additional bytes are + needed; 4 (8) for a trailing size field + and 8 (16) bytes for free list pointers. Thus, the minimum + allocatable size is 16/24/32 bytes. + + Even a request for zero bytes (i.e., malloc(0)) returns a + pointer to something of the minimum allocatable size. + + Maximum allocated size: 4-byte size_t: 2^31 - 8 bytes + 8-byte size_t: 2^63 - 16 bytes + + It is assumed that (possibly signed) size_t bit values suffice to + represent chunk sizes. `Possibly signed' is due to the fact + that `size_t' may be defined on a system as either a signed or + an unsigned type. To be conservative, values that would appear + as negative numbers are avoided. + Requests for sizes with a negative sign bit will return a + minimum-sized chunk. + + Maximum overhead wastage per allocated chunk: normally 15 bytes + + Alignnment demands, plus the minimum allocatable size restriction + make the normal worst-case wastage 15 bytes (i.e., up to 15 + more bytes will be allocated than were requested in malloc), with + two exceptions: + 1. Because requests for zero bytes allocate non-zero space, + the worst case wastage for a request of zero bytes is 24 bytes. + 2. For requests >= mmap_threshold that are serviced via + mmap(), the worst case wastage is 8 bytes plus the remainder + from a system page (the minimal mmap unit); typically 4096 bytes. + +* Limitations + + Here are some features that are NOT currently supported + + * No user-definable hooks for callbacks and the like. + * No automated mechanism for fully checking that all accesses + to malloced memory stay within their bounds. + * No support for compaction. + +* Synopsis of compile-time options: + + People have reported using previous versions of this malloc on all + versions of Unix, sometimes by tweaking some of the defines + below. It has been tested most extensively on Solaris and + Linux. People have also reported adapting this malloc for use in + stand-alone embedded systems. + + The implementation is in straight, hand-tuned ANSI C. Among other + consequences, it uses a lot of macros. Because of this, to be at + all usable, this code should be compiled using an optimizing compiler + (for example gcc -O2) that can simplify expressions and control + paths. + + __STD_C (default: derived from C compiler defines) + Nonzero if using ANSI-standard C compiler, a C++ compiler, or + a C compiler sufficiently close to ANSI to get away with it. + MALLOC_DEBUG (default: NOT defined) + Define to enable debugging. Adds fairly extensive assertion-based + checking to help track down memory errors, but noticeably slows down + execution. + REALLOC_ZERO_BYTES_FREES (default: NOT defined) + Define this if you think that realloc(p, 0) should be equivalent + to free(p). Otherwise, since malloc returns a unique pointer for + malloc(0), so does realloc(p, 0). + HAVE_MEMCPY (default: defined) + Define if you are not otherwise using ANSI STD C, but still + have memcpy and memset in your C library and want to use them. + Otherwise, simple internal versions are supplied. + USE_MEMCPY (default: 1 if HAVE_MEMCPY is defined, 0 otherwise) + Define as 1 if you want the C library versions of memset and + memcpy called in realloc and calloc (otherwise macro versions are used). + At least on some platforms, the simple macro versions usually + outperform libc versions. + HAVE_MMAP (default: defined as 1) + Define to non-zero to optionally make malloc() use mmap() to + allocate very large blocks. + HAVE_MREMAP (default: defined as 0 unless Linux libc set) + Define to non-zero to optionally make realloc() use mremap() to + reallocate very large blocks. + malloc_getpagesize (default: derived from system #includes) + Either a constant or routine call returning the system page size. + HAVE_USR_INCLUDE_MALLOC_H (default: NOT defined) + Optionally define if you are on a system with a /usr/include/malloc.h + that declares struct mallinfo. It is not at all necessary to + define this even if you do, but will ensure consistency. + INTERNAL_SIZE_T (default: size_t) + Define to a 32-bit type (probably `unsigned int') if you are on a + 64-bit machine, yet do not want or need to allow malloc requests of + greater than 2^31 to be handled. This saves space, especially for + very small chunks. + _LIBC (default: NOT defined) + Defined only when compiled as part of the Linux libc/glibc. + Also note that there is some odd internal name-mangling via defines + (for example, internally, `malloc' is named `mALLOc') needed + when compiling in this case. These look funny but don't otherwise + affect anything. + LACKS_UNISTD_H (default: undefined) + Define this if your system does not have a <unistd.h>. + MORECORE (default: sbrk) + The name of the routine to call to obtain more memory from the system. + MORECORE_FAILURE (default: -1) + The value returned upon failure of MORECORE. + MORECORE_CLEARS (default 1) + True (1) if the routine mapped to MORECORE zeroes out memory (which + holds for sbrk). + DEFAULT_TRIM_THRESHOLD + DEFAULT_TOP_PAD + DEFAULT_MMAP_THRESHOLD + DEFAULT_MMAP_MAX + Default values of tunable parameters (described in detail below) + controlling interaction with host system routines (sbrk, mmap, etc). + These values may also be changed dynamically via mallopt(). The + preset defaults are those that give best performance for typical + programs/systems. + + +*/ + +/* + +* Compile-time options for multiple threads: + + USE_PTHREADS, USE_THR, USE_SPROC + Define one of these as 1 to select the thread interface: + POSIX threads, Solaris threads or SGI sproc's, respectively. + If none of these is defined as non-zero, you get a `normal' + malloc implementation which is not thread-safe. Support for + multiple threads requires HAVE_MMAP=1. As an exception, when + compiling for GNU libc, i.e. when _LIBC is defined, then none of + the USE_... symbols have to be defined. + + HEAP_MIN_SIZE + HEAP_MAX_SIZE + When thread support is enabled, additional `heap's are created + with mmap calls. These are limited in size; HEAP_MIN_SIZE should + be a multiple of the page size, while HEAP_MAX_SIZE must be a power + of two for alignment reasons. HEAP_MAX_SIZE should be at least + twice as large as the mmap threshold. + THREAD_STATS + When this is defined as non-zero, some statistics on mutex locking + are computed. + +*/ + + + + +/* Macros for handling mutexes and thread-specific data. This is + included first, because some thread-related header files (such as + pthread.h) should be included before any others. */ +#include "thread-m.h" + + +/* Preliminaries */ + +#ifndef __STD_C +#if defined (__STDC__) +#define __STD_C 1 +#else +#if __cplusplus +#define __STD_C 1 +#else +#define __STD_C 0 +#endif /*__cplusplus*/ +#endif /*__STDC__*/ +#endif /*__STD_C*/ + +#ifndef Void_t +#if __STD_C +#define Void_t void +#else +#define Void_t char +#endif +#endif /*Void_t*/ + +#if __STD_C +#include <stddef.h> /* for size_t */ +#else +#include <sys/types.h> +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdio.h> /* needed for malloc_stats */ + + +/* + Compile-time options +*/ + + +/* + Debugging: + + Because freed chunks may be overwritten with link fields, this + malloc will often die when freed memory is overwritten by user + programs. This can be very effective (albeit in an annoying way) + in helping track down dangling pointers. + + If you compile with -DMALLOC_DEBUG, a number of assertion checks are + enabled that will catch more memory errors. You probably won't be + able to make much sense of the actual assertion errors, but they + should help you locate incorrectly overwritten memory. The + checking is fairly extensive, and will slow down execution + noticeably. Calling malloc_stats or mallinfo with MALLOC_DEBUG set will + attempt to check every non-mmapped allocated and free chunk in the + course of computing the summmaries. (By nature, mmapped regions + cannot be checked very much automatically.) + + Setting MALLOC_DEBUG may also be helpful if you are trying to modify + this code. The assertions in the check routines spell out in more + detail the assumptions and invariants underlying the algorithms. + +*/ + +#if MALLOC_DEBUG +#include <assert.h> +#else +#define assert(x) ((void)0) +#endif + + +/* + INTERNAL_SIZE_T is the word-size used for internal bookkeeping + of chunk sizes. On a 64-bit machine, you can reduce malloc + overhead by defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' + at the expense of not being able to handle requests greater than + 2^31. This limitation is hardly ever a concern; you are encouraged + to set this. However, the default version is the same as size_t. +*/ + +#ifndef INTERNAL_SIZE_T +#define INTERNAL_SIZE_T size_t +#endif + +/* + REALLOC_ZERO_BYTES_FREES should be set if a call to + realloc with zero bytes should be the same as a call to free. + Some people think it should. Otherwise, since this malloc + returns a unique pointer for malloc(0), so does realloc(p, 0). +*/ + + +/* #define REALLOC_ZERO_BYTES_FREES */ + + +/* + HAVE_MEMCPY should be defined if you are not otherwise using + ANSI STD C, but still have memcpy and memset in your C library + and want to use them in calloc and realloc. Otherwise simple + macro versions are defined here. + + USE_MEMCPY should be defined as 1 if you actually want to + have memset and memcpy called. People report that the macro + versions are often enough faster than libc versions on many + systems that it is better to use them. + +*/ + +#define HAVE_MEMCPY + +#ifndef USE_MEMCPY +#ifdef HAVE_MEMCPY +#define USE_MEMCPY 1 +#else +#define USE_MEMCPY 0 +#endif +#endif + +#if (__STD_C || defined(HAVE_MEMCPY)) + +#if __STD_C +void* memset(void*, int, size_t); +void* memcpy(void*, const void*, size_t); +#else +Void_t* memset(); +Void_t* memcpy(); +#endif +#endif + +#if USE_MEMCPY + +/* The following macros are only invoked with (2n+1)-multiples of + INTERNAL_SIZE_T units, with a positive integer n. This is exploited + for fast inline execution when n is small. */ + +#define MALLOC_ZERO(charp, nbytes) \ +do { \ + INTERNAL_SIZE_T mzsz = (nbytes); \ + if(mzsz <= 9*sizeof(mzsz)) { \ + INTERNAL_SIZE_T* mz = (INTERNAL_SIZE_T*) (charp); \ + if(mzsz >= 5*sizeof(mzsz)) { *mz++ = 0; \ + *mz++ = 0; \ + if(mzsz >= 7*sizeof(mzsz)) { *mz++ = 0; \ + *mz++ = 0; \ + if(mzsz >= 9*sizeof(mzsz)) { *mz++ = 0; \ + *mz++ = 0; }}} \ + *mz++ = 0; \ + *mz++ = 0; \ + *mz = 0; \ + } else memset((charp), 0, mzsz); \ +} while(0) + +#define MALLOC_COPY(dest,src,nbytes) \ +do { \ + INTERNAL_SIZE_T mcsz = (nbytes); \ + if(mcsz <= 9*sizeof(mcsz)) { \ + INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) (src); \ + INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) (dest); \ + if(mcsz >= 5*sizeof(mcsz)) { *mcdst++ = *mcsrc++; \ + *mcdst++ = *mcsrc++; \ + if(mcsz >= 7*sizeof(mcsz)) { *mcdst++ = *mcsrc++; \ + *mcdst++ = *mcsrc++; \ + if(mcsz >= 9*sizeof(mcsz)) { *mcdst++ = *mcsrc++; \ + *mcdst++ = *mcsrc++; }}} \ + *mcdst++ = *mcsrc++; \ + *mcdst++ = *mcsrc++; \ + *mcdst = *mcsrc ; \ + } else memcpy(dest, src, mcsz); \ +} while(0) + +#else /* !USE_MEMCPY */ + +/* Use Duff's device for good zeroing/copying performance. */ + +#define MALLOC_ZERO(charp, nbytes) \ +do { \ + INTERNAL_SIZE_T* mzp = (INTERNAL_SIZE_T*)(charp); \ + long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn; \ + if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ + switch (mctmp) { \ + case 0: for(;;) { *mzp++ = 0; \ + case 7: *mzp++ = 0; \ + case 6: *mzp++ = 0; \ + case 5: *mzp++ = 0; \ + case 4: *mzp++ = 0; \ + case 3: *mzp++ = 0; \ + case 2: *mzp++ = 0; \ + case 1: *mzp++ = 0; if(mcn <= 0) break; mcn--; } \ + } \ +} while(0) + +#define MALLOC_COPY(dest,src,nbytes) \ +do { \ + INTERNAL_SIZE_T* mcsrc = (INTERNAL_SIZE_T*) src; \ + INTERNAL_SIZE_T* mcdst = (INTERNAL_SIZE_T*) dest; \ + long mctmp = (nbytes)/sizeof(INTERNAL_SIZE_T), mcn; \ + if (mctmp < 8) mcn = 0; else { mcn = (mctmp-1)/8; mctmp %= 8; } \ + switch (mctmp) { \ + case 0: for(;;) { *mcdst++ = *mcsrc++; \ + case 7: *mcdst++ = *mcsrc++; \ + case 6: *mcdst++ = *mcsrc++; \ + case 5: *mcdst++ = *mcsrc++; \ + case 4: *mcdst++ = *mcsrc++; \ + case 3: *mcdst++ = *mcsrc++; \ + case 2: *mcdst++ = *mcsrc++; \ + case 1: *mcdst++ = *mcsrc++; if(mcn <= 0) break; mcn--; } \ + } \ +} while(0) + +#endif + + +/* + Define HAVE_MMAP to optionally make malloc() use mmap() to + allocate very large blocks. These will be returned to the + operating system immediately after a free(). +*/ + +#ifndef HAVE_MMAP +#define HAVE_MMAP 1 +#endif + +/* + Define HAVE_MREMAP to make realloc() use mremap() to re-allocate + large blocks. This is currently only possible on Linux with + kernel versions newer than 1.3.77. +*/ + +#ifndef HAVE_MREMAP +#define HAVE_MREMAP defined(__linux__) +#endif + +#if HAVE_MMAP + +#include <unistd.h> +#include <fcntl.h> +#include <sys/mman.h> + +#if !defined(MAP_ANONYMOUS) && defined(MAP_ANON) +#define MAP_ANONYMOUS MAP_ANON +#endif + +#endif /* HAVE_MMAP */ + +/* + Access to system page size. To the extent possible, this malloc + manages memory from the system in page-size units. + + The following mechanics for getpagesize were adapted from + bsd/gnu getpagesize.h +*/ + +#ifndef LACKS_UNISTD_H +# include <unistd.h> +#endif + +#ifndef malloc_getpagesize +# ifdef _SC_PAGESIZE /* some SVR4 systems omit an underscore */ +# ifndef _SC_PAGE_SIZE +# define _SC_PAGE_SIZE _SC_PAGESIZE +# endif +# endif +# ifdef _SC_PAGE_SIZE +# define malloc_getpagesize sysconf(_SC_PAGE_SIZE) +# else +# if defined(BSD) || defined(DGUX) || defined(HAVE_GETPAGESIZE) + extern size_t getpagesize(); +# define malloc_getpagesize getpagesize() +# else +# include <sys/param.h> +# ifdef EXEC_PAGESIZE +# define malloc_getpagesize EXEC_PAGESIZE +# else +# ifdef NBPG +# ifndef CLSIZE +# define malloc_getpagesize NBPG +# else +# define malloc_getpagesize (NBPG * CLSIZE) +# endif +# else +# ifdef NBPC +# define malloc_getpagesize NBPC +# else +# ifdef PAGESIZE +# define malloc_getpagesize PAGESIZE +# else +# define malloc_getpagesize (4096) /* just guess */ +# endif +# endif +# endif +# endif +# endif +# endif +#endif + + + +/* + + This version of malloc supports the standard SVID/XPG mallinfo + routine that returns a struct containing the same kind of + information you can get from malloc_stats. It should work on + any SVID/XPG compliant system that has a /usr/include/malloc.h + defining struct mallinfo. (If you'd like to install such a thing + yourself, cut out the preliminary declarations as described above + and below and save them in a malloc.h file. But there's no + compelling reason to bother to do this.) + + The main declaration needed is the mallinfo struct that is returned + (by-copy) by mallinfo(). The SVID/XPG malloinfo struct contains a + bunch of fields, most of which are not even meaningful in this + version of malloc. Some of these fields are are instead filled by + mallinfo() with other numbers that might possibly be of interest. + + HAVE_USR_INCLUDE_MALLOC_H should be set if you have a + /usr/include/malloc.h file that includes a declaration of struct + mallinfo. If so, it is included; else an SVID2/XPG2 compliant + version is declared below. These must be precisely the same for + mallinfo() to work. + +*/ + +/* #define HAVE_USR_INCLUDE_MALLOC_H */ + +#if HAVE_USR_INCLUDE_MALLOC_H +#include "/usr/include/malloc.h" +#else +#include "malloc.h" +#endif + + + +#ifndef DEFAULT_TRIM_THRESHOLD +#define DEFAULT_TRIM_THRESHOLD (128 * 1024) +#endif + +/* + M_TRIM_THRESHOLD is the maximum amount of unused top-most memory + to keep before releasing via malloc_trim in free(). + + Automatic trimming is mainly useful in long-lived programs. + Because trimming via sbrk can be slow on some systems, and can + sometimes be wasteful (in cases where programs immediately + afterward allocate more large chunks) the value should be high + enough so that your overall system performance would improve by + releasing. + + The trim threshold and the mmap control parameters (see below) + can be traded off with one another. Trimming and mmapping are + two different ways of releasing unused memory back to the + system. Between these two, it is often possible to keep + system-level demands of a long-lived program down to a bare + minimum. For example, in one test suite of sessions measuring + the XF86 X server on Linux, using a trim threshold of 128K and a + mmap threshold of 192K led to near-minimal long term resource + consumption. + + If you are using this malloc in a long-lived program, it should + pay to experiment with these values. As a rough guide, you + might set to a value close to the average size of a process + (program) running on your system. Releasing this much memory + would allow such a process to run in memory. Generally, it's + worth it to tune for trimming rather tham memory mapping when a + program undergoes phases where several large chunks are + allocated and released in ways that can reuse each other's + storage, perhaps mixed with phases where there are no such + chunks at all. And in well-behaved long-lived programs, + controlling release of large blocks via trimming versus mapping + is usually faster. + + However, in most programs, these parameters serve mainly as + protection against the system-level effects of carrying around + massive amounts of unneeded memory. Since frequent calls to + sbrk, mmap, and munmap otherwise degrade performance, the default + parameters are set to relatively high values that serve only as + safeguards. + + The default trim value is high enough to cause trimming only in + fairly extreme (by current memory consumption standards) cases. + It must be greater than page size to have any useful effect. To + disable trimming completely, you can set to (unsigned long)(-1); + + +*/ + + +#ifndef DEFAULT_TOP_PAD +#define DEFAULT_TOP_PAD (0) +#endif + +/* + M_TOP_PAD is the amount of extra `padding' space to allocate or + retain whenever sbrk is called. It is used in two ways internally: + + * When sbrk is called to extend the top of the arena to satisfy + a new malloc request, this much padding is added to the sbrk + request. + + * When malloc_trim is called automatically from free(), + it is used as the `pad' argument. + + In both cases, the actual amount of padding is rounded + so that the end of the arena is always a system page boundary. + + The main reason for using padding is to avoid calling sbrk so + often. Having even a small pad greatly reduces the likelihood + that nearly every malloc request during program start-up (or + after trimming) will invoke sbrk, which needlessly wastes + time. + + Automatic rounding-up to page-size units is normally sufficient + to avoid measurable overhead, so the default is 0. However, in + systems where sbrk is relatively slow, it can pay to increase + this value, at the expense of carrying around more memory than + the program needs. + +*/ + + +#ifndef DEFAULT_MMAP_THRESHOLD +#define DEFAULT_MMAP_THRESHOLD (128 * 1024) +#endif + +/* + + M_MMAP_THRESHOLD is the request size threshold for using mmap() + to service a request. Requests of at least this size that cannot + be allocated using already-existing space will be serviced via mmap. + (If enough normal freed space already exists it is used instead.) + + Using mmap segregates relatively large chunks of memory so that + they can be individually obtained and released from the host + system. A request serviced through mmap is never reused by any + other request (at least not directly; the system may just so + happen to remap successive requests to the same locations). + + Segregating space in this way has the benefit that mmapped space + can ALWAYS be individually released back to the system, which + helps keep the system level memory demands of a long-lived + program low. Mapped memory can never become `locked' between + other chunks, as can happen with normally allocated chunks, which + menas that even trimming via malloc_trim would not release them. + + However, it has the disadvantages that: + + 1. The space cannot be reclaimed, consolidated, and then + used to service later requests, as happens with normal chunks. + 2. It can lead to more wastage because of mmap page alignment + requirements + 3. It causes malloc performance to be more dependent on host + system memory management support routines which may vary in + implementation quality and may impose arbitrary + limitations. Generally, servicing a request via normal + malloc steps is faster than going through a system's mmap. + + All together, these considerations should lead you to use mmap + only for relatively large requests. + + +*/ + + + +#ifndef DEFAULT_MMAP_MAX +#if HAVE_MMAP +#define DEFAULT_MMAP_MAX (1024) +#else +#define DEFAULT_MMAP_MAX (0) +#endif +#endif + +/* + M_MMAP_MAX is the maximum number of requests to simultaneously + service using mmap. This parameter exists because: + + 1. Some systems have a limited number of internal tables for + use by mmap. + 2. In most systems, overreliance on mmap can degrade overall + performance. + 3. If a program allocates many large regions, it is probably + better off using normal sbrk-based allocation routines that + can reclaim and reallocate normal heap memory. Using a + small value allows transition into this mode after the + first few allocations. + + Setting to 0 disables all use of mmap. If HAVE_MMAP is not set, + the default value is 0, and attempts to set it to non-zero values + in mallopt will fail. +*/ + + + +#define HEAP_MIN_SIZE (32*1024) +#define HEAP_MAX_SIZE (1024*1024) /* must be a power of two */ + +/* HEAP_MIN_SIZE and HEAP_MAX_SIZE limit the size of mmap()ed heaps + that are dynamically created for multi-threaded programs. The + maximum size must be a power of two, for fast determination of + which heap belongs to a chunk. It should be much larger than + the mmap threshold, so that requests with a size just below that + threshold can be fulfilled without creating too many heaps. +*/ + + + +#ifndef THREAD_STATS +#define THREAD_STATS 0 +#endif + +/* If THREAD_STATS is non-zero, some statistics on mutex locking are + computed. */ + + +/* + + Special defines for the Linux/GNU C library. + +*/ + + +#ifdef _LIBC + +#if __STD_C + +Void_t * __default_morecore (ptrdiff_t); +static Void_t *(*__morecore)(ptrdiff_t) = __default_morecore; + +#else + +Void_t * __default_morecore (); +static Void_t *(*__morecore)() = __default_morecore; + +#endif + +#define MORECORE (*__morecore) +#define MORECORE_FAILURE 0 +#define MORECORE_CLEARS 1 + +#else /* _LIBC */ + +#if __STD_C +extern Void_t* sbrk(ptrdiff_t); +#else +extern Void_t* sbrk(); +#endif + +#ifndef MORECORE +#define MORECORE sbrk +#endif + +#ifndef MORECORE_FAILURE +#define MORECORE_FAILURE -1 +#endif + +#ifndef MORECORE_CLEARS +#define MORECORE_CLEARS 1 +#endif + +#endif /* _LIBC */ + +#if 0 && defined(_LIBC) + +#define cALLOc __libc_calloc +#define fREe __libc_free +#define mALLOc __libc_malloc +#define mEMALIGn __libc_memalign +#define rEALLOc __libc_realloc +#define vALLOc __libc_valloc +#define pvALLOc __libc_pvalloc +#define mALLINFo __libc_mallinfo +#define mALLOPt __libc_mallopt + +#pragma weak calloc = __libc_calloc +#pragma weak free = __libc_free +#pragma weak cfree = __libc_free +#pragma weak malloc = __libc_malloc +#pragma weak memalign = __libc_memalign +#pragma weak realloc = __libc_realloc +#pragma weak valloc = __libc_valloc +#pragma weak pvalloc = __libc_pvalloc +#pragma weak mallinfo = __libc_mallinfo +#pragma weak mallopt = __libc_mallopt + +#else + +#define cALLOc calloc +#define fREe free +#define mALLOc malloc +#define mEMALIGn memalign +#define rEALLOc realloc +#define vALLOc valloc +#define pvALLOc pvalloc +#define mALLINFo mallinfo +#define mALLOPt mallopt + +#endif + +/* Public routines */ + +#if __STD_C + +#ifndef _LIBC +void ptmalloc_init(void); +#endif +Void_t* mALLOc(size_t); +void fREe(Void_t*); +Void_t* rEALLOc(Void_t*, size_t); +Void_t* mEMALIGn(size_t, size_t); +Void_t* vALLOc(size_t); +Void_t* pvALLOc(size_t); +Void_t* cALLOc(size_t, size_t); +void cfree(Void_t*); +int malloc_trim(size_t); +size_t malloc_usable_size(Void_t*); +void malloc_stats(void); +int mALLOPt(int, int); +struct mallinfo mALLINFo(void); +#else +#ifndef _LIBC +void ptmalloc_init(); +#endif +Void_t* mALLOc(); +void fREe(); +Void_t* rEALLOc(); +Void_t* mEMALIGn(); +Void_t* vALLOc(); +Void_t* pvALLOc(); +Void_t* cALLOc(); +void cfree(); +int malloc_trim(); +size_t malloc_usable_size(); +void malloc_stats(); +int mALLOPt(); +struct mallinfo mALLINFo(); +#endif + + +#ifdef __cplusplus +}; /* end of extern "C" */ +#endif + +#if !defined(NO_THREADS) && !HAVE_MMAP +"Can't have threads support without mmap" +#endif + + +/* + Type declarations +*/ + + +struct malloc_chunk +{ + INTERNAL_SIZE_T prev_size; /* Size of previous chunk (if free). */ + INTERNAL_SIZE_T size; /* Size in bytes, including overhead. */ + struct malloc_chunk* fd; /* double links -- used only if free. */ + struct malloc_chunk* bk; +}; + +typedef struct malloc_chunk* mchunkptr; + +/* + + malloc_chunk details: + + (The following includes lightly edited explanations by Colin Plumb.) + + Chunks of memory are maintained using a `boundary tag' method as + described in e.g., Knuth or Standish. (See the paper by Paul + Wilson ftp://ftp.cs.utexas.edu/pub/garbage/allocsrv.ps for a + survey of such techniques.) Sizes of free chunks are stored both + in the front of each chunk and at the end. This makes + consolidating fragmented chunks into bigger chunks very fast. The + size fields also hold bits representing whether chunks are free or + in use. + + An allocated chunk looks like this: + + + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of previous chunk, if allocated | | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of chunk, in bytes |P| + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | User data starts here... . + . . + . (malloc_usable_space() bytes) . + . | +nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + + Where "chunk" is the front of the chunk for the purpose of most of + the malloc code, but "mem" is the pointer that is returned to the + user. "Nextchunk" is the beginning of the next contiguous chunk. + + Chunks always begin on even word boundries, so the mem portion + (which is returned to the user) is also on an even word boundary, and + thus double-word aligned. + + Free chunks are stored in circular doubly-linked lists, and look like this: + + chunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Size of previous chunk | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `head:' | Size of chunk, in bytes |P| + mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Forward pointer to next chunk in list | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Back pointer to previous chunk in list | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Unused space (may be 0 bytes long) . + . . + . | +nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + `foot:' | Size of chunk, in bytes | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + + The P (PREV_INUSE) bit, stored in the unused low-order bit of the + chunk size (which is always a multiple of two words), is an in-use + bit for the *previous* chunk. If that bit is *clear*, then the + word before the current chunk size contains the previous chunk + size, and can be used to find the front of the previous chunk. + (The very first chunk allocated always has this bit set, + preventing access to non-existent (or non-owned) memory.) + + Note that the `foot' of the current chunk is actually represented + as the prev_size of the NEXT chunk. (This makes it easier to + deal with alignments etc). + + The two exceptions to all this are + + 1. The special chunk `top', which doesn't bother using the + trailing size field since there is no + next contiguous chunk that would have to index off it. (After + initialization, `top' is forced to always exist. If it would + become less than MINSIZE bytes long, it is replenished via + malloc_extend_top.) + + 2. Chunks allocated via mmap, which have the second-lowest-order + bit (IS_MMAPPED) set in their size fields. Because they are + never merged or traversed from any other chunk, they have no + foot size or inuse information. + + Available chunks are kept in any of several places (all declared below): + + * `av': An array of chunks serving as bin headers for consolidated + chunks. Each bin is doubly linked. The bins are approximately + proportionally (log) spaced. There are a lot of these bins + (128). This may look excessive, but works very well in + practice. All procedures maintain the invariant that no + consolidated chunk physically borders another one. Chunks in + bins are kept in size order, with ties going to the + approximately least recently used chunk. + + The chunks in each bin are maintained in decreasing sorted order by + size. This is irrelevant for the small bins, which all contain + the same-sized chunks, but facilitates best-fit allocation for + larger chunks. (These lists are just sequential. Keeping them in + order almost never requires enough traversal to warrant using + fancier ordered data structures.) Chunks of the same size are + linked with the most recently freed at the front, and allocations + are taken from the back. This results in LRU or FIFO allocation + order, which tends to give each chunk an equal opportunity to be + consolidated with adjacent freed chunks, resulting in larger free + chunks and less fragmentation. + + * `top': The top-most available chunk (i.e., the one bordering the + end of available memory) is treated specially. It is never + included in any bin, is used only if no other chunk is + available, and is released back to the system if it is very + large (see M_TRIM_THRESHOLD). + + * `last_remainder': A bin holding only the remainder of the + most recently split (non-top) chunk. This bin is checked + before other non-fitting chunks, so as to provide better + locality for runs of sequentially allocated chunks. + + * Implicitly, through the host system's memory mapping tables. + If supported, requests greater than a threshold are usually + serviced via calls to mmap, and then later released via munmap. + +*/ + +/* + Bins + + The bins are an array of pairs of pointers serving as the + heads of (initially empty) doubly-linked lists of chunks, laid out + in a way so that each pair can be treated as if it were in a + malloc_chunk. (This way, the fd/bk offsets for linking bin heads + and chunks are the same). + + Bins for sizes < 512 bytes contain chunks of all the same size, spaced + 8 bytes apart. Larger bins are approximately logarithmically + spaced. (See the table below.) + + Bin layout: + + 64 bins of size 8 + 32 bins of size 64 + 16 bins of size 512 + 8 bins of size 4096 + 4 bins of size 32768 + 2 bins of size 262144 + 1 bin of size what's left + + There is actually a little bit of slop in the numbers in bin_index + for the sake of speed. This makes no difference elsewhere. + + The special chunks `top' and `last_remainder' get their own bins, + (this is implemented via yet more trickery with the av array), + although `top' is never properly linked to its bin since it is + always handled specially. + +*/ + +#define NAV 128 /* number of bins */ + +typedef struct malloc_chunk* mbinptr; + +/* An arena is a configuration of malloc_chunks together with an array + of bins. With multiple threads, it must be locked via a mutex + before changing its data structures. One or more `heaps' are + associated with each arena, except for the main_arena, which is + associated only with the `main heap', i.e. the conventional free + store obtained with calls to MORECORE() (usually sbrk). The `av' + array is never mentioned directly in the code, but instead used via + bin access macros. */ + +typedef struct _arena { + mbinptr av[2*NAV + 2]; + struct _arena *next; + mutex_t mutex; +} arena; + + +/* A heap is a single contiguous memory region holding (coalescable) + malloc_chunks. It is allocated with mmap() and always starts at an + address aligned to HEAP_MAX_SIZE. Not used unless compiling for + multiple threads. */ + +typedef struct _heap_info { + arena *ar_ptr; + size_t size; +} heap_info; + + +/* + Static functions (forward declarations) +*/ + +#if __STD_C +static void chunk_free(arena *ar_ptr, mchunkptr p); +static mchunkptr chunk_alloc(arena *ar_ptr, INTERNAL_SIZE_T size); +static int arena_trim(arena *ar_ptr, size_t pad); +#else +static void chunk_free(); +static mchunkptr chunk_alloc(); +static int arena_trim(); +#endif + + + +/* sizes, alignments */ + +#define SIZE_SZ (sizeof(INTERNAL_SIZE_T)) +#define MALLOC_ALIGNMENT (SIZE_SZ + SIZE_SZ) +#define MALLOC_ALIGN_MASK (MALLOC_ALIGNMENT - 1) +#define MINSIZE (sizeof(struct malloc_chunk)) + +/* conversion from malloc headers to user pointers, and back */ + +#define chunk2mem(p) ((Void_t*)((char*)(p) + 2*SIZE_SZ)) +#define mem2chunk(mem) ((mchunkptr)((char*)(mem) - 2*SIZE_SZ)) + +/* pad request bytes into a usable size */ + +#define request2size(req) \ + (((long)((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) < \ + (long)(MINSIZE + MALLOC_ALIGN_MASK)) ? MINSIZE : \ + (((req) + (SIZE_SZ + MALLOC_ALIGN_MASK)) & ~(MALLOC_ALIGN_MASK))) + +/* Check if m has acceptable alignment */ + +#define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) + + + + +/* + Physical chunk operations +*/ + + +/* size field is or'ed with PREV_INUSE when previous adjacent chunk in use */ + +#define PREV_INUSE 0x1 + +/* size field is or'ed with IS_MMAPPED if the chunk was obtained with mmap() */ + +#define IS_MMAPPED 0x2 + +/* Bits to mask off when extracting size */ + +#define SIZE_BITS (PREV_INUSE|IS_MMAPPED) + + +/* Ptr to next physical malloc_chunk. */ + +#define next_chunk(p) ((mchunkptr)( ((char*)(p)) + ((p)->size & ~PREV_INUSE) )) + +/* Ptr to previous physical malloc_chunk */ + +#define prev_chunk(p) ((mchunkptr)( ((char*)(p)) - ((p)->prev_size) )) + + +/* Treat space at ptr + offset as a chunk */ + +#define chunk_at_offset(p, s) ((mchunkptr)(((char*)(p)) + (s))) + + + + +/* + Dealing with use bits +*/ + +/* extract p's inuse bit */ + +#define inuse(p) \ + ((((mchunkptr)(((char*)(p))+((p)->size & ~PREV_INUSE)))->size) & PREV_INUSE) + +/* extract inuse bit of previous chunk */ + +#define prev_inuse(p) ((p)->size & PREV_INUSE) + +/* check for mmap()'ed chunk */ + +#define chunk_is_mmapped(p) ((p)->size & IS_MMAPPED) + +/* set/clear chunk as in use without otherwise disturbing */ + +#define set_inuse(p) \ + ((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size |= PREV_INUSE + +#define clear_inuse(p) \ + ((mchunkptr)(((char*)(p)) + ((p)->size & ~PREV_INUSE)))->size &= ~(PREV_INUSE) + +/* check/set/clear inuse bits in known places */ + +#define inuse_bit_at_offset(p, s)\ + (((mchunkptr)(((char*)(p)) + (s)))->size & PREV_INUSE) + +#define set_inuse_bit_at_offset(p, s)\ + (((mchunkptr)(((char*)(p)) + (s)))->size |= PREV_INUSE) + +#define clear_inuse_bit_at_offset(p, s)\ + (((mchunkptr)(((char*)(p)) + (s)))->size &= ~(PREV_INUSE)) + + + + +/* + Dealing with size fields +*/ + +/* Get size, ignoring use bits */ + +#define chunksize(p) ((p)->size & ~(SIZE_BITS)) + +/* Set size at head, without disturbing its use bit */ + +#define set_head_size(p, s) ((p)->size = (((p)->size & PREV_INUSE) | (s))) + +/* Set size/use ignoring previous bits in header */ + +#define set_head(p, s) ((p)->size = (s)) + +/* Set size at footer (only when chunk is not in use) */ + +#define set_foot(p, s) (((mchunkptr)((char*)(p) + (s)))->prev_size = (s)) + + + + + +/* access macros */ + +#define bin_at(a, i) ((mbinptr)((char*)&(((a)->av)[2*(i) + 2]) - 2*SIZE_SZ)) +#define init_bin(a, i) ((a)->av[2*i+2] = (a)->av[2*i+3] = bin_at((a), i)) +#define next_bin(b) ((mbinptr)((char*)(b) + 2 * sizeof(mbinptr))) +#define prev_bin(b) ((mbinptr)((char*)(b) - 2 * sizeof(mbinptr))) + +/* + The first 2 bins are never indexed. The corresponding av cells are instead + used for bookkeeping. This is not to save space, but to simplify + indexing, maintain locality, and avoid some initialization tests. +*/ + +#define binblocks(a) (bin_at(a,0)->size)/* bitvector of nonempty blocks */ +#define top(a) (bin_at(a,0)->fd) /* The topmost chunk */ +#define last_remainder(a) (bin_at(a,1)) /* remainder from last split */ + +/* + Because top initially points to its own bin with initial + zero size, thus forcing extension on the first malloc request, + we avoid having any special code in malloc to check whether + it even exists yet. But we still need to in malloc_extend_top. +*/ + +#define initial_top(a) ((mchunkptr)bin_at(a, 0)) + + + +/* field-extraction macros */ + +#define first(b) ((b)->fd) +#define last(b) ((b)->bk) + +/* + Indexing into bins +*/ + +#define bin_index(sz) \ +(((((unsigned long)(sz)) >> 9) == 0) ? (((unsigned long)(sz)) >> 3): \ + ((((unsigned long)(sz)) >> 9) <= 4) ? 56 + (((unsigned long)(sz)) >> 6): \ + ((((unsigned long)(sz)) >> 9) <= 20) ? 91 + (((unsigned long)(sz)) >> 9): \ + ((((unsigned long)(sz)) >> 9) <= 84) ? 110 + (((unsigned long)(sz)) >> 12): \ + ((((unsigned long)(sz)) >> 9) <= 340) ? 119 + (((unsigned long)(sz)) >> 15): \ + ((((unsigned long)(sz)) >> 9) <= 1364) ? 124 + (((unsigned long)(sz)) >> 18): \ + 126) +/* + bins for chunks < 512 are all spaced 8 bytes apart, and hold + identically sized chunks. This is exploited in malloc. +*/ + +#define MAX_SMALLBIN 63 +#define MAX_SMALLBIN_SIZE 512 +#define SMALLBIN_WIDTH 8 + +#define smallbin_index(sz) (((unsigned long)(sz)) >> 3) + +/* + Requests are `small' if both the corresponding and the next bin are small +*/ + +#define is_small_request(nb) ((nb) < MAX_SMALLBIN_SIZE - SMALLBIN_WIDTH) + + + +/* + To help compensate for the large number of bins, a one-level index + structure is used for bin-by-bin searching. `binblocks' is a + one-word bitvector recording whether groups of BINBLOCKWIDTH bins + have any (possibly) non-empty bins, so they can be skipped over + all at once during during traversals. The bits are NOT always + cleared as soon as all bins in a block are empty, but instead only + when all are noticed to be empty during traversal in malloc. +*/ + +#define BINBLOCKWIDTH 4 /* bins per block */ + +/* bin<->block macros */ + +#define idx2binblock(ix) ((unsigned)1 << ((ix) / BINBLOCKWIDTH)) +#define mark_binblock(a, ii) (binblocks(a) |= idx2binblock(ii)) +#define clear_binblock(a, ii) (binblocks(a) &= ~(idx2binblock(ii))) + + + + +/* Static bookkeeping data */ + +/* Helper macro to initialize bins */ +#define IAV(i) bin_at(&main_arena, i), bin_at(&main_arena, i) + +static arena main_arena = { + { + 0, 0, + IAV(0), IAV(1), IAV(2), IAV(3), IAV(4), IAV(5), IAV(6), IAV(7), + IAV(8), IAV(9), IAV(10), IAV(11), IAV(12), IAV(13), IAV(14), IAV(15), + IAV(16), IAV(17), IAV(18), IAV(19), IAV(20), IAV(21), IAV(22), IAV(23), + IAV(24), IAV(25), IAV(26), IAV(27), IAV(28), IAV(29), IAV(30), IAV(31), + IAV(32), IAV(33), IAV(34), IAV(35), IAV(36), IAV(37), IAV(38), IAV(39), + IAV(40), IAV(41), IAV(42), IAV(43), IAV(44), IAV(45), IAV(46), IAV(47), + IAV(48), IAV(49), IAV(50), IAV(51), IAV(52), IAV(53), IAV(54), IAV(55), + IAV(56), IAV(57), IAV(58), IAV(59), IAV(60), IAV(61), IAV(62), IAV(63), + IAV(64), IAV(65), IAV(66), IAV(67), IAV(68), IAV(69), IAV(70), IAV(71), + IAV(72), IAV(73), IAV(74), IAV(75), IAV(76), IAV(77), IAV(78), IAV(79), + IAV(80), IAV(81), IAV(82), IAV(83), IAV(84), IAV(85), IAV(86), IAV(87), + IAV(88), IAV(89), IAV(90), IAV(91), IAV(92), IAV(93), IAV(94), IAV(95), + IAV(96), IAV(97), IAV(98), IAV(99), IAV(100), IAV(101), IAV(102), IAV(103), + IAV(104), IAV(105), IAV(106), IAV(107), IAV(108), IAV(109), IAV(110), IAV(111), + IAV(112), IAV(113), IAV(114), IAV(115), IAV(116), IAV(117), IAV(118), IAV(119), + IAV(120), IAV(121), IAV(122), IAV(123), IAV(124), IAV(125), IAV(126), IAV(127) + }, + NULL, /* next */ + MUTEX_INITIALIZER /* mutex */ +}; + +#undef IAV + +/* Thread specific data */ + +static tsd_key_t arena_key; +static mutex_t list_lock = MUTEX_INITIALIZER; + +#if THREAD_STATS +static int stat_n_arenas = 0; +static int stat_n_heaps = 0; +static long stat_lock_direct = 0; +static long stat_lock_loop = 0; +#define THREAD_STAT(x) x +#else +#define THREAD_STAT(x) do ; while(0) +#endif + +/* variables holding tunable values */ + +static unsigned long trim_threshold = DEFAULT_TRIM_THRESHOLD; +static unsigned long top_pad = DEFAULT_TOP_PAD; +static unsigned int n_mmaps_max = DEFAULT_MMAP_MAX; +static unsigned long mmap_threshold = DEFAULT_MMAP_THRESHOLD; + +/* The first value returned from sbrk */ +static char* sbrk_base = (char*)(-1); + +/* The maximum memory obtained from system via sbrk */ +static unsigned long max_sbrked_mem = 0; + +/* The maximum via either sbrk or mmap */ +static unsigned long max_total_mem = 0; + +/* internal working copy of mallinfo */ +static struct mallinfo current_mallinfo = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + +/* The total memory obtained from system via sbrk */ +#define sbrked_mem (current_mallinfo.arena) + +/* Tracking mmaps */ + +static unsigned int n_mmaps = 0; +static unsigned int max_n_mmaps = 0; +static unsigned long mmapped_mem = 0; +static unsigned long max_mmapped_mem = 0; + + + + + +/* Initialization routine. */ +#if defined(_LIBC) +static void ptmalloc_init __MALLOC_P ((void)) __attribute__ ((constructor)); + +static void +ptmalloc_init __MALLOC_P((void)) +#else +void +ptmalloc_init __MALLOC_P((void)) +#endif +{ + static int first = 1; + +#if defined(_LIBC) + /* Initialize the pthread. */ + if (__pthread_initialize != NULL) + __pthread_initialize (); +#endif + + if(first) { + first = 0; + mutex_init(&main_arena.mutex); + mutex_init(&list_lock); + tsd_key_create(&arena_key, NULL); + tsd_setspecific(arena_key, (Void_t *)&main_arena); + } +} + + + + + +/* Routines dealing with mmap(). */ + +#if HAVE_MMAP + +#ifndef MAP_ANONYMOUS + +static int dev_zero_fd = -1; /* Cached file descriptor for /dev/zero. */ + +#define MMAP(size, prot) ((dev_zero_fd < 0) ? \ + (dev_zero_fd = open("/dev/zero", O_RDWR), \ + mmap(0, (size), (prot), MAP_PRIVATE, dev_zero_fd, 0)) : \ + mmap(0, (size), (prot), MAP_PRIVATE, dev_zero_fd, 0)) + +#else + +#define MMAP(size, prot) \ + (mmap(0, (size), (prot), MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)) + +#endif + +#if __STD_C +static mchunkptr mmap_chunk(size_t size) +#else +static mchunkptr mmap_chunk(size) size_t size; +#endif +{ + size_t page_mask = malloc_getpagesize - 1; + mchunkptr p; + + if(n_mmaps >= n_mmaps_max) return 0; /* too many regions */ + + /* For mmapped chunks, the overhead is one SIZE_SZ unit larger, because + * there is no following chunk whose prev_size field could be used. + */ + size = (size + SIZE_SZ + page_mask) & ~page_mask; + + p = (mchunkptr)MMAP(size, PROT_READ|PROT_WRITE); + if(p == (mchunkptr)-1) return 0; + + n_mmaps++; + if (n_mmaps > max_n_mmaps) max_n_mmaps = n_mmaps; + + /* We demand that eight bytes into a page must be 8-byte aligned. */ + assert(aligned_OK(chunk2mem(p))); + + /* The offset to the start of the mmapped region is stored + * in the prev_size field of the chunk; normally it is zero, + * but that can be changed in memalign(). + */ + p->prev_size = 0; + set_head(p, size|IS_MMAPPED); + + mmapped_mem += size; + if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem) + max_mmapped_mem = mmapped_mem; + if ((unsigned long)(mmapped_mem + sbrked_mem) > (unsigned long)max_total_mem) + max_total_mem = mmapped_mem + sbrked_mem; + return p; +} + +#if __STD_C +static void munmap_chunk(mchunkptr p) +#else +static void munmap_chunk(p) mchunkptr p; +#endif +{ + INTERNAL_SIZE_T size = chunksize(p); + int ret; + + assert (chunk_is_mmapped(p)); + assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem)); + assert((n_mmaps > 0)); + assert(((p->prev_size + size) & (malloc_getpagesize-1)) == 0); + + n_mmaps--; + mmapped_mem -= (size + p->prev_size); + + ret = munmap((char *)p - p->prev_size, size + p->prev_size); + + /* munmap returns non-zero on failure */ + assert(ret == 0); +} + +#if HAVE_MREMAP + +#if __STD_C +static mchunkptr mremap_chunk(mchunkptr p, size_t new_size) +#else +static mchunkptr mremap_chunk(p, new_size) mchunkptr p; size_t new_size; +#endif +{ + size_t page_mask = malloc_getpagesize - 1; + INTERNAL_SIZE_T offset = p->prev_size; + INTERNAL_SIZE_T size = chunksize(p); + char *cp; + + assert (chunk_is_mmapped(p)); + assert(! ((char*)p >= sbrk_base && (char*)p < sbrk_base + sbrked_mem)); + assert((n_mmaps > 0)); + assert(((size + offset) & (malloc_getpagesize-1)) == 0); + + /* Note the extra SIZE_SZ overhead as in mmap_chunk(). */ + new_size = (new_size + offset + SIZE_SZ + page_mask) & ~page_mask; + + cp = (char *)mremap((char *)p - offset, size + offset, new_size, + MREMAP_MAYMOVE); + + if (cp == (char *)-1) return 0; + + p = (mchunkptr)(cp + offset); + + assert(aligned_OK(chunk2mem(p))); + + assert((p->prev_size == offset)); + set_head(p, (new_size - offset)|IS_MMAPPED); + + mmapped_mem -= size + offset; + mmapped_mem += new_size; + if ((unsigned long)mmapped_mem > (unsigned long)max_mmapped_mem) + max_mmapped_mem = mmapped_mem; + if ((unsigned long)(mmapped_mem + sbrked_mem) > (unsigned long)max_total_mem) + max_total_mem = mmapped_mem + sbrked_mem; + return p; +} + +#endif /* HAVE_MREMAP */ + +#endif /* HAVE_MMAP */ + + + +/* Managing heaps and arenas (for concurrent threads) */ + +#ifndef NO_THREADS + +/* Create a new heap. size is automatically rounded up to a multiple + of the page size. */ + +static heap_info * +#if __STD_C +new_heap(size_t size) +#else +new_heap(size) size_t size; +#endif +{ + size_t page_mask = malloc_getpagesize - 1; + char *p1, *p2; + unsigned long ul; + heap_info *h; + + if(size < HEAP_MIN_SIZE) + size = HEAP_MIN_SIZE; + size = (size + page_mask) & ~page_mask; + if(size > HEAP_MAX_SIZE) + return 0; + p1 = (char *)MMAP(HEAP_MAX_SIZE<<1, PROT_NONE); + if(p1 == (char *)-1) + return 0; + p2 = (char *)(((unsigned long)p1 + HEAP_MAX_SIZE) & ~(HEAP_MAX_SIZE-1)); + ul = p2 - p1; + munmap(p1, ul); + munmap(p2 + HEAP_MAX_SIZE, HEAP_MAX_SIZE - ul); + if(mprotect(p2, size, PROT_READ|PROT_WRITE) != 0) { + munmap(p2, HEAP_MAX_SIZE); + return 0; + } + h = (heap_info *)p2; + h->size = size; + THREAD_STAT(stat_n_heaps++); + return h; +} + +/* Grow or shrink a heap. size is automatically rounded up to a + multiple of the page size. */ + +static int +#if __STD_C +grow_heap(heap_info *h, long diff) +#else +grow_heap(h, diff) heap_info *h; long diff; +#endif +{ + size_t page_mask = malloc_getpagesize - 1; + long new_size; + + if(diff >= 0) { + diff = (diff + page_mask) & ~page_mask; + new_size = (long)h->size + diff; + if(new_size > HEAP_MAX_SIZE) + return -1; + if(mprotect((char *)h + h->size, diff, PROT_READ|PROT_WRITE) != 0) + return -2; + } else { + new_size = (long)h->size + diff; + if(new_size < 0) + return -1; + if(mprotect((char *)h + new_size, -diff, PROT_NONE) != 0) + return -2; + } + h->size = new_size; + return 0; +} + +/* arena_get() acquires an arena and locks the corresponding mutex. + First, try the one last locked successfully by this thread. (This + is the common case and handled with a macro for speed.) Then, loop + over the singly linked list of arenas. If no arena is readily + available, create a new one. */ + +#define arena_get(ptr, size) do { \ + Void_t *vptr = NULL; \ + ptr = (arena *)tsd_getspecific(arena_key, vptr); \ + if(ptr && !mutex_trylock(&ptr->mutex)) { \ + THREAD_STAT(stat_lock_direct++); \ + } else { \ + ptr = arena_get2(ptr, (size)); \ + } \ +} while(0) + +static arena * +#if __STD_C +arena_get2(arena *a_tsd, size_t size) +#else +arena_get2(a_tsd, size) arena *a_tsd; size_t size; +#endif +{ + arena *a; + heap_info *h; + char *ptr; + int i; + unsigned long misalign; + + /* Check the list for unlocked arenas. */ + if(a_tsd) { + for(a = a_tsd->next; a; a = a->next) { + if(!mutex_trylock(&a->mutex)) + goto done; + } + for(a = &main_arena; a != a_tsd; a = a->next) { + if(!mutex_trylock(&a->mutex)) + goto done; + } + } else { + for(a = &main_arena; a; a = a->next) { + if(!mutex_trylock(&a->mutex)) + goto done; + } + } + + /* Nothing immediately available, so generate a new arena. */ + h = new_heap(size + (sizeof(*h) + sizeof(*a) + MALLOC_ALIGNMENT)); + if(!h) + return 0; + a = h->ar_ptr = (arena *)(h+1); + for(i=0; i<NAV; i++) + init_bin(a, i); + mutex_init(&a->mutex); + i = mutex_lock(&a->mutex); /* remember result */ + + /* Set up the top chunk, with proper alignment. */ + ptr = (char *)(a + 1); + misalign = (unsigned long)chunk2mem(ptr) & MALLOC_ALIGN_MASK; + if (misalign > 0) + ptr += MALLOC_ALIGNMENT - misalign; + top(a) = (mchunkptr)ptr; + set_head(top(a), (h->size - (ptr-(char*)h)) | PREV_INUSE); + + /* Add the new arena to the list. */ + (void)mutex_lock(&list_lock); + a->next = main_arena.next; + main_arena.next = a; + THREAD_STAT(stat_n_arenas++); + (void)mutex_unlock(&list_lock); + + if(i) /* locking failed; keep arena for further attempts later */ + return 0; + +done: + THREAD_STAT(stat_lock_loop++); + tsd_setspecific(arena_key, (Void_t *)a); + return a; +} + +/* find the heap and corresponding arena for a given ptr */ + +#define heap_for_ptr(ptr) \ + ((heap_info *)((unsigned long)(ptr) & ~(HEAP_MAX_SIZE-1))) +#define arena_for_ptr(ptr) \ + (((mchunkptr)(ptr) < top(&main_arena) && (char *)(ptr) >= sbrk_base) ? \ + &main_arena : heap_for_ptr(ptr)->ar_ptr) + +#else /* defined(NO_THREADS) */ + +/* Without concurrent threads, there is only one arena. */ + +#define arena_get(ptr, sz) (ptr = &main_arena) +#define arena_for_ptr(ptr) (&main_arena) + +#endif /* !defined(NO_THREADS) */ + + + +/* + Debugging support +*/ + +#if MALLOC_DEBUG + + +/* + These routines make a number of assertions about the states + of data structures that should be true at all times. If any + are not true, it's very likely that a user program has somehow + trashed memory. (It's also possible that there is a coding error + in malloc. In which case, please report it!) +*/ + +#if __STD_C +static void do_check_chunk(arena *ar_ptr, mchunkptr p) +#else +static void do_check_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p; +#endif +{ + INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE; + + /* No checkable chunk is mmapped */ + assert(!chunk_is_mmapped(p)); + +#ifndef NO_THREADS + if(ar_ptr != &main_arena) { + heap_info *heap = heap_for_ptr(p); + assert(heap->ar_ptr == ar_ptr); + assert((char *)p + sz <= (char *)heap + heap->size); + return; + } +#endif + + /* Check for legal address ... */ + assert((char*)p >= sbrk_base); + if (p != top(ar_ptr)) + assert((char*)p + sz <= (char*)top(ar_ptr)); + else + assert((char*)p + sz <= sbrk_base + sbrked_mem); + +} + + +#if __STD_C +static void do_check_free_chunk(arena *ar_ptr, mchunkptr p) +#else +static void do_check_free_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p; +#endif +{ + INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE; + mchunkptr next = chunk_at_offset(p, sz); + + do_check_chunk(ar_ptr, p); + + /* Check whether it claims to be free ... */ + assert(!inuse(p)); + + /* Unless a special marker, must have OK fields */ + if ((long)sz >= (long)MINSIZE) + { + assert((sz & MALLOC_ALIGN_MASK) == 0); + assert(aligned_OK(chunk2mem(p))); + /* ... matching footer field */ + assert(next->prev_size == sz); + /* ... and is fully consolidated */ + assert(prev_inuse(p)); + assert (next == top(ar_ptr) || inuse(next)); + + /* ... and has minimally sane links */ + assert(p->fd->bk == p); + assert(p->bk->fd == p); + } + else /* markers are always of size SIZE_SZ */ + assert(sz == SIZE_SZ); +} + +#if __STD_C +static void do_check_inuse_chunk(arena *ar_ptr, mchunkptr p) +#else +static void do_check_inuse_chunk(ar_ptr, p) arena *ar_ptr; mchunkptr p; +#endif +{ + mchunkptr next = next_chunk(p); + do_check_chunk(ar_ptr, p); + + /* Check whether it claims to be in use ... */ + assert(inuse(p)); + + /* ... and is surrounded by OK chunks. + Since more things can be checked with free chunks than inuse ones, + if an inuse chunk borders them and debug is on, it's worth doing them. + */ + if (!prev_inuse(p)) + { + mchunkptr prv = prev_chunk(p); + assert(next_chunk(prv) == p); + do_check_free_chunk(ar_ptr, prv); + } + if (next == top(ar_ptr)) + { + assert(prev_inuse(next)); + assert(chunksize(next) >= MINSIZE); + } + else if (!inuse(next)) + do_check_free_chunk(ar_ptr, next); + +} + +#if __STD_C +static void do_check_malloced_chunk(arena *ar_ptr, + mchunkptr p, INTERNAL_SIZE_T s) +#else +static void do_check_malloced_chunk(ar_ptr, p, s) +arena *ar_ptr; mchunkptr p; INTERNAL_SIZE_T s; +#endif +{ + INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE; + long room = sz - s; + + do_check_inuse_chunk(ar_ptr, p); + + /* Legal size ... */ + assert((long)sz >= (long)MINSIZE); + assert((sz & MALLOC_ALIGN_MASK) == 0); + assert(room >= 0); + assert(room < (long)MINSIZE); + + /* ... and alignment */ + assert(aligned_OK(chunk2mem(p))); + + + /* ... and was allocated at front of an available chunk */ + assert(prev_inuse(p)); + +} + + +#define check_free_chunk(A,P) do_check_free_chunk(A,P) +#define check_inuse_chunk(A,P) do_check_inuse_chunk(A,P) +#define check_chunk(A,P) do_check_chunk(A,P) +#define check_malloced_chunk(A,P,N) do_check_malloced_chunk(A,P,N) +#else +#define check_free_chunk(A,P) +#define check_inuse_chunk(A,P) +#define check_chunk(A,P) +#define check_malloced_chunk(A,P,N) +#endif + + + +/* + Macro-based internal utilities +*/ + + +/* + Linking chunks in bin lists. + Call these only with variables, not arbitrary expressions, as arguments. +*/ + +/* + Place chunk p of size s in its bin, in size order, + putting it ahead of others of same size. +*/ + + +#define frontlink(A, P, S, IDX, BK, FD) \ +{ \ + if (S < MAX_SMALLBIN_SIZE) \ + { \ + IDX = smallbin_index(S); \ + mark_binblock(A, IDX); \ + BK = bin_at(A, IDX); \ + FD = BK->fd; \ + P->bk = BK; \ + P->fd = FD; \ + FD->bk = BK->fd = P; \ + } \ + else \ + { \ + IDX = bin_index(S); \ + BK = bin_at(A, IDX); \ + FD = BK->fd; \ + if (FD == BK) mark_binblock(A, IDX); \ + else \ + { \ + while (FD != BK && S < chunksize(FD)) FD = FD->fd; \ + BK = FD->bk; \ + } \ + P->bk = BK; \ + P->fd = FD; \ + FD->bk = BK->fd = P; \ + } \ +} + + +/* take a chunk off a list */ + +#define unlink(P, BK, FD) \ +{ \ + BK = P->bk; \ + FD = P->fd; \ + FD->bk = BK; \ + BK->fd = FD; \ +} \ + +/* Place p as the last remainder */ + +#define link_last_remainder(A, P) \ +{ \ + last_remainder(A)->fd = last_remainder(A)->bk = P; \ + P->fd = P->bk = last_remainder(A); \ +} + +/* Clear the last_remainder bin */ + +#define clear_last_remainder(A) \ + (last_remainder(A)->fd = last_remainder(A)->bk = last_remainder(A)) + + + + + +/* + Extend the top-most chunk by obtaining memory from system. + Main interface to sbrk (but see also malloc_trim). +*/ + +#if __STD_C +static void malloc_extend_top(arena *ar_ptr, INTERNAL_SIZE_T nb) +#else +static void malloc_extend_top(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb; +#endif +{ + unsigned long pagesz = malloc_getpagesize; + mchunkptr old_top = top(ar_ptr); /* Record state of old top */ + INTERNAL_SIZE_T old_top_size = chunksize(old_top); + INTERNAL_SIZE_T top_size; /* new size of top chunk */ + +#ifndef NO_THREADS + if(ar_ptr == &main_arena) { +#endif + + char* brk; /* return value from sbrk */ + INTERNAL_SIZE_T front_misalign; /* unusable bytes at front of sbrked space */ + INTERNAL_SIZE_T correction; /* bytes for 2nd sbrk call */ + char* new_brk; /* return of 2nd sbrk call */ + char* old_end = (char*)(chunk_at_offset(old_top, old_top_size)); + + /* Pad request with top_pad plus minimal overhead */ + INTERNAL_SIZE_T sbrk_size = nb + top_pad + MINSIZE; + + /* If not the first time through, round to preserve page boundary */ + /* Otherwise, we need to correct to a page size below anyway. */ + /* (We also correct below if an intervening foreign sbrk call.) */ + + if (sbrk_base != (char*)(-1)) + sbrk_size = (sbrk_size + (pagesz - 1)) & ~(pagesz - 1); + + brk = (char*)(MORECORE (sbrk_size)); + + /* Fail if sbrk failed or if a foreign sbrk call killed our space */ + if (brk == (char*)(MORECORE_FAILURE) || + (brk < old_end && old_top != initial_top(&main_arena))) + return; + + sbrked_mem += sbrk_size; + + if (brk == old_end) { /* can just add bytes to current top */ + top_size = sbrk_size + old_top_size; + set_head(old_top, top_size | PREV_INUSE); + old_top = 0; /* don't free below */ + } else { + if (sbrk_base == (char*)(-1)) /* First time through. Record base */ + sbrk_base = brk; + else + /* Someone else called sbrk(). Count those bytes as sbrked_mem. */ + sbrked_mem += brk - (char*)old_end; + + /* Guarantee alignment of first new chunk made from this space */ + front_misalign = (unsigned long)chunk2mem(brk) & MALLOC_ALIGN_MASK; + if (front_misalign > 0) { + correction = (MALLOC_ALIGNMENT) - front_misalign; + brk += correction; + } else + correction = 0; + + /* Guarantee the next brk will be at a page boundary */ + correction += pagesz - ((unsigned long)(brk + sbrk_size) & (pagesz - 1)); + + /* Allocate correction */ + new_brk = (char*)(MORECORE (correction)); + if (new_brk == (char*)(MORECORE_FAILURE)) return; + + sbrked_mem += correction; + + top(&main_arena) = (mchunkptr)brk; + top_size = new_brk - brk + correction; + set_head(top(&main_arena), top_size | PREV_INUSE); + + if (old_top == initial_top(&main_arena)) + old_top = 0; /* don't free below */ + } + + if ((unsigned long)sbrked_mem > (unsigned long)max_sbrked_mem) + max_sbrked_mem = sbrked_mem; + if ((unsigned long)(mmapped_mem + sbrked_mem) > + (unsigned long)max_total_mem) + max_total_mem = mmapped_mem + sbrked_mem; + +#ifndef NO_THREADS + } else { /* ar_ptr != &main_arena */ + + heap_info *heap; + + if(old_top_size < MINSIZE) /* this should never happen */ + return; + + /* First try to extend the current heap. */ + if(MINSIZE + nb <= old_top_size) + return; + heap = heap_for_ptr(old_top); + if(grow_heap(heap, MINSIZE + nb - old_top_size) == 0) { + top_size = heap->size - ((char *)old_top - (char *)heap); + set_head(old_top, top_size | PREV_INUSE); + return; + } + + /* A new heap must be created. */ + heap = new_heap(nb + top_pad + (MINSIZE + sizeof(*heap))); + if(!heap) + return; + heap->ar_ptr = ar_ptr; + + /* Set up the new top, so we can safely use chunk_free() below. */ + top(ar_ptr) = chunk_at_offset(heap, sizeof(*heap)); + top_size = heap->size - sizeof(*heap); + set_head(top(ar_ptr), top_size | PREV_INUSE); + } +#endif /* !defined(NO_THREADS) */ + + /* We always land on a page boundary */ + assert(((unsigned long)((char*)top(ar_ptr) + top_size) & (pagesz-1)) == 0); + + /* Setup fencepost and free the old top chunk. */ + if(old_top) { + /* Keep size a multiple of MALLOC_ALIGNMENT. */ + old_top_size = (old_top_size - 3*SIZE_SZ) & ~MALLOC_ALIGN_MASK; + /* If possible, release the rest. */ + if (old_top_size >= MINSIZE) { + set_head(chunk_at_offset(old_top, old_top_size ), + SIZE_SZ|PREV_INUSE); + set_head(chunk_at_offset(old_top, old_top_size+SIZE_SZ), + SIZE_SZ|PREV_INUSE); + set_head_size(old_top, old_top_size); + chunk_free(ar_ptr, old_top); + } else { + set_head(old_top, SIZE_SZ|PREV_INUSE); + set_head(chunk_at_offset(old_top, SIZE_SZ), SIZE_SZ|PREV_INUSE); + } + } +} + + + + +/* Main public routines */ + + +/* + Malloc Algorthim: + + The requested size is first converted into a usable form, `nb'. + This currently means to add 4 bytes overhead plus possibly more to + obtain 8-byte alignment and/or to obtain a size of at least + MINSIZE (currently 16 bytes), the smallest allocatable size. + (All fits are considered `exact' if they are within MINSIZE bytes.) + + From there, the first successful of the following steps is taken: + + 1. The bin corresponding to the request size is scanned, and if + a chunk of exactly the right size is found, it is taken. + + 2. The most recently remaindered chunk is used if it is big + enough. This is a form of (roving) first fit, used only in + the absence of exact fits. Runs of consecutive requests use + the remainder of the chunk used for the previous such request + whenever possible. This limited use of a first-fit style + allocation strategy tends to give contiguous chunks + coextensive lifetimes, which improves locality and can reduce + fragmentation in the long run. + + 3. Other bins are scanned in increasing size order, using a + chunk big enough to fulfill the request, and splitting off + any remainder. This search is strictly by best-fit; i.e., + the smallest (with ties going to approximately the least + recently used) chunk that fits is selected. + + 4. If large enough, the chunk bordering the end of memory + (`top') is split off. (This use of `top' is in accord with + the best-fit search rule. In effect, `top' is treated as + larger (and thus less well fitting) than any other available + chunk since it can be extended to be as large as necessary + (up to system limitations). + + 5. If the request size meets the mmap threshold and the + system supports mmap, and there are few enough currently + allocated mmapped regions, and a call to mmap succeeds, + the request is allocated via direct memory mapping. + + 6. Otherwise, the top of memory is extended by + obtaining more space from the system (normally using sbrk, + but definable to anything else via the MORECORE macro). + Memory is gathered from the system (in system page-sized + units) in a way that allows chunks obtained across different + sbrk calls to be consolidated, but does not require + contiguous memory. Thus, it should be safe to intersperse + mallocs with other sbrk calls. + + + All allocations are made from the the `lowest' part of any found + chunk. (The implementation invariant is that prev_inuse is + always true of any allocated chunk; i.e., that each allocated + chunk borders either a previously allocated and still in-use chunk, + or the base of its memory arena.) + +*/ + +#if __STD_C +Void_t* mALLOc(size_t bytes) +#else +Void_t* mALLOc(bytes) size_t bytes; +#endif +{ + arena *ar_ptr; + INTERNAL_SIZE_T nb = request2size(bytes); /* padded request size; */ + mchunkptr victim; + + arena_get(ar_ptr, nb + top_pad); + if(!ar_ptr) + return 0; + victim = chunk_alloc(ar_ptr, nb); + (void)mutex_unlock(&ar_ptr->mutex); + return victim ? chunk2mem(victim) : 0; +} + +static mchunkptr +#if __STD_C +chunk_alloc(arena *ar_ptr, INTERNAL_SIZE_T nb) +#else +chunk_alloc(ar_ptr, nb) arena *ar_ptr; INTERNAL_SIZE_T nb; +#endif +{ + mchunkptr victim; /* inspected/selected chunk */ + INTERNAL_SIZE_T victim_size; /* its size */ + int idx; /* index for bin traversal */ + mbinptr bin; /* associated bin */ + mchunkptr remainder; /* remainder from a split */ + long remainder_size; /* its size */ + int remainder_index; /* its bin index */ + unsigned long block; /* block traverser bit */ + int startidx; /* first bin of a traversed block */ + mchunkptr fwd; /* misc temp for linking */ + mchunkptr bck; /* misc temp for linking */ + mbinptr q; /* misc temp */ + + + /* Check for exact match in a bin */ + + if (is_small_request(nb)) /* Faster version for small requests */ + { + idx = smallbin_index(nb); + + /* No traversal or size check necessary for small bins. */ + + q = bin_at(ar_ptr, idx); + victim = last(q); + + /* Also scan the next one, since it would have a remainder < MINSIZE */ + if (victim == q) + { + q = next_bin(q); + victim = last(q); + } + if (victim != q) + { + victim_size = chunksize(victim); + unlink(victim, bck, fwd); + set_inuse_bit_at_offset(victim, victim_size); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + + idx += 2; /* Set for bin scan below. We've already scanned 2 bins. */ + + } + else + { + idx = bin_index(nb); + bin = bin_at(ar_ptr, idx); + + for (victim = last(bin); victim != bin; victim = victim->bk) + { + victim_size = chunksize(victim); + remainder_size = victim_size - nb; + + if (remainder_size >= (long)MINSIZE) /* too big */ + { + --idx; /* adjust to rescan below after checking last remainder */ + break; + } + + else if (remainder_size >= 0) /* exact fit */ + { + unlink(victim, bck, fwd); + set_inuse_bit_at_offset(victim, victim_size); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + } + + ++idx; + + } + + /* Try to use the last split-off remainder */ + + if ( (victim = last_remainder(ar_ptr)->fd) != last_remainder(ar_ptr)) + { + victim_size = chunksize(victim); + remainder_size = victim_size - nb; + + if (remainder_size >= (long)MINSIZE) /* re-split */ + { + remainder = chunk_at_offset(victim, nb); + set_head(victim, nb | PREV_INUSE); + link_last_remainder(ar_ptr, remainder); + set_head(remainder, remainder_size | PREV_INUSE); + set_foot(remainder, remainder_size); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + + clear_last_remainder(ar_ptr); + + if (remainder_size >= 0) /* exhaust */ + { + set_inuse_bit_at_offset(victim, victim_size); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + + /* Else place in bin */ + + frontlink(ar_ptr, victim, victim_size, remainder_index, bck, fwd); + } + + /* + If there are any possibly nonempty big-enough blocks, + search for best fitting chunk by scanning bins in blockwidth units. + */ + + if ( (block = idx2binblock(idx)) <= binblocks(ar_ptr)) + { + + /* Get to the first marked block */ + + if ( (block & binblocks(ar_ptr)) == 0) + { + /* force to an even block boundary */ + idx = (idx & ~(BINBLOCKWIDTH - 1)) + BINBLOCKWIDTH; + block <<= 1; + while ((block & binblocks(ar_ptr)) == 0) + { + idx += BINBLOCKWIDTH; + block <<= 1; + } + } + + /* For each possibly nonempty block ... */ + for (;;) + { + startidx = idx; /* (track incomplete blocks) */ + q = bin = bin_at(ar_ptr, idx); + + /* For each bin in this block ... */ + do + { + /* Find and use first big enough chunk ... */ + + for (victim = last(bin); victim != bin; victim = victim->bk) + { + victim_size = chunksize(victim); + remainder_size = victim_size - nb; + + if (remainder_size >= (long)MINSIZE) /* split */ + { + remainder = chunk_at_offset(victim, nb); + set_head(victim, nb | PREV_INUSE); + unlink(victim, bck, fwd); + link_last_remainder(ar_ptr, remainder); + set_head(remainder, remainder_size | PREV_INUSE); + set_foot(remainder, remainder_size); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + + else if (remainder_size >= 0) /* take */ + { + set_inuse_bit_at_offset(victim, victim_size); + unlink(victim, bck, fwd); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + } + + } + + bin = next_bin(bin); + + } while ((++idx & (BINBLOCKWIDTH - 1)) != 0); + + /* Clear out the block bit. */ + + do /* Possibly backtrack to try to clear a partial block */ + { + if ((startidx & (BINBLOCKWIDTH - 1)) == 0) + { + binblocks(ar_ptr) &= ~block; + break; + } + --startidx; + q = prev_bin(q); + } while (first(q) == q); + + /* Get to the next possibly nonempty block */ + + if ( (block <<= 1) <= binblocks(ar_ptr) && (block != 0) ) + { + while ((block & binblocks(ar_ptr)) == 0) + { + idx += BINBLOCKWIDTH; + block <<= 1; + } + } + else + break; + } + } + + + /* Try to use top chunk */ + + /* Require that there be a remainder, ensuring top always exists */ + if ( (remainder_size = chunksize(top(ar_ptr)) - nb) < (long)MINSIZE) + { + +#if HAVE_MMAP + /* If big and would otherwise need to extend, try to use mmap instead */ + if ((unsigned long)nb >= (unsigned long)mmap_threshold && + (victim = mmap_chunk(nb)) != 0) + return victim; +#endif + + /* Try to extend */ + malloc_extend_top(ar_ptr, nb); + if ((remainder_size = chunksize(top(ar_ptr)) - nb) < (long)MINSIZE) + return 0; /* propagate failure */ + } + + victim = top(ar_ptr); + set_head(victim, nb | PREV_INUSE); + top(ar_ptr) = chunk_at_offset(victim, nb); + set_head(top(ar_ptr), remainder_size | PREV_INUSE); + check_malloced_chunk(ar_ptr, victim, nb); + return victim; + +} + + + + +/* + + free() algorithm : + + cases: + + 1. free(0) has no effect. + + 2. If the chunk was allocated via mmap, it is released via munmap(). + + 3. If a returned chunk borders the current high end of memory, + it is consolidated into the top, and if the total unused + topmost memory exceeds the trim threshold, malloc_trim is + called. + + 4. Other chunks are consolidated as they arrive, and + placed in corresponding bins. (This includes the case of + consolidating with the current `last_remainder'). + +*/ + + +#if __STD_C +void fREe(Void_t* mem) +#else +void fREe(mem) Void_t* mem; +#endif +{ + arena *ar_ptr; + mchunkptr p; /* chunk corresponding to mem */ + + if (mem == 0) /* free(0) has no effect */ + return; + + p = mem2chunk(mem); + +#if HAVE_MMAP + if (chunk_is_mmapped(p)) /* release mmapped memory. */ + { + munmap_chunk(p); + return; + } +#endif + + ar_ptr = arena_for_ptr(p); + (void)mutex_lock(&ar_ptr->mutex); + chunk_free(ar_ptr, p); + (void)mutex_unlock(&ar_ptr->mutex); +} + +static void +#if __STD_C +chunk_free(arena *ar_ptr, mchunkptr p) +#else +chunk_free(ar_ptr, p) arena *ar_ptr; mchunkptr p; +#endif +{ + INTERNAL_SIZE_T hd = p->size; /* its head field */ + INTERNAL_SIZE_T sz; /* its size */ + int idx; /* its bin index */ + mchunkptr next; /* next contiguous chunk */ + INTERNAL_SIZE_T nextsz; /* its size */ + INTERNAL_SIZE_T prevsz; /* size of previous contiguous chunk */ + mchunkptr bck; /* misc temp for linking */ + mchunkptr fwd; /* misc temp for linking */ + int islr; /* track whether merging with last_remainder */ + + check_inuse_chunk(ar_ptr, p); + + sz = hd & ~PREV_INUSE; + next = chunk_at_offset(p, sz); + nextsz = chunksize(next); + + if (next == top(ar_ptr)) /* merge with top */ + { + sz += nextsz; + + if (!(hd & PREV_INUSE)) /* consolidate backward */ + { + prevsz = p->prev_size; + p = chunk_at_offset(p, -prevsz); + sz += prevsz; + unlink(p, bck, fwd); + } + + set_head(p, sz | PREV_INUSE); + top(ar_ptr) = p; + if ((unsigned long)(sz) >= (unsigned long)trim_threshold) + arena_trim(ar_ptr, top_pad); + return; + } + + set_head(next, nextsz); /* clear inuse bit */ + + islr = 0; + + if (!(hd & PREV_INUSE)) /* consolidate backward */ + { + prevsz = p->prev_size; + p = chunk_at_offset(p, -prevsz); + sz += prevsz; + + if (p->fd == last_remainder(ar_ptr)) /* keep as last_remainder */ + islr = 1; + else + unlink(p, bck, fwd); + } + + if (!(inuse_bit_at_offset(next, nextsz))) /* consolidate forward */ + { + sz += nextsz; + + if (!islr && next->fd == last_remainder(ar_ptr)) + /* re-insert last_remainder */ + { + islr = 1; + link_last_remainder(ar_ptr, p); + } + else + unlink(next, bck, fwd); + } + + set_head(p, sz | PREV_INUSE); + set_foot(p, sz); + if (!islr) + frontlink(ar_ptr, p, sz, idx, bck, fwd); +} + + + + + +/* + + Realloc algorithm: + + Chunks that were obtained via mmap cannot be extended or shrunk + unless HAVE_MREMAP is defined, in which case mremap is used. + Otherwise, if their reallocation is for additional space, they are + copied. If for less, they are just left alone. + + Otherwise, if the reallocation is for additional space, and the + chunk can be extended, it is, else a malloc-copy-free sequence is + taken. There are several different ways that a chunk could be + extended. All are tried: + + * Extending forward into following adjacent free chunk. + * Shifting backwards, joining preceding adjacent space + * Both shifting backwards and extending forward. + * Extending into newly sbrked space + + Unless the #define REALLOC_ZERO_BYTES_FREES is set, realloc with a + size argument of zero (re)allocates a minimum-sized chunk. + + If the reallocation is for less space, and the new request is for + a `small' (<512 bytes) size, then the newly unused space is lopped + off and freed. + + The old unix realloc convention of allowing the last-free'd chunk + to be used as an argument to realloc is no longer supported. + I don't know of any programs still relying on this feature, + and allowing it would also allow too many other incorrect + usages of realloc to be sensible. + + +*/ + + +#if __STD_C +Void_t* rEALLOc(Void_t* oldmem, size_t bytes) +#else +Void_t* rEALLOc(oldmem, bytes) Void_t* oldmem; size_t bytes; +#endif +{ + arena *ar_ptr; + INTERNAL_SIZE_T nb; /* padded request size */ + + mchunkptr oldp; /* chunk corresponding to oldmem */ + INTERNAL_SIZE_T oldsize; /* its size */ + + mchunkptr newp; /* chunk to return */ + INTERNAL_SIZE_T newsize; /* its size */ + Void_t* newmem; /* corresponding user mem */ + + mchunkptr next; /* next contiguous chunk after oldp */ + INTERNAL_SIZE_T nextsize; /* its size */ + + mchunkptr prev; /* previous contiguous chunk before oldp */ + INTERNAL_SIZE_T prevsize; /* its size */ + + mchunkptr remainder; /* holds split off extra space from newp */ + INTERNAL_SIZE_T remainder_size; /* its size */ + + mchunkptr bck; /* misc temp for linking */ + mchunkptr fwd; /* misc temp for linking */ + +#ifdef REALLOC_ZERO_BYTES_FREES + if (bytes == 0) { fREe(oldmem); return 0; } +#endif + + + /* realloc of null is supposed to be same as malloc */ + if (oldmem == 0) return mALLOc(bytes); + + newp = oldp = mem2chunk(oldmem); + newsize = oldsize = chunksize(oldp); + + + nb = request2size(bytes); + +#if HAVE_MMAP + if (chunk_is_mmapped(oldp)) + { +#if HAVE_MREMAP + newp = mremap_chunk(oldp, nb); + if(newp) return chunk2mem(newp); +#endif + /* Note the extra SIZE_SZ overhead. */ + if(oldsize - SIZE_SZ >= nb) return oldmem; /* do nothing */ + /* Must alloc, copy, free. */ + newmem = mALLOc(bytes); + if (newmem == 0) return 0; /* propagate failure */ + MALLOC_COPY(newmem, oldmem, oldsize - 2*SIZE_SZ); + munmap_chunk(oldp); + return newmem; + } +#endif + + ar_ptr = arena_for_ptr(oldp); + (void)mutex_lock(&ar_ptr->mutex); + /* As in malloc(), remember this arena for the next allocation. */ + tsd_setspecific(arena_key, (Void_t *)ar_ptr); + + check_inuse_chunk(ar_ptr, oldp); + + if ((long)(oldsize) < (long)(nb)) + { + + /* Try expanding forward */ + + next = chunk_at_offset(oldp, oldsize); + if (next == top(ar_ptr) || !inuse(next)) + { + nextsize = chunksize(next); + + /* Forward into top only if a remainder */ + if (next == top(ar_ptr)) + { + if ((long)(nextsize + newsize) >= (long)(nb + MINSIZE)) + { + newsize += nextsize; + top(ar_ptr) = chunk_at_offset(oldp, nb); + set_head(top(ar_ptr), (newsize - nb) | PREV_INUSE); + set_head_size(oldp, nb); + (void)mutex_unlock(&ar_ptr->mutex); + return chunk2mem(oldp); + } + } + + /* Forward into next chunk */ + else if (((long)(nextsize + newsize) >= (long)(nb))) + { + unlink(next, bck, fwd); + newsize += nextsize; + goto split; + } + } + else + { + next = 0; + nextsize = 0; + } + + /* Try shifting backwards. */ + + if (!prev_inuse(oldp)) + { + prev = prev_chunk(oldp); + prevsize = chunksize(prev); + + /* try forward + backward first to save a later consolidation */ + + if (next != 0) + { + /* into top */ + if (next == top(ar_ptr)) + { + if ((long)(nextsize + prevsize + newsize) >= (long)(nb + MINSIZE)) + { + unlink(prev, bck, fwd); + newp = prev; + newsize += prevsize + nextsize; + newmem = chunk2mem(newp); + MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ); + top(ar_ptr) = chunk_at_offset(newp, nb); + set_head(top(ar_ptr), (newsize - nb) | PREV_INUSE); + set_head_size(newp, nb); + (void)mutex_unlock(&ar_ptr->mutex); + return newmem; + } + } + + /* into next chunk */ + else if (((long)(nextsize + prevsize + newsize) >= (long)(nb))) + { + unlink(next, bck, fwd); + unlink(prev, bck, fwd); + newp = prev; + newsize += nextsize + prevsize; + newmem = chunk2mem(newp); + MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ); + goto split; + } + } + + /* backward only */ + if (prev != 0 && (long)(prevsize + newsize) >= (long)nb) + { + unlink(prev, bck, fwd); + newp = prev; + newsize += prevsize; + newmem = chunk2mem(newp); + MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ); + goto split; + } + } + + /* Must allocate */ + + newp = chunk_alloc (ar_ptr, nb); + + if (newp == 0) /* propagate failure */ + return 0; + + /* Avoid copy if newp is next chunk after oldp. */ + /* (This can only happen when new chunk is sbrk'ed.) */ + + if ( newp == next_chunk(oldp)) + { + newsize += chunksize(newp); + newp = oldp; + goto split; + } + + /* Otherwise copy, free, and exit */ + newmem = chunk2mem(newp); + MALLOC_COPY(newmem, oldmem, oldsize - SIZE_SZ); + chunk_free(ar_ptr, oldp); + (void)mutex_unlock(&ar_ptr->mutex); + return newmem; + } + + + split: /* split off extra room in old or expanded chunk */ + + if (newsize - nb >= MINSIZE) /* split off remainder */ + { + remainder = chunk_at_offset(newp, nb); + remainder_size = newsize - nb; + set_head_size(newp, nb); + set_head(remainder, remainder_size | PREV_INUSE); + set_inuse_bit_at_offset(remainder, remainder_size); + chunk_free(ar_ptr, remainder); + } + else + { + set_head_size(newp, newsize); + set_inuse_bit_at_offset(newp, newsize); + } + + check_inuse_chunk(ar_ptr, newp); + (void)mutex_unlock(&ar_ptr->mutex); + return chunk2mem(newp); +} + + + + +/* + + memalign algorithm: + + memalign requests more than enough space from malloc, finds a spot + within that chunk that meets the alignment request, and then + possibly frees the leading and trailing space. + + The alignment argument must be a power of two. This property is not + checked by memalign, so misuse may result in random runtime errors. + + 8-byte alignment is guaranteed by normal malloc calls, so don't + bother calling memalign with an argument of 8 or less. + + Overreliance on memalign is a sure way to fragment space. + +*/ + + +#if __STD_C +Void_t* mEMALIGn(size_t alignment, size_t bytes) +#else +Void_t* mEMALIGn(alignment, bytes) size_t alignment; size_t bytes; +#endif +{ + arena *ar_ptr; + INTERNAL_SIZE_T nb; /* padded request size */ + char* m; /* memory returned by malloc call */ + mchunkptr p; /* corresponding chunk */ + char* brk; /* alignment point within p */ + mchunkptr newp; /* chunk to return */ + INTERNAL_SIZE_T newsize; /* its size */ + INTERNAL_SIZE_T leadsize; /* leading space befor alignment point */ + mchunkptr remainder; /* spare room at end to split off */ + long remainder_size; /* its size */ + + /* If need less alignment than we give anyway, just relay to malloc */ + + if (alignment <= MALLOC_ALIGNMENT) return mALLOc(bytes); + + /* Otherwise, ensure that it is at least a minimum chunk size */ + + if (alignment < MINSIZE) alignment = MINSIZE; + + /* Call malloc with worst case padding to hit alignment. */ + + nb = request2size(bytes); + arena_get(ar_ptr, nb + alignment + MINSIZE); + if(!ar_ptr) + return 0; + p = chunk_alloc(ar_ptr, nb + alignment + MINSIZE); + + if (p == 0) { + (void)mutex_unlock(&ar_ptr->mutex); + return 0; /* propagate failure */ + } + + m = chunk2mem(p); + + if ((((unsigned long)(m)) % alignment) == 0) /* aligned */ + { +#if HAVE_MMAP + if(chunk_is_mmapped(p)) { + (void)mutex_unlock(&ar_ptr->mutex); + return chunk2mem(p); /* nothing more to do */ + } +#endif + } + else /* misaligned */ + { + /* + Find an aligned spot inside chunk. + Since we need to give back leading space in a chunk of at + least MINSIZE, if the first calculation places us at + a spot with less than MINSIZE leader, we can move to the + next aligned spot -- we've allocated enough total room so that + this is always possible. + */ + + brk = (char*)mem2chunk(((unsigned long)(m + alignment - 1)) & -alignment); + if ((long)(brk - (char*)(p)) < (long) MINSIZE) brk = brk + alignment; + + newp = (mchunkptr)brk; + leadsize = brk - (char*)(p); + newsize = chunksize(p) - leadsize; + +#if HAVE_MMAP + if(chunk_is_mmapped(p)) + { + newp->prev_size = p->prev_size + leadsize; + set_head(newp, newsize|IS_MMAPPED); + (void)mutex_unlock(&ar_ptr->mutex); + return chunk2mem(newp); + } +#endif + + /* give back leader, use the rest */ + + set_head(newp, newsize | PREV_INUSE); + set_inuse_bit_at_offset(newp, newsize); + set_head_size(p, leadsize); + chunk_free(ar_ptr, p); + p = newp; + + assert (newsize>=nb && (((unsigned long)(chunk2mem(p))) % alignment) == 0); + } + + /* Also give back spare room at the end */ + + remainder_size = chunksize(p) - nb; + + if (remainder_size >= (long)MINSIZE) + { + remainder = chunk_at_offset(p, nb); + set_head(remainder, remainder_size | PREV_INUSE); + set_head_size(p, nb); + chunk_free(ar_ptr, remainder); + } + + check_inuse_chunk(ar_ptr, p); + (void)mutex_unlock(&ar_ptr->mutex); + return chunk2mem(p); + +} + + + + +/* + valloc just invokes memalign with alignment argument equal + to the page size of the system (or as near to this as can + be figured out from all the includes/defines above.) +*/ + +#if __STD_C +Void_t* vALLOc(size_t bytes) +#else +Void_t* vALLOc(bytes) size_t bytes; +#endif +{ + return mEMALIGn (malloc_getpagesize, bytes); +} + +/* + pvalloc just invokes valloc for the nearest pagesize + that will accommodate request +*/ + + +#if __STD_C +Void_t* pvALLOc(size_t bytes) +#else +Void_t* pvALLOc(bytes) size_t bytes; +#endif +{ + size_t pagesize = malloc_getpagesize; + return mEMALIGn (pagesize, (bytes + pagesize - 1) & ~(pagesize - 1)); +} + +/* + + calloc calls malloc, then zeroes out the allocated chunk. + +*/ + +#if __STD_C +Void_t* cALLOc(size_t n, size_t elem_size) +#else +Void_t* cALLOc(n, elem_size) size_t n; size_t elem_size; +#endif +{ + arena *ar_ptr; + mchunkptr p, oldtop; + INTERNAL_SIZE_T csz, oldtopsize; + Void_t* mem; + + INTERNAL_SIZE_T sz = request2size(n * elem_size); + + arena_get(ar_ptr, sz); + if(!ar_ptr) + return 0; + + /* check if expand_top called, in which case don't need to clear */ +#if MORECORE_CLEARS + oldtop = top(ar_ptr); + oldtopsize = chunksize(top(ar_ptr)); +#endif + p = chunk_alloc (ar_ptr, sz); + + /* Only clearing follows, so we can unlock early. */ + (void)mutex_unlock(&ar_ptr->mutex); + + if (p == 0) + return 0; + else + { + mem = chunk2mem(p); + + /* Two optional cases in which clearing not necessary */ + +#if HAVE_MMAP + if (chunk_is_mmapped(p)) return mem; +#endif + + csz = chunksize(p); + +#if MORECORE_CLEARS + if (p == oldtop && csz > oldtopsize) + { + /* clear only the bytes from non-freshly-sbrked memory */ + csz = oldtopsize; + } +#endif + + MALLOC_ZERO(mem, csz - SIZE_SZ); + return mem; + } +} + +/* + + cfree just calls free. It is needed/defined on some systems + that pair it with calloc, presumably for odd historical reasons. + +*/ + +#if !defined(_LIBC) +#if __STD_C +void cfree(Void_t *mem) +#else +void cfree(mem) Void_t *mem; +#endif +{ + free(mem); +} +#endif + + + +/* + + Malloc_trim gives memory back to the system (via negative + arguments to sbrk) if there is unused memory at the `high' end of + the malloc pool. You can call this after freeing large blocks of + memory to potentially reduce the system-level memory requirements + of a program. However, it cannot guarantee to reduce memory. Under + some allocation patterns, some large free blocks of memory will be + locked between two used chunks, so they cannot be given back to + the system. + + The `pad' argument to malloc_trim represents the amount of free + trailing space to leave untrimmed. If this argument is zero, + only the minimum amount of memory to maintain internal data + structures will be left (one page or less). Non-zero arguments + can be supplied to maintain enough trailing space to service + future expected allocations without having to re-obtain memory + from the system. + + Malloc_trim returns 1 if it actually released any memory, else 0. + +*/ + +#if __STD_C +int malloc_trim(size_t pad) +#else +int malloc_trim(pad) size_t pad; +#endif +{ + int res; + + (void)mutex_lock(&main_arena.mutex); + res = arena_trim(&main_arena, pad); + (void)mutex_unlock(&main_arena.mutex); + return res; +} + +static int +#if __STD_C +arena_trim(arena *ar_ptr, size_t pad) +#else +arena_trim(ar_ptr, pad) arena *ar_ptr; size_t pad; +#endif +{ + mchunkptr top_chunk; /* The current top chunk */ + long top_size; /* Amount of top-most memory */ + long extra; /* Amount to release */ + char* current_brk; /* address returned by pre-check sbrk call */ + char* new_brk; /* address returned by negative sbrk call */ + + unsigned long pagesz = malloc_getpagesize; + + top_chunk = top(ar_ptr); + top_size = chunksize(top_chunk); + extra = ((top_size - pad - MINSIZE + (pagesz-1)) / pagesz - 1) * pagesz; + + if (extra < (long)pagesz) /* Not enough memory to release */ + return 0; + +#ifndef NO_THREADS + if(ar_ptr == &main_arena) { +#endif + + /* Test to make sure no one else called sbrk */ + current_brk = (char*)(MORECORE (0)); + if (current_brk != (char*)(top_chunk) + top_size) + return 0; /* Apparently we don't own memory; must fail */ + + new_brk = (char*)(MORECORE (-extra)); + + if (new_brk == (char*)(MORECORE_FAILURE)) { /* sbrk failed? */ + /* Try to figure out what we have */ + current_brk = (char*)(MORECORE (0)); + top_size = current_brk - (char*)top_chunk; + if (top_size >= (long)MINSIZE) /* if not, we are very very dead! */ + { + sbrked_mem = current_brk - sbrk_base; + set_head(top_chunk, top_size | PREV_INUSE); + } + check_chunk(ar_ptr, top_chunk); + return 0; + } + sbrked_mem -= extra; + +#ifndef NO_THREADS + } else { + if(grow_heap(heap_for_ptr(top_chunk), -extra) != 0) + return 0; + } +#endif + + /* Success. Adjust top accordingly. */ + set_head(top_chunk, (top_size - extra) | PREV_INUSE); + check_chunk(ar_ptr, top_chunk); + return 1; +} + + + +/* + malloc_usable_size: + + This routine tells you how many bytes you can actually use in an + allocated chunk, which may be more than you requested (although + often not). You can use this many bytes without worrying about + overwriting other allocated objects. Not a particularly great + programming practice, but still sometimes useful. + +*/ + +#if __STD_C +size_t malloc_usable_size(Void_t* mem) +#else +size_t malloc_usable_size(mem) Void_t* mem; +#endif +{ + mchunkptr p; + + if (mem == 0) + return 0; + else + { + p = mem2chunk(mem); + if(!chunk_is_mmapped(p)) + { + if (!inuse(p)) return 0; + check_inuse_chunk(arena_for_ptr(mem), p); + return chunksize(p) - SIZE_SZ; + } + return chunksize(p) - 2*SIZE_SZ; + } +} + + + + +/* Utility to update current_mallinfo for malloc_stats and mallinfo() */ + +static void malloc_update_mallinfo __MALLOC_P ((void)) +{ + arena *ar_ptr = &main_arena; + int i, navail; + mbinptr b; + mchunkptr p; +#if MALLOC_DEBUG + mchunkptr q; +#endif + INTERNAL_SIZE_T avail; + + (void)mutex_lock(&ar_ptr->mutex); + avail = chunksize(top(ar_ptr)); + navail = ((long)(avail) >= (long)MINSIZE)? 1 : 0; + + for (i = 1; i < NAV; ++i) + { + b = bin_at(ar_ptr, i); + for (p = last(b); p != b; p = p->bk) + { +#if MALLOC_DEBUG + check_free_chunk(ar_ptr, p); + for (q = next_chunk(p); + q < top(ar_ptr) && inuse(q) && (long)chunksize(q) >= (long)MINSIZE; + q = next_chunk(q)) + check_inuse_chunk(ar_ptr, q); +#endif + avail += chunksize(p); + navail++; + } + } + + current_mallinfo.ordblks = navail; + current_mallinfo.uordblks = sbrked_mem - avail; + current_mallinfo.fordblks = avail; + current_mallinfo.hblks = n_mmaps; + current_mallinfo.hblkhd = mmapped_mem; + current_mallinfo.keepcost = chunksize(top(ar_ptr)); + + (void)mutex_unlock(&ar_ptr->mutex); +} + + + +/* + + malloc_stats: + + Prints on stderr the amount of space obtain from the system (both + via sbrk and mmap), the maximum amount (which may be more than + current if malloc_trim and/or munmap got called), the maximum + number of simultaneous mmap regions used, and the current number + of bytes allocated via malloc (or realloc, etc) but not yet + freed. (Note that this is the number of bytes allocated, not the + number requested. It will be larger than the number requested + because of alignment and bookkeeping overhead.) + +*/ + +void malloc_stats() +{ + malloc_update_mallinfo(); + fprintf(stderr, "max system bytes = %10u\n", + (unsigned int)(max_total_mem)); + fprintf(stderr, "system bytes = %10u\n", + (unsigned int)(sbrked_mem + mmapped_mem)); + fprintf(stderr, "in use bytes = %10u\n", + (unsigned int)(current_mallinfo.uordblks + mmapped_mem)); +#if HAVE_MMAP + fprintf(stderr, "max mmap regions = %10u\n", + (unsigned int)max_n_mmaps); +#endif +#if THREAD_STATS + fprintf(stderr, "arenas created = %10d\n", stat_n_arenas); + fprintf(stderr, "heaps created = %10d\n", stat_n_heaps); + fprintf(stderr, "locked directly = %10ld\n", stat_lock_direct); + fprintf(stderr, "locked in loop = %10ld\n", stat_lock_loop); +#endif +} + +/* + mallinfo returns a copy of updated current mallinfo. +*/ + +struct mallinfo mALLINFo() +{ + malloc_update_mallinfo(); + return current_mallinfo; +} + + + + +/* + mallopt: + + mallopt is the general SVID/XPG interface to tunable parameters. + The format is to provide a (parameter-number, parameter-value) pair. + mallopt then sets the corresponding parameter to the argument + value if it can (i.e., so long as the value is meaningful), + and returns 1 if successful else 0. + + See descriptions of tunable parameters above. + +*/ + +#if __STD_C +int mALLOPt(int param_number, int value) +#else +int mALLOPt(param_number, value) int param_number; int value; +#endif +{ + switch(param_number) + { + case M_TRIM_THRESHOLD: + trim_threshold = value; return 1; + case M_TOP_PAD: + top_pad = value; return 1; + case M_MMAP_THRESHOLD: +#ifndef NO_THREADS + /* Forbid setting the threshold too high. */ + if((unsigned long)value > HEAP_MAX_SIZE/2) return 0; +#endif + mmap_threshold = value; return 1; + case M_MMAP_MAX: +#if HAVE_MMAP + n_mmaps_max = value; return 1; +#else + if (value != 0) return 0; else n_mmaps_max = value; return 1; +#endif + + default: + return 0; + } +} + +#if 0 && defined(_LIBC) +weak_alias (__libc_calloc, calloc) +weak_alias (__libc_free, cfree) +weak_alias (__libc_free, free) +weak_alias (__libc_malloc, malloc) +weak_alias (__libc_memalign, memalign) +weak_alias (__libc_realloc, realloc) +weak_alias (__libc_valloc, valloc) +weak_alias (__libc_pvalloc, pvalloc) +weak_alias (__libc_mallinfo, mallinfo) +weak_alias (__libc_mallopt, mallopt) +#endif + +/* + +History: + + V2.6.4-pt Wed Dec 4 1996 Wolfram Gloger (wmglo@dent.med.uni-muenchen.de) + * Very minor updates from the released 2.6.4 version. + * Trimmed include file down to exported data structures. + * Changes from H.J. Lu for glibc-2.0. + + V2.6.3i-pt Sep 16 1996 Wolfram Gloger (wmglo@dent.med.uni-muenchen.de) + * Many changes for multiple threads + * Introduced arenas and heaps + + V2.6.3 Sun May 19 08:17:58 1996 Doug Lea (dl at gee) + * Added pvalloc, as recommended by H.J. Liu + * Added 64bit pointer support mainly from Wolfram Gloger + * Added anonymously donated WIN32 sbrk emulation + * Malloc, calloc, getpagesize: add optimizations from Raymond Nijssen + * malloc_extend_top: fix mask error that caused wastage after + foreign sbrks + * Add linux mremap support code from HJ Liu + + V2.6.2 Tue Dec 5 06:52:55 1995 Doug Lea (dl at gee) + * Integrated most documentation with the code. + * Add support for mmap, with help from + Wolfram Gloger (Gloger@lrz.uni-muenchen.de). + * Use last_remainder in more cases. + * Pack bins using idea from colin@nyx10.cs.du.edu + * Use ordered bins instead of best-fit threshhold + * Eliminate block-local decls to simplify tracing and debugging. + * Support another case of realloc via move into top + * Fix error occuring when initial sbrk_base not word-aligned. + * Rely on page size for units instead of SBRK_UNIT to + avoid surprises about sbrk alignment conventions. + * Add mallinfo, mallopt. Thanks to Raymond Nijssen + (raymond@es.ele.tue.nl) for the suggestion. + * Add `pad' argument to malloc_trim and top_pad mallopt parameter. + * More precautions for cases where other routines call sbrk, + courtesy of Wolfram Gloger (Gloger@lrz.uni-muenchen.de). + * Added macros etc., allowing use in linux libc from + H.J. Lu (hjl@gnu.ai.mit.edu) + * Inverted this history list + + V2.6.1 Sat Dec 2 14:10:57 1995 Doug Lea (dl at gee) + * Re-tuned and fixed to behave more nicely with V2.6.0 changes. + * Removed all preallocation code since under current scheme + the work required to undo bad preallocations exceeds + the work saved in good cases for most test programs. + * No longer use return list or unconsolidated bins since + no scheme using them consistently outperforms those that don't + given above changes. + * Use best fit for very large chunks to prevent some worst-cases. + * Added some support for debugging + + V2.6.0 Sat Nov 4 07:05:23 1995 Doug Lea (dl at gee) + * Removed footers when chunks are in use. Thanks to + Paul Wilson (wilson@cs.texas.edu) for the suggestion. + + V2.5.4 Wed Nov 1 07:54:51 1995 Doug Lea (dl at gee) + * Added malloc_trim, with help from Wolfram Gloger + (wmglo@Dent.MED.Uni-Muenchen.DE). + + V2.5.3 Tue Apr 26 10:16:01 1994 Doug Lea (dl at g) + + V2.5.2 Tue Apr 5 16:20:40 1994 Doug Lea (dl at g) + * realloc: try to expand in both directions + * malloc: swap order of clean-bin strategy; + * realloc: only conditionally expand backwards + * Try not to scavenge used bins + * Use bin counts as a guide to preallocation + * Occasionally bin return list chunks in first scan + * Add a few optimizations from colin@nyx10.cs.du.edu + + V2.5.1 Sat Aug 14 15:40:43 1993 Doug Lea (dl at g) + * faster bin computation & slightly different binning + * merged all consolidations to one part of malloc proper + (eliminating old malloc_find_space & malloc_clean_bin) + * Scan 2 returns chunks (not just 1) + * Propagate failure in realloc if malloc returns 0 + * Add stuff to allow compilation on non-ANSI compilers + from kpv@research.att.com + + V2.5 Sat Aug 7 07:41:59 1993 Doug Lea (dl at g.oswego.edu) + * removed potential for odd address access in prev_chunk + * removed dependency on getpagesize.h + * misc cosmetics and a bit more internal documentation + * anticosmetics: mangled names in macros to evade debugger strangeness + * tested on sparc, hp-700, dec-mips, rs6000 + with gcc & native cc (hp, dec only) allowing + Detlefs & Zorn comparison study (in SIGPLAN Notices.) + + Trial version Fri Aug 28 13:14:29 1992 Doug Lea (dl at g.oswego.edu) + * Based loosely on libg++-1.2X malloc. (It retains some of the overall + structure of old version, but most details differ.) + +*/ diff --git a/malloc/malloc.h b/malloc/malloc.h new file mode 100644 index 0000000000..57f6e3313d --- /dev/null +++ b/malloc/malloc.h @@ -0,0 +1,169 @@ +/* Prototypes and definition for malloc implementation. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _MALLOC_H +#define _MALLOC_H 1 + +/* + `ptmalloc', a malloc implementation for multiple threads without + lock contention, by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>. + See the files `ptmalloc.c' or `COPYRIGHT' for copying conditions. + + VERSION 2.6.4-pt Wed Dec 4 00:35:54 MET 1996 + + This work is mainly derived from malloc-2.6.4 by Doug Lea + <dl@cs.oswego.edu>, which is available from: + + ftp://g.oswego.edu/pub/misc/malloc.c + + This trimmed-down header file only provides function prototypes and + the exported data structures. For more detailed function + descriptions and compile-time options, see the source file + `ptmalloc.c'. +*/ + +#if defined(__STDC__) || defined (__cplusplus) +#include <stddef.h> +#define __malloc_ptr_t void * +#else +#undef size_t +#define size_t unsigned int +#undef ptrdiff_t +#define ptrdiff_t int +#define __malloc_ptr_t char * +#endif + +#ifdef _LIBC +/* Used by libc internals. */ +#define __malloc_size_t size_t +#define __malloc_ptrdiff_t ptrdiff_t +#endif + +#if defined (__STDC__) || defined (__cplusplus) || defined (__GNUC__) +#define __MALLOC_P(args) args +#else +#define __MALLOC_P(args) () +#endif + +#ifndef NULL +#ifdef __cplusplus +#define NULL 0 +#else +#define NULL ((__malloc_ptr_t) 0) +#endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* Initialize global configuration. Not needed with GNU libc. */ +#ifndef __GLIBC__ +extern void ptmalloc_init __MALLOC_P ((void)); +#endif + +/* Allocate SIZE bytes of memory. */ +extern __malloc_ptr_t malloc __MALLOC_P ((size_t __size)); + +/* Allocate NMEMB elements of SIZE bytes each, all initialized to 0. */ +extern __malloc_ptr_t calloc __MALLOC_P ((size_t __nmemb, size_t __size)); + +/* Re-allocate the previously allocated block in __ptr, making the new + block SIZE bytes long. */ +extern __malloc_ptr_t realloc __MALLOC_P ((__malloc_ptr_t __ptr, size_t __size)); + +/* Free a block allocated by `malloc', `realloc' or `calloc'. */ +extern void free __MALLOC_P ((__malloc_ptr_t __ptr)); + +/* Free a block allocated by `calloc'. */ +extern void cfree __MALLOC_P ((__malloc_ptr_t __ptr)); + +/* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ +extern __malloc_ptr_t memalign __MALLOC_P ((size_t __alignment, size_t __size)); + +/* Allocate SIZE bytes on a page boundary. */ +extern __malloc_ptr_t valloc __MALLOC_P ((size_t __size)); + +/* Equivalent to valloc(minimum-page-that-holds(n)), that is, round up + __size to nearest pagesize. */ +extern __malloc_ptr_t pvalloc __MALLOC_P ((size_t __size)); + +/* Underlying allocation function; successive calls should return + contiguous pieces of memory. */ +extern __malloc_ptr_t (*__morecore) __MALLOC_P ((ptrdiff_t __size)); + +/* Default value of `__morecore'. */ +extern __malloc_ptr_t __default_morecore __MALLOC_P ((ptrdiff_t __size)); + +/* SVID2/XPG mallinfo structure */ +struct mallinfo { + int arena; /* total space allocated from system */ + int ordblks; /* number of non-inuse chunks */ + int smblks; /* unused -- always zero */ + int hblks; /* number of mmapped regions */ + int hblkhd; /* total space in mmapped regions */ + int usmblks; /* unused -- always zero */ + int fsmblks; /* unused -- always zero */ + int uordblks; /* total allocated space */ + int fordblks; /* total non-inuse space */ + int keepcost; /* top-most, releasable (via malloc_trim) space */ +}; + +/* Returns a copy of the updated current mallinfo. */ +extern struct mallinfo mallinfo __MALLOC_P ((void)); + +/* SVID2/XPG mallopt options */ +#ifndef M_MXFAST +#define M_MXFAST 1 /* UNUSED in this malloc */ +#endif +#ifndef M_NLBLKS +#define M_NLBLKS 2 /* UNUSED in this malloc */ +#endif +#ifndef M_GRAIN +#define M_GRAIN 3 /* UNUSED in this malloc */ +#endif +#ifndef M_KEEP +#define M_KEEP 4 /* UNUSED in this malloc */ +#endif + +/* mallopt options that actually do something */ +#define M_TRIM_THRESHOLD -1 +#define M_TOP_PAD -2 +#define M_MMAP_THRESHOLD -3 +#define M_MMAP_MAX -4 + +/* General SVID/XPG interface to tunable parameters. */ +extern int mallopt __MALLOC_P ((int __param, int __val)); + +/* Release all but __pad bytes of freed top-most memory back to the + system. Return 1 if successful, else 0. */ +extern int malloc_trim __MALLOC_P ((size_t __pad)); + +/* Report the number of usable allocated bytes associated with allocated + chunk __ptr. */ +extern size_t malloc_usable_size __MALLOC_P ((__malloc_ptr_t __ptr)); + +/* Prints brief summary statistics on stderr. */ +extern void malloc_stats __MALLOC_P ((void)); + +#ifdef __cplusplus +}; /* end of extern "C" */ +#endif + +#endif /* !defined(_PTMALLOC_H_) */ diff --git a/malloc/mallocbug.c b/malloc/mallocbug.c new file mode 100644 index 0000000000..84a6387954 --- /dev/null +++ b/malloc/mallocbug.c @@ -0,0 +1,67 @@ +/* Reproduce a GNU malloc bug. */ +#include <malloc.h> +#include <stdio.h> +#include <string.h> + +#define size_t unsigned int + +int +main (int argc, char *argv[]) +{ + char *dummy0; + char *dummy1; + char *fill_info_table1; + char *over_top; + size_t over_top_size = 0x3000; + char *over_top_dup; + size_t over_top_dup_size = 0x7000; + char *x; + size_t i; + + /* Here's what memory is supposed to look like (hex): + size contents + 3000 original_info_table, later fill_info_table1 + 3fa000 dummy0 + 3fa000 dummy1 + 6000 info_table_2 + 3000 over_top + + */ + /* mem: original_info_table */ + dummy0 = malloc (0x3fa000); + /* mem: original_info_table, dummy0 */ + dummy1 = malloc (0x3fa000); + /* mem: free, dummy0, dummy1, info_table_2 */ + fill_info_table1 = malloc (0x3000); + /* mem: fill_info_table1, dummy0, dummy1, info_table_2 */ + + x = malloc (0x1000); + free (x); + /* mem: fill_info_table1, dummy0, dummy1, info_table_2, freexx */ + + /* This is what loses; info_table_2 and freexx get combined unbeknownst + to mmalloc, and mmalloc puts over_top in a section of memory which + is on the free list as part of another block (where info_table_2 had + been). */ + over_top = malloc (over_top_size); + over_top_dup = malloc (over_top_dup_size); + memset (over_top, 0, over_top_size); + memset (over_top_dup, 1, over_top_dup_size); + + for (i = 0; i < over_top_size; ++i) + if (over_top[i] != 0) + { + printf ("FAIL: malloc expands info table\n"); + return 0; + } + + for (i = 0; i < over_top_dup_size; ++i) + if (over_top_dup[i] != 1) + { + printf ("FAIL: malloc expands info table\n"); + return 0; + } + + printf ("PASS: malloc expands info table\n"); + return 0; +} diff --git a/malloc/obstack.c b/malloc/obstack.c new file mode 100644 index 0000000000..cc4147836e --- /dev/null +++ b/malloc/obstack.c @@ -0,0 +1,551 @@ +/* obstack.c - subroutines used implicitly by object stack macros + Copyright (C) 1988,89,90,91,92,93,94,96 Free Software Foundation, Inc. + + This file is part of the GNU C Library. Its master source is NOT part of + the C library, however. The master source lives in /gd/gnu/lib. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "obstack.h" + +/* NOTE BEFORE MODIFYING THIS FILE: This version number must be + incremented whenever callers compiled using an old obstack.h can no + longer properly call the functions in this obstack.c. */ +#define OBSTACK_INTERFACE_VERSION 2 + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself, and the installed library + supports the same library interface we do. This code is part of the GNU + C Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object + files, it is simpler to just do this in the source for each such file. */ + +#include <stdio.h> /* Random thing to get __GNU_LIBRARY__. */ +#if !defined (_LIBC) && defined (__GNU_LIBRARY__) && __GNU_LIBRARY__ > 1 +#include <gnu-versions.h> +#if _GNU_OBSTACK_INTERFACE_VERSION == OBSTACK_INTERFACE_VERSION +#define ELIDE_CODE +#endif +#endif + + +#ifndef ELIDE_CODE + + +#if defined (__STDC__) && __STDC__ +#define POINTER void * +#else +#define POINTER char * +#endif + +/* Determine default alignment. */ +struct fooalign {char x; double d;}; +#define DEFAULT_ALIGNMENT \ + ((PTR_INT_TYPE) ((char *) &((struct fooalign *) 0)->d - (char *) 0)) +/* If malloc were really smart, it would round addresses to DEFAULT_ALIGNMENT. + But in fact it might be less smart and round addresses to as much as + DEFAULT_ROUNDING. So we prepare for it to do that. */ +union fooround {long x; double d;}; +#define DEFAULT_ROUNDING (sizeof (union fooround)) + +/* When we copy a long block of data, this is the unit to do it with. + On some machines, copying successive ints does not work; + in such a case, redefine COPYING_UNIT to `long' (if that works) + or `char' as a last resort. */ +#ifndef COPYING_UNIT +#define COPYING_UNIT int +#endif + + +/* The functions allocating more room by calling `obstack_chunk_alloc' + jump to the handler pointed to by `obstack_alloc_failed_handler'. + This variable by default points to the internal function + `print_and_abort'. */ +#if defined (__STDC__) && __STDC__ +static void print_and_abort (void); +void (*obstack_alloc_failed_handler) (void) = print_and_abort; +#else +static void print_and_abort (); +void (*obstack_alloc_failed_handler) () = print_and_abort; +#endif + +/* Exit value used when `print_and_abort' is used. */ +#if defined (__STDC__) && __STDC__ +#include <stdlib.h> +#endif +#ifndef EXIT_FAILURE +#define EXIT_FAILURE 1 +#endif +int obstack_exit_failure = EXIT_FAILURE; + +/* The non-GNU-C macros copy the obstack into this global variable + to avoid multiple evaluation. */ + +struct obstack *_obstack; + +/* Define a macro that either calls functions with the traditional malloc/free + calling interface, or calls functions with the mmalloc/mfree interface + (that adds an extra first argument), based on the state of use_extra_arg. + For free, do not use ?:, since some compilers, like the MIPS compilers, + do not allow (expr) ? void : void. */ + +#define CALL_CHUNKFUN(h, size) \ + (((h) -> use_extra_arg) \ + ? (*(h)->chunkfun) ((h)->extra_arg, (size)) \ + : (*(struct _obstack_chunk *(*) ()) (h)->chunkfun) ((size))) + +#define CALL_FREEFUN(h, old_chunk) \ + do { \ + if ((h) -> use_extra_arg) \ + (*(h)->freefun) ((h)->extra_arg, (old_chunk)); \ + else \ + (*(void (*) ()) (h)->freefun) ((old_chunk)); \ + } while (0) + + +/* Initialize an obstack H for use. Specify chunk size SIZE (0 means default). + Objects start on multiples of ALIGNMENT (0 means use default). + CHUNKFUN is the function to use to allocate chunks, + and FREEFUN the function to free them. + + Return nonzero if successful, zero if out of memory. + To recover from an out of memory error, + free up some memory, then call this again. */ + +int +_obstack_begin (h, size, alignment, chunkfun, freefun) + struct obstack *h; + int size; + int alignment; + POINTER (*chunkfun) (); + void (*freefun) (); +{ + register struct _obstack_chunk *chunk; /* points to new chunk */ + + if (alignment == 0) + alignment = DEFAULT_ALIGNMENT; + if (size == 0) + /* Default size is what GNU malloc can fit in a 4096-byte block. */ + { + /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc. + Use the values for range checking, because if range checking is off, + the extra bytes won't be missed terribly, but if range checking is on + and we used a larger request, a whole extra 4096 bytes would be + allocated. + + These number are irrelevant to the new GNU malloc. I suspect it is + less sensitive to the size of the request. */ + int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1)) + + 4 + DEFAULT_ROUNDING - 1) + & ~(DEFAULT_ROUNDING - 1)); + size = 4096 - extra; + } + + h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun; + h->freefun = freefun; + h->chunk_size = size; + h->alignment_mask = alignment - 1; + h->use_extra_arg = 0; + + chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size); + if (!chunk) + (*obstack_alloc_failed_handler) (); + h->next_free = h->object_base = chunk->contents; + h->chunk_limit = chunk->limit + = (char *) chunk + h->chunk_size; + chunk->prev = 0; + /* The initial chunk now contains no empty object. */ + h->maybe_empty_object = 0; + return 1; +} + +int +_obstack_begin_1 (h, size, alignment, chunkfun, freefun, arg) + struct obstack *h; + int size; + int alignment; + POINTER (*chunkfun) (); + void (*freefun) (); + POINTER arg; +{ + register struct _obstack_chunk *chunk; /* points to new chunk */ + + if (alignment == 0) + alignment = DEFAULT_ALIGNMENT; + if (size == 0) + /* Default size is what GNU malloc can fit in a 4096-byte block. */ + { + /* 12 is sizeof (mhead) and 4 is EXTRA from GNU malloc. + Use the values for range checking, because if range checking is off, + the extra bytes won't be missed terribly, but if range checking is on + and we used a larger request, a whole extra 4096 bytes would be + allocated. + + These number are irrelevant to the new GNU malloc. I suspect it is + less sensitive to the size of the request. */ + int extra = ((((12 + DEFAULT_ROUNDING - 1) & ~(DEFAULT_ROUNDING - 1)) + + 4 + DEFAULT_ROUNDING - 1) + & ~(DEFAULT_ROUNDING - 1)); + size = 4096 - extra; + } + + h->chunkfun = (struct _obstack_chunk * (*)()) chunkfun; + h->freefun = freefun; + h->chunk_size = size; + h->alignment_mask = alignment - 1; + h->extra_arg = arg; + h->use_extra_arg = 1; + + chunk = h->chunk = CALL_CHUNKFUN (h, h -> chunk_size); + if (!chunk) + (*obstack_alloc_failed_handler) (); + h->next_free = h->object_base = chunk->contents; + h->chunk_limit = chunk->limit + = (char *) chunk + h->chunk_size; + chunk->prev = 0; + /* The initial chunk now contains no empty object. */ + h->maybe_empty_object = 0; + return 1; +} + +/* Allocate a new current chunk for the obstack *H + on the assumption that LENGTH bytes need to be added + to the current object, or a new object of length LENGTH allocated. + Copies any partial object from the end of the old chunk + to the beginning of the new one. */ + +void +_obstack_newchunk (h, length) + struct obstack *h; + int length; +{ + register struct _obstack_chunk *old_chunk = h->chunk; + register struct _obstack_chunk *new_chunk; + register long new_size; + register int obj_size = h->next_free - h->object_base; + register int i; + int already; + + /* Compute size for new chunk. */ + new_size = (obj_size + length) + (obj_size >> 3) + 100; + if (new_size < h->chunk_size) + new_size = h->chunk_size; + + /* Allocate and initialize the new chunk. */ + new_chunk = CALL_CHUNKFUN (h, new_size); + if (!new_chunk) + (*obstack_alloc_failed_handler) (); + h->chunk = new_chunk; + new_chunk->prev = old_chunk; + new_chunk->limit = h->chunk_limit = (char *) new_chunk + new_size; + + /* Move the existing object to the new chunk. + Word at a time is fast and is safe if the object + is sufficiently aligned. */ + if (h->alignment_mask + 1 >= DEFAULT_ALIGNMENT) + { + for (i = obj_size / sizeof (COPYING_UNIT) - 1; + i >= 0; i--) + ((COPYING_UNIT *)new_chunk->contents)[i] + = ((COPYING_UNIT *)h->object_base)[i]; + /* We used to copy the odd few remaining bytes as one extra COPYING_UNIT, + but that can cross a page boundary on a machine + which does not do strict alignment for COPYING_UNITS. */ + already = obj_size / sizeof (COPYING_UNIT) * sizeof (COPYING_UNIT); + } + else + already = 0; + /* Copy remaining bytes one by one. */ + for (i = already; i < obj_size; i++) + new_chunk->contents[i] = h->object_base[i]; + + /* If the object just copied was the only data in OLD_CHUNK, + free that chunk and remove it from the chain. + But not if that chunk might contain an empty object. */ + if (h->object_base == old_chunk->contents && ! h->maybe_empty_object) + { + new_chunk->prev = old_chunk->prev; + CALL_FREEFUN (h, old_chunk); + } + + h->object_base = new_chunk->contents; + h->next_free = h->object_base + obj_size; + /* The new chunk certainly contains no empty object yet. */ + h->maybe_empty_object = 0; +} + +/* Return nonzero if object OBJ has been allocated from obstack H. + This is here for debugging. + If you use it in a program, you are probably losing. */ + +#if defined (__STDC__) && __STDC__ +/* Suppress -Wmissing-prototypes warning. We don't want to declare this in + obstack.h because it is just for debugging. */ +int _obstack_allocated_p (struct obstack *h, POINTER obj); +#endif + +int +_obstack_allocated_p (h, obj) + struct obstack *h; + POINTER obj; +{ + register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ + register struct _obstack_chunk *plp; /* point to previous chunk if any */ + + lp = (h)->chunk; + /* We use >= rather than > since the object cannot be exactly at + the beginning of the chunk but might be an empty object exactly + at the end of an adjacent chunk. */ + while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) + { + plp = lp->prev; + lp = plp; + } + return lp != 0; +} + +/* Free objects in obstack H, including OBJ and everything allocate + more recently than OBJ. If OBJ is zero, free everything in H. */ + +#undef obstack_free + +/* This function has two names with identical definitions. + This is the first one, called from non-ANSI code. */ + +void +_obstack_free (h, obj) + struct obstack *h; + POINTER obj; +{ + register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ + register struct _obstack_chunk *plp; /* point to previous chunk if any */ + + lp = h->chunk; + /* We use >= because there cannot be an object at the beginning of a chunk. + But there can be an empty object at that address + at the end of another chunk. */ + while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) + { + plp = lp->prev; + CALL_FREEFUN (h, lp); + lp = plp; + /* If we switch chunks, we can't tell whether the new current + chunk contains an empty object, so assume that it may. */ + h->maybe_empty_object = 1; + } + if (lp) + { + h->object_base = h->next_free = (char *) (obj); + h->chunk_limit = lp->limit; + h->chunk = lp; + } + else if (obj != 0) + /* obj is not in any of the chunks! */ + abort (); +} + +/* This function is used from ANSI code. */ + +void +obstack_free (h, obj) + struct obstack *h; + POINTER obj; +{ + register struct _obstack_chunk *lp; /* below addr of any objects in this chunk */ + register struct _obstack_chunk *plp; /* point to previous chunk if any */ + + lp = h->chunk; + /* We use >= because there cannot be an object at the beginning of a chunk. + But there can be an empty object at that address + at the end of another chunk. */ + while (lp != 0 && ((POINTER) lp >= obj || (POINTER) (lp)->limit < obj)) + { + plp = lp->prev; + CALL_FREEFUN (h, lp); + lp = plp; + /* If we switch chunks, we can't tell whether the new current + chunk contains an empty object, so assume that it may. */ + h->maybe_empty_object = 1; + } + if (lp) + { + h->object_base = h->next_free = (char *) (obj); + h->chunk_limit = lp->limit; + h->chunk = lp; + } + else if (obj != 0) + /* obj is not in any of the chunks! */ + abort (); +} + +int +_obstack_memory_used (h) + struct obstack *h; +{ + register struct _obstack_chunk* lp; + register int nbytes = 0; + + for (lp = h->chunk; lp != 0; lp = lp->prev) + { + nbytes += lp->limit - (char *) lp; + } + return nbytes; +} + +/* Define the error handler. */ +#ifndef _ +# ifdef HAVE_LIBINTL_H +# include <libintl.h> +# ifndef _ +# define _(Str) gettext (Str) +# endif +# else +# define _(Str) (Str) +# endif +#endif + +static void +print_and_abort () +{ + fputs (_("memory exhausted\n"), stderr); + exit (obstack_exit_failure); +} + +#if 0 +/* These are now turned off because the applications do not use it + and it uses bcopy via obstack_grow, which causes trouble on sysV. */ + +/* Now define the functional versions of the obstack macros. + Define them to simply use the corresponding macros to do the job. */ + +#if defined (__STDC__) && __STDC__ +/* These function definitions do not work with non-ANSI preprocessors; + they won't pass through the macro names in parentheses. */ + +/* The function names appear in parentheses in order to prevent + the macro-definitions of the names from being expanded there. */ + +POINTER (obstack_base) (obstack) + struct obstack *obstack; +{ + return obstack_base (obstack); +} + +POINTER (obstack_next_free) (obstack) + struct obstack *obstack; +{ + return obstack_next_free (obstack); +} + +int (obstack_object_size) (obstack) + struct obstack *obstack; +{ + return obstack_object_size (obstack); +} + +int (obstack_room) (obstack) + struct obstack *obstack; +{ + return obstack_room (obstack); +} + +int (obstack_make_room) (obstack, length) + struct obstack *obstack; + int length; +{ + return obstack_make_room (obstack, length); +} + +void (obstack_grow) (obstack, pointer, length) + struct obstack *obstack; + POINTER pointer; + int length; +{ + obstack_grow (obstack, pointer, length); +} + +void (obstack_grow0) (obstack, pointer, length) + struct obstack *obstack; + POINTER pointer; + int length; +{ + obstack_grow0 (obstack, pointer, length); +} + +void (obstack_1grow) (obstack, character) + struct obstack *obstack; + int character; +{ + obstack_1grow (obstack, character); +} + +void (obstack_blank) (obstack, length) + struct obstack *obstack; + int length; +{ + obstack_blank (obstack, length); +} + +void (obstack_1grow_fast) (obstack, character) + struct obstack *obstack; + int character; +{ + obstack_1grow_fast (obstack, character); +} + +void (obstack_blank_fast) (obstack, length) + struct obstack *obstack; + int length; +{ + obstack_blank_fast (obstack, length); +} + +POINTER (obstack_finish) (obstack) + struct obstack *obstack; +{ + return obstack_finish (obstack); +} + +POINTER (obstack_alloc) (obstack, length) + struct obstack *obstack; + int length; +{ + return obstack_alloc (obstack, length); +} + +POINTER (obstack_copy) (obstack, pointer, length) + struct obstack *obstack; + POINTER pointer; + int length; +{ + return obstack_copy (obstack, pointer, length); +} + +POINTER (obstack_copy0) (obstack, pointer, length) + struct obstack *obstack; + POINTER pointer; + int length; +{ + return obstack_copy0 (obstack, pointer, length); +} + +#endif /* __STDC__ */ + +#endif /* 0 */ + +#endif /* !ELIDE_CODE */ diff --git a/malloc/obstack.h b/malloc/obstack.h new file mode 100644 index 0000000000..152fbbc655 --- /dev/null +++ b/malloc/obstack.h @@ -0,0 +1,575 @@ +/* obstack.h - object stack macros + Copyright (C) 1988,89,90,91,92,93,94,96 Free Software Foundation, Inc. + + This file is part of the GNU C Library. Its master source is NOT part of + the C library, however. The master source lives in /gd/gnu/lib. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* Summary: + +All the apparent functions defined here are macros. The idea +is that you would use these pre-tested macros to solve a +very specific set of problems, and they would run fast. +Caution: no side-effects in arguments please!! They may be +evaluated MANY times!! + +These macros operate a stack of objects. Each object starts life +small, and may grow to maturity. (Consider building a word syllable +by syllable.) An object can move while it is growing. Once it has +been "finished" it never changes address again. So the "top of the +stack" is typically an immature growing object, while the rest of the +stack is of mature, fixed size and fixed address objects. + +These routines grab large chunks of memory, using a function you +supply, called `obstack_chunk_alloc'. On occasion, they free chunks, +by calling `obstack_chunk_free'. You must define them and declare +them before using any obstack macros. + +Each independent stack is represented by a `struct obstack'. +Each of the obstack macros expects a pointer to such a structure +as the first argument. + +One motivation for this package is the problem of growing char strings +in symbol tables. Unless you are "fascist pig with a read-only mind" +--Gosper's immortal quote from HAKMEM item 154, out of context--you +would not like to put any arbitrary upper limit on the length of your +symbols. + +In practice this often means you will build many short symbols and a +few long symbols. At the time you are reading a symbol you don't know +how long it is. One traditional method is to read a symbol into a +buffer, realloc()ating the buffer every time you try to read a symbol +that is longer than the buffer. This is beaut, but you still will +want to copy the symbol from the buffer to a more permanent +symbol-table entry say about half the time. + +With obstacks, you can work differently. Use one obstack for all symbol +names. As you read a symbol, grow the name in the obstack gradually. +When the name is complete, finalize it. Then, if the symbol exists already, +free the newly read name. + +The way we do this is to take a large chunk, allocating memory from +low addresses. When you want to build a symbol in the chunk you just +add chars above the current "high water mark" in the chunk. When you +have finished adding chars, because you got to the end of the symbol, +you know how long the chars are, and you can create a new object. +Mostly the chars will not burst over the highest address of the chunk, +because you would typically expect a chunk to be (say) 100 times as +long as an average object. + +In case that isn't clear, when we have enough chars to make up +the object, THEY ARE ALREADY CONTIGUOUS IN THE CHUNK (guaranteed) +so we just point to it where it lies. No moving of chars is +needed and this is the second win: potentially long strings need +never be explicitly shuffled. Once an object is formed, it does not +change its address during its lifetime. + +When the chars burst over a chunk boundary, we allocate a larger +chunk, and then copy the partly formed object from the end of the old +chunk to the beginning of the new larger chunk. We then carry on +accreting characters to the end of the object as we normally would. + +A special macro is provided to add a single char at a time to a +growing object. This allows the use of register variables, which +break the ordinary 'growth' macro. + +Summary: + We allocate large chunks. + We carve out one object at a time from the current chunk. + Once carved, an object never moves. + We are free to append data of any size to the currently + growing object. + Exactly one object is growing in an obstack at any one time. + You can run one obstack per control block. + You may have as many control blocks as you dare. + Because of the way we do it, you can `unwind' an obstack + back to a previous state. (You may remove objects much + as you would with a stack.) +*/ + + +/* Don't do the contents of this file more than once. */ + +#ifndef __OBSTACK_H__ +#define __OBSTACK_H__ + +/* We use subtraction of (char *) 0 instead of casting to int + because on word-addressable machines a simple cast to int + may ignore the byte-within-word field of the pointer. */ + +#ifndef __PTR_TO_INT +#define __PTR_TO_INT(P) ((P) - (char *) 0) +#endif + +#ifndef __INT_TO_PTR +#define __INT_TO_PTR(P) ((P) + (char *) 0) +#endif + +/* We need the type of the resulting object. In ANSI C it is ptrdiff_t + but in traditional C it is usually long. If we are in ANSI C and + don't already have ptrdiff_t get it. */ + +#if defined (__STDC__) && __STDC__ && ! defined (offsetof) +#if defined (__GNUC__) && defined (IN_GCC) +/* On Next machine, the system's stddef.h screws up if included + after we have defined just ptrdiff_t, so include all of stddef.h. + Otherwise, define just ptrdiff_t, which is all we need. */ +#ifndef __NeXT__ +#define __need_ptrdiff_t +#endif +#endif + +#include <stddef.h> +#endif + +#if defined (__STDC__) && __STDC__ +#define PTR_INT_TYPE ptrdiff_t +#else +#define PTR_INT_TYPE long +#endif + +#if defined (_LIBC) || defined (HAVE_STRING_H) +#include <string.h> +#else +#ifndef memcpy +#define memcpy(To, From, N) bcopy (From, To, N) +#endif +#endif + +struct _obstack_chunk /* Lives at front of each chunk. */ +{ + char *limit; /* 1 past end of this chunk */ + struct _obstack_chunk *prev; /* address of prior chunk or NULL */ + char contents[4]; /* objects begin here */ +}; + +struct obstack /* control current object in current chunk */ +{ + long chunk_size; /* preferred size to allocate chunks in */ + struct _obstack_chunk *chunk; /* address of current struct obstack_chunk */ + char *object_base; /* address of object we are building */ + char *next_free; /* where to add next char to current object */ + char *chunk_limit; /* address of char after current chunk */ + PTR_INT_TYPE temp; /* Temporary for some macros. */ + int alignment_mask; /* Mask of alignment for each object. */ +#if defined (__STDC__) && __STDC__ + /* These prototypes vary based on `use_extra_arg', and we use + casts to the prototypeless function type in all assignments, + but having prototypes here quiets -Wstrict-prototypes. */ + struct _obstack_chunk *(*chunkfun) (void *, long); + void (*freefun) (void *, struct _obstack_chunk *); + void *extra_arg; /* first arg for chunk alloc/dealloc funcs */ +#else + struct _obstack_chunk *(*chunkfun) (); /* User's fcn to allocate a chunk. */ + void (*freefun) (); /* User's function to free a chunk. */ + char *extra_arg; /* first arg for chunk alloc/dealloc funcs */ +#endif + unsigned use_extra_arg:1; /* chunk alloc/dealloc funcs take extra arg */ + unsigned maybe_empty_object:1;/* There is a possibility that the current + chunk contains a zero-length object. This + prevents freeing the chunk if we allocate + a bigger chunk to replace it. */ +}; + +/* Declare the external functions we use; they are in obstack.c. */ + +#if defined (__STDC__) && __STDC__ +extern void _obstack_newchunk (struct obstack *, int); +extern void _obstack_free (struct obstack *, void *); +extern int _obstack_begin (struct obstack *, int, int, + void *(*) (long), void (*) (void *)); +extern int _obstack_begin_1 (struct obstack *, int, int, + void *(*) (void *, long), + void (*) (void *, void *), void *); +extern int _obstack_memory_used (struct obstack *); +#else +extern void _obstack_newchunk (); +extern void _obstack_free (); +extern int _obstack_begin (); +extern int _obstack_begin_1 (); +extern int _obstack_memory_used (); +#endif + +#if defined (__STDC__) && __STDC__ + +/* Do the function-declarations after the structs + but before defining the macros. */ + +void obstack_init (struct obstack *obstack); + +void * obstack_alloc (struct obstack *obstack, int size); + +void * obstack_copy (struct obstack *obstack, void *address, int size); +void * obstack_copy0 (struct obstack *obstack, void *address, int size); + +void obstack_free (struct obstack *obstack, void *block); + +void obstack_blank (struct obstack *obstack, int size); + +void obstack_grow (struct obstack *obstack, void *data, int size); +void obstack_grow0 (struct obstack *obstack, void *data, int size); + +void obstack_1grow (struct obstack *obstack, int data_char); +void obstack_ptr_grow (struct obstack *obstack, void *data); +void obstack_int_grow (struct obstack *obstack, int data); + +void * obstack_finish (struct obstack *obstack); + +int obstack_object_size (struct obstack *obstack); + +int obstack_room (struct obstack *obstack); +void obstack_make_room (struct obstack *obstack, int size); +void obstack_1grow_fast (struct obstack *obstack, int data_char); +void obstack_ptr_grow_fast (struct obstack *obstack, void *data); +void obstack_int_grow_fast (struct obstack *obstack, int data); +void obstack_blank_fast (struct obstack *obstack, int size); + +void * obstack_base (struct obstack *obstack); +void * obstack_next_free (struct obstack *obstack); +int obstack_alignment_mask (struct obstack *obstack); +int obstack_chunk_size (struct obstack *obstack); +int obstack_memory_used (struct obstack *obstack); + +#endif /* __STDC__ */ + +/* Non-ANSI C cannot really support alternative functions for these macros, + so we do not declare them. */ + +/* Error handler called when `obstack_chunk_alloc' failed to allocate + more memory. This can be set to a user defined function. The + default action is to print a message and abort. */ +#if defined (__STDC__) && __STDC__ +extern void (*obstack_alloc_failed_handler) (void); +#else +extern void (*obstack_alloc_failed_handler) (); +#endif + +/* Exit value used when `print_and_abort' is used. */ +extern int obstack_exit_failure; + +/* Pointer to beginning of object being allocated or to be allocated next. + Note that this might not be the final address of the object + because a new chunk might be needed to hold the final size. */ + +#define obstack_base(h) ((h)->object_base) + +/* Size for allocating ordinary chunks. */ + +#define obstack_chunk_size(h) ((h)->chunk_size) + +/* Pointer to next byte not yet allocated in current chunk. */ + +#define obstack_next_free(h) ((h)->next_free) + +/* Mask specifying low bits that should be clear in address of an object. */ + +#define obstack_alignment_mask(h) ((h)->alignment_mask) + +/* To prevent prototype warnings provide complete argument list in + standard C version. */ +#if defined (__STDC__) && __STDC__ + +#define obstack_init(h) \ + _obstack_begin ((h), 0, 0, \ + (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free) + +#define obstack_begin(h, size) \ + _obstack_begin ((h), (size), 0, \ + (void *(*) (long)) obstack_chunk_alloc, (void (*) (void *)) obstack_chunk_free) + +#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ + _obstack_begin ((h), (size), (alignment), \ + (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun)) + +#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ + _obstack_begin_1 ((h), (size), (alignment), \ + (void *(*) (long)) (chunkfun), (void (*) (void *)) (freefun), (arg)) + +#define obstack_chunkfun(h, newchunkfun) \ + ((h) -> chunkfun = (struct _obstack_chunk *(*)(long)) (newchunkfun)) + +#define obstack_freefun(h, newfreefun) \ + ((h) -> freefun = (void (*)(void *)) (newfreefun)) + +#else + +#define obstack_init(h) \ + _obstack_begin ((h), 0, 0, \ + (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free) + +#define obstack_begin(h, size) \ + _obstack_begin ((h), (size), 0, \ + (void *(*) ()) obstack_chunk_alloc, (void (*) ()) obstack_chunk_free) + +#define obstack_specify_allocation(h, size, alignment, chunkfun, freefun) \ + _obstack_begin ((h), (size), (alignment), \ + (void *(*) ()) (chunkfun), (void (*) ()) (freefun)) + +#define obstack_specify_allocation_with_arg(h, size, alignment, chunkfun, freefun, arg) \ + _obstack_begin_1 ((h), (size), (alignment), \ + (void *(*) ()) (chunkfun), (void (*) ()) (freefun), (arg)) + +#define obstack_chunkfun(h, newchunkfun) \ + ((h) -> chunkfun = (struct _obstack_chunk *(*)()) (newchunkfun)) + +#define obstack_freefun(h, newfreefun) \ + ((h) -> freefun = (void (*)()) (newfreefun)) + +#endif + +#define obstack_1grow_fast(h,achar) (*((h)->next_free)++ = achar) + +#define obstack_blank_fast(h,n) ((h)->next_free += (n)) + +#define obstack_memory_used(h) _obstack_memory_used (h) + +#if defined (__GNUC__) && defined (__STDC__) && __STDC__ +/* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and + does not implement __extension__. But that compiler doesn't define + __GNUC_MINOR__. */ +#if __GNUC__ < 2 || (__NeXT__ && !__GNUC_MINOR__) +#define __extension__ +#endif + +/* For GNU C, if not -traditional, + we can define these macros to compute all args only once + without using a global variable. + Also, we can avoid using the `temp' slot, to make faster code. */ + +#define obstack_object_size(OBSTACK) \ + __extension__ \ + ({ struct obstack *__o = (OBSTACK); \ + (unsigned) (__o->next_free - __o->object_base); }) + +#define obstack_room(OBSTACK) \ + __extension__ \ + ({ struct obstack *__o = (OBSTACK); \ + (unsigned) (__o->chunk_limit - __o->next_free); }) + +#define obstack_make_room(OBSTACK,length) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + int __len = (length); \ + if (__o->chunk_limit - __o->next_free < __len) \ + _obstack_newchunk (__o, __len); \ + (void) 0; }) + +#define obstack_grow(OBSTACK,where,length) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + int __len = (length); \ + if (__o->next_free + __len > __o->chunk_limit) \ + _obstack_newchunk (__o, __len); \ + memcpy (__o->next_free, (char *) (where), __len); \ + __o->next_free += __len; \ + (void) 0; }) + +#define obstack_grow0(OBSTACK,where,length) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + int __len = (length); \ + if (__o->next_free + __len + 1 > __o->chunk_limit) \ + _obstack_newchunk (__o, __len + 1); \ + memcpy (__o->next_free, (char *) (where), __len); \ + __o->next_free += __len; \ + *(__o->next_free)++ = 0; \ + (void) 0; }) + +#define obstack_1grow(OBSTACK,datum) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + 1 > __o->chunk_limit) \ + _obstack_newchunk (__o, 1); \ + *(__o->next_free)++ = (datum); \ + (void) 0; }) + +/* These assume that the obstack alignment is good enough for pointers or ints, + and that the data added so far to the current object + shares that much alignment. */ + +#define obstack_ptr_grow(OBSTACK,datum) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + sizeof (void *) > __o->chunk_limit) \ + _obstack_newchunk (__o, sizeof (void *)); \ + *((void **)__o->next_free)++ = ((void *)datum); \ + (void) 0; }) + +#define obstack_int_grow(OBSTACK,datum) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + if (__o->next_free + sizeof (int) > __o->chunk_limit) \ + _obstack_newchunk (__o, sizeof (int)); \ + *((int *)__o->next_free)++ = ((int)datum); \ + (void) 0; }) + +#define obstack_ptr_grow_fast(h,aptr) (*((void **) (h)->next_free)++ = (void *)aptr) +#define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) + +#define obstack_blank(OBSTACK,length) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + int __len = (length); \ + if (__o->chunk_limit - __o->next_free < __len) \ + _obstack_newchunk (__o, __len); \ + __o->next_free += __len; \ + (void) 0; }) + +#define obstack_alloc(OBSTACK,length) \ +__extension__ \ +({ struct obstack *__h = (OBSTACK); \ + obstack_blank (__h, (length)); \ + obstack_finish (__h); }) + +#define obstack_copy(OBSTACK,where,length) \ +__extension__ \ +({ struct obstack *__h = (OBSTACK); \ + obstack_grow (__h, (where), (length)); \ + obstack_finish (__h); }) + +#define obstack_copy0(OBSTACK,where,length) \ +__extension__ \ +({ struct obstack *__h = (OBSTACK); \ + obstack_grow0 (__h, (where), (length)); \ + obstack_finish (__h); }) + +/* The local variable is named __o1 to avoid a name conflict + when obstack_blank is called. */ +#define obstack_finish(OBSTACK) \ +__extension__ \ +({ struct obstack *__o1 = (OBSTACK); \ + void *value; \ + value = (void *) __o1->object_base; \ + if (__o1->next_free == value) \ + __o1->maybe_empty_object = 1; \ + __o1->next_free \ + = __INT_TO_PTR ((__PTR_TO_INT (__o1->next_free)+__o1->alignment_mask)\ + & ~ (__o1->alignment_mask)); \ + if (__o1->next_free - (char *)__o1->chunk \ + > __o1->chunk_limit - (char *)__o1->chunk) \ + __o1->next_free = __o1->chunk_limit; \ + __o1->object_base = __o1->next_free; \ + value; }) + +#define obstack_free(OBSTACK, OBJ) \ +__extension__ \ +({ struct obstack *__o = (OBSTACK); \ + void *__obj = (OBJ); \ + if (__obj > (void *)__o->chunk && __obj < (void *)__o->chunk_limit) \ + __o->next_free = __o->object_base = __obj; \ + else (obstack_free) (__o, __obj); }) + +#else /* not __GNUC__ or not __STDC__ */ + +#define obstack_object_size(h) \ + (unsigned) ((h)->next_free - (h)->object_base) + +#define obstack_room(h) \ + (unsigned) ((h)->chunk_limit - (h)->next_free) + +/* Note that the call to _obstack_newchunk is enclosed in (..., 0) + so that we can avoid having void expressions + in the arms of the conditional expression. + Casting the third operand to void was tried before, + but some compilers won't accept it. */ + +#define obstack_make_room(h,length) \ +( (h)->temp = (length), \ + (((h)->next_free + (h)->temp > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), (h)->temp), 0) : 0)) + +#define obstack_grow(h,where,length) \ +( (h)->temp = (length), \ + (((h)->next_free + (h)->temp > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ + memcpy ((h)->next_free, (char *) (where), (h)->temp), \ + (h)->next_free += (h)->temp) + +#define obstack_grow0(h,where,length) \ +( (h)->temp = (length), \ + (((h)->next_free + (h)->temp + 1 > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), (h)->temp + 1), 0) : 0), \ + memcpy ((h)->next_free, (char *) (where), (h)->temp), \ + (h)->next_free += (h)->temp, \ + *((h)->next_free)++ = 0) + +#define obstack_1grow(h,datum) \ +( (((h)->next_free + 1 > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), 1), 0) : 0), \ + (*((h)->next_free)++ = (datum))) + +#define obstack_ptr_grow(h,datum) \ +( (((h)->next_free + sizeof (char *) > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), sizeof (char *)), 0) : 0), \ + (*((char **) (((h)->next_free+=sizeof(char *))-sizeof(char *))) = ((char *) datum))) + +#define obstack_int_grow(h,datum) \ +( (((h)->next_free + sizeof (int) > (h)->chunk_limit) \ + ? (_obstack_newchunk ((h), sizeof (int)), 0) : 0), \ + (*((int *) (((h)->next_free+=sizeof(int))-sizeof(int))) = ((int) datum))) + +#define obstack_ptr_grow_fast(h,aptr) (*((char **) (h)->next_free)++ = (char *) aptr) +#define obstack_int_grow_fast(h,aint) (*((int *) (h)->next_free)++ = (int) aint) + +#define obstack_blank(h,length) \ +( (h)->temp = (length), \ + (((h)->chunk_limit - (h)->next_free < (h)->temp) \ + ? (_obstack_newchunk ((h), (h)->temp), 0) : 0), \ + ((h)->next_free += (h)->temp)) + +#define obstack_alloc(h,length) \ + (obstack_blank ((h), (length)), obstack_finish ((h))) + +#define obstack_copy(h,where,length) \ + (obstack_grow ((h), (where), (length)), obstack_finish ((h))) + +#define obstack_copy0(h,where,length) \ + (obstack_grow0 ((h), (where), (length)), obstack_finish ((h))) + +#define obstack_finish(h) \ +( ((h)->next_free == (h)->object_base \ + ? (((h)->maybe_empty_object = 1), 0) \ + : 0), \ + (h)->temp = __PTR_TO_INT ((h)->object_base), \ + (h)->next_free \ + = __INT_TO_PTR ((__PTR_TO_INT ((h)->next_free)+(h)->alignment_mask) \ + & ~ ((h)->alignment_mask)), \ + (((h)->next_free - (char *) (h)->chunk \ + > (h)->chunk_limit - (char *) (h)->chunk) \ + ? ((h)->next_free = (h)->chunk_limit) : 0), \ + (h)->object_base = (h)->next_free, \ + __INT_TO_PTR ((h)->temp)) + +#if defined (__STDC__) && __STDC__ +#define obstack_free(h,obj) \ +( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \ + (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\ + ? (int) ((h)->next_free = (h)->object_base \ + = (h)->temp + (char *) (h)->chunk) \ + : (((obstack_free) ((h), (h)->temp + (char *) (h)->chunk), 0), 0))) +#else +#define obstack_free(h,obj) \ +( (h)->temp = (char *) (obj) - (char *) (h)->chunk, \ + (((h)->temp > 0 && (h)->temp < (h)->chunk_limit - (char *) (h)->chunk)\ + ? (int) ((h)->next_free = (h)->object_base \ + = (h)->temp + (char *) (h)->chunk) \ + : (_obstack_free ((h), (h)->temp + (char *) (h)->chunk), 0))) +#endif + +#endif /* not __GNUC__ or not __STDC__ */ + +#endif /* not __OBSTACK_H__ */ diff --git a/malloc/thread-m.h b/malloc/thread-m.h new file mode 100644 index 0000000000..371e49178d --- /dev/null +++ b/malloc/thread-m.h @@ -0,0 +1,176 @@ +/* Basic platform-independent macro definitions for mutexes and + thread-specific data. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Wolfram Gloger <wmglo@dent.med.uni-muenchen.de>, 1996. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* One out of _LIBC, USE_PTHREADS, USE_THR * or USE_SPROC should be + defined, otherwise the token NO_THREADS * and dummy implementations + of the macros will be defined. */ + +#ifndef _THREAD_M_H +#define _THREAD_M_H + +#if defined(_LIBC) /* The GNU C library, a special case of Posix threads */ + +#include <libc-lock.h> + +#ifdef PTHREAD_MUTEX_INITIALIZER + +typedef pthread_t thread_id; + +/* mutex */ +typedef pthread_mutex_t mutex_t; + +/* thread specific data */ +typedef pthread_key_t tsd_key_t; + +#define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER + +#define tsd_key_create(key, destr) \ + if (__pthread_key_create != NULL) { \ + __pthread_key_create(key, destr); } else { *(key) = (tsd_key_t) 0; } +#define tsd_setspecific(key, data) \ + if (__pthread_setspecific != NULL) { \ + __pthread_setspecific(key, data); } else { (key) = (tsd_key_t) data; } +#define tsd_getspecific(key, vptr) \ + (vptr = (__pthread_getspecific != NULL ? \ + __pthread_getspecific(key) : (tsd_key_t *) (key))) + +#define mutex_init(m) \ + (__pthread_mutex_init != NULL ? __pthread_mutex_init (m, NULL) : 0) +#define mutex_lock(m) \ + (__pthread_mutex_lock != NULL ? __pthread_mutex_lock (m) : 0) +#define mutex_trylock(m) \ + (__pthread_mutex_trylock != NULL ? __pthread_mutex_trylock (m) : 0) +#define mutex_unlock(m) \ + (__pthread_mutex_unlock != NULL ? __pthread_mutex_unlock (m) : 0) + +#elif defined(MUTEX_INITIALIZER) + +typedef thread_t thread_id; + +/* mutex */ +typedef mutex_t mutex_t; + +/* thread specific data */ +typedef pthread_key_t tsd_key_t; + +#define mutex_init(m) __mutex_init (m) +#define mutex_lock(m) __mutex_lock (m) +#define mutex_trylock(m) __mutex_trylock (m) +#define mutex_unlock(m) __mutex_unlock (m) + +#else + +#define NO_THREADS + +#endif /* MUTEX_INITIALIZER && PTHREAD_MUTEX_INITIALIZER */ + +#elif defined(USE_PTHREADS) /* Posix threads */ + +#include <pthread.h> + +typedef pthread_t thread_id; + +/* mutex */ +typedef pthread_mutex_t mutex_t; + +#define MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#define mutex_init(m) pthread_mutex_init(m, NULL) +#define mutex_lock(m) pthread_mutex_lock(m) +#define mutex_trylock(m) pthread_mutex_trylock(m) +#define mutex_unlock(m) pthread_mutex_unlock(m) + +/* thread specific data */ +typedef pthread_key_t tsd_key_t; + +#define tsd_key_create(key, destr) pthread_key_create(key, destr) +#define tsd_setspecific(key, data) pthread_setspecific(key, data) +#define tsd_getspecific(key, vptr) (vptr = pthread_getspecific(key)) + +#elif USE_THR /* Solaris threads */ + +#include <thread.h> + +typedef thread_t thread_id; + +#define MUTEX_INITIALIZER { 0 } +#define mutex_init(m) mutex_init(m, USYNC_THREAD, NULL) + +/* + * Hack for thread-specific data on Solaris. We can't use thr_setspecific + * because that function calls malloc() itself. + */ +typedef void *tsd_key_t[256]; +#define tsd_key_create(key, destr) do { \ + int i; \ + for(i=0; i<256; i++) (*key)[i] = 0; \ +} while(0) +#define tsd_setspecific(key, data) (key[(unsigned)thr_self() % 256] = (data)) +#define tsd_getspecific(key, vptr) (vptr = key[(unsigned)thr_self() % 256]) + +#elif USE_SPROC /* SGI sproc() threads */ + +#include <sys/wait.h> +#include <sys/types.h> +#include <sys/prctl.h> +#include <abi_mutex.h> + +typedef int thread_id; + +typedef abilock_t mutex_t; + +#define MUTEX_INITIALIZER { 0 } +#define mutex_init(m) init_lock(m) +#define mutex_lock(m) (spin_lock(m), 0) +#define mutex_trylock(m) acquire_lock(m) +#define mutex_unlock(m) release_lock(m) + +typedef int tsd_key_t; +int tsd_key_next; +#define tsd_key_create(key, destr) ((*key) = tsd_key_next++) +#define tsd_setspecific(key, data) (((void **)(&PRDA->usr_prda))[key] = data) +#define tsd_getspecific(key, vptr) (vptr = ((void **)(&PRDA->usr_prda))[key]) + +#else /* no _LIBC or USE_... are defined */ + +#define NO_THREADS + +#endif /* defined(_LIBC) */ + +#ifdef NO_THREADS /* No threads, provide dummy macros */ + +typedef int thread_id; + +typedef int mutex_t; + +#define MUTEX_INITIALIZER 0 +#define mutex_init(m) (*(m) = 0) +#define mutex_lock(m) (0) +#define mutex_trylock(m) (0) +#define mutex_unlock(m) (0) + +typedef void *tsd_key_t; +#define tsd_key_create(key, destr) (*(key) = NULL) +#define tsd_setspecific(key, data) ((key) = data) +#define tsd_getspecific(key, vptr) (vptr = (key)) + +#endif /* defined(NO_THREADS) */ + +#endif /* !defined(_THREAD_M_H) */ diff --git a/manual/=float.texinfo b/manual/=float.texinfo index a8c901542e..d4e3920f8c 100644 --- a/manual/=float.texinfo +++ b/manual/=float.texinfo @@ -1,4 +1,4 @@ -@node Floating-Point Limits +@node Floating-Point Limits @chapter Floating-Point Limits @pindex <float.h> @cindex floating-point number representation @@ -75,7 +75,7 @@ unsigned quantity. @cindex mantissa (of floating-point number) @cindex significand (of floating-point number) -@item +@item The @dfn{precision} of the mantissa. If the base of the representation is @var{b}, then the precision is the number of base-@var{b} digits in the mantissa. This is a constant for the particular representation. @@ -124,14 +124,14 @@ expression, so the other macros listed here cannot be reliably used in places that require constant expressions, such as @samp{#if} preprocessing directives and array size specifications. -Although the ANSI C standard specifies minimum and maximum values for +Although the @w{ISO C} standard specifies minimum and maximum values for most of these parameters, the GNU C implementation uses whatever floating-point representations are supported by the underlying hardware. -So whether GNU C actually satisfies the ANSI C requirements depends on +So whether GNU C actually satisfies the @w{ISO C} requirements depends on what machine it is running on. @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_ROUNDS This value characterizes the rounding mode for floating-point addition. The following values indicate standard rounding modes: @@ -155,7 +155,7 @@ mode. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_RADIX This is the value of the base, or radix, of exponent representation. This is guaranteed to be a constant expression, unlike the other macros @@ -163,28 +163,28 @@ described in this section. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{float} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{long double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_DIG This is the number of decimal digits of precision for the @code{float} data type. Technically, if @var{p} and @var{b} are the precision and @@ -198,14 +198,14 @@ The value of this macro is guaranteed to be at least @code{6}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_DIG This is similar to @code{FLT_DIG}, but is for the @code{double} data type. The value of this macro is guaranteed to be at least @code{10}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_DIG This is similar to @code{FLT_DIG}, but is for the @code{long double} data type. The value of this macro is guaranteed to be at least @@ -213,7 +213,7 @@ data type. The value of this macro is guaranteed to be at least @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MIN_EXP This is the minimum negative integer such that the mathematical value @code{FLT_RADIX} raised to this power minus 1 can be represented as a @@ -223,21 +223,21 @@ represented in the exponent field of the number. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MIN_EXP This is similar to @code{FLT_MIN_EXP}, but is for the @code{double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MIN_EXP This is similar to @code{FLT_MIN_EXP}, but is for the @code{long double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MIN_10_EXP This is the minimum negative integer such that the mathematical value @code{10} raised to this power minus 1 can be represented as a @@ -246,14 +246,14 @@ guaranteed to be no greater than @code{-37}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MIN_10_EXP This is similar to @code{FLT_MIN_10_EXP}, but is for the @code{double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MIN_10_EXP This is similar to @code{FLT_MIN_10_EXP}, but is for the @code{long double} data type. @@ -262,7 +262,7 @@ double} data type. @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MAX_EXP This is the maximum negative integer such that the mathematical value @code{FLT_RADIX} raised to this power minus 1 can be represented as a @@ -272,21 +272,21 @@ in the exponent field of the number. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MAX_EXP This is similar to @code{FLT_MAX_EXP}, but is for the @code{double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MAX_EXP This is similar to @code{FLT_MAX_EXP}, but is for the @code{long double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MAX_10_EXP This is the maximum negative integer such that the mathematical value @code{10} raised to this power minus 1 can be represented as a @@ -295,14 +295,14 @@ guaranteed to be at least @code{37}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MAX_10_EXP This is similar to @code{FLT_MAX_10_EXP}, but is for the @code{double} data type. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MAX_10_EXP This is similar to @code{FLT_MAX_10_EXP}, but is for the @code{long double} data type. @@ -310,7 +310,7 @@ double} data type. @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MAX The value of this macro is the maximum representable floating-point number of type @code{float}, and is guaranteed to be at least @@ -318,7 +318,7 @@ number of type @code{float}, and is guaranteed to be at least @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MAX The value of this macro is the maximum representable floating-point number of type @code{double}, and is guaranteed to be at least @@ -326,7 +326,7 @@ number of type @code{double}, and is guaranteed to be at least @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MAX The value of this macro is the maximum representable floating-point number of type @code{long double}, and is guaranteed to be at least @@ -335,7 +335,7 @@ number of type @code{long double}, and is guaranteed to be at least @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{float}, and is @@ -343,7 +343,7 @@ guaranteed to be no more than @code{1E-37}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{double}, and @@ -351,7 +351,7 @@ is guaranteed to be no more than @code{1E-37}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{long double}, @@ -360,7 +360,7 @@ and is guaranteed to be no more than @code{1E-37}. @comment float.h -@comment ANSI +@comment ISO @defvr Macro FLT_EPSILON This is the minimum positive floating-point number of type @code{float} such that @code{1.0 + FLT_EPSILON != 1.0} is true. It's guaranteed to @@ -368,14 +368,14 @@ be no greater than @code{1E-5}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro DBL_EPSILON This is similar to @code{FLT_EPSILON}, but is for the @code{double} type. The maximum value is @code{1E-9}. @end defvr @comment float.h -@comment ANSI +@comment ISO @defvr Macro LDBL_EPSILON This is similar to @code{FLT_EPSILON}, but is for the @code{long double} type. The maximum value is @code{1E-9}. @@ -388,7 +388,8 @@ type. The maximum value is @code{1E-9}. Here is an example showing how these parameters work for a common floating point representation, specified by the @cite{IEEE Standard for -Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985)}. +Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985 or ANSI/IEEE +Std 854-1987)}. The IEEE single-precision float representation uses a base of 2. There is a sign bit, a mantissa with 23 bits plus one hidden bit (so the total @@ -411,6 +412,3 @@ FLT_MIN 1.17549435E-38F FLT_MAX 3.40282347E+38F FLT_EPSILON 1.19209290E-07F @end example - - - diff --git a/manual/=limits.texinfo b/manual/=limits.texinfo index 3e384dd6b6..7b55d70465 100644 --- a/manual/=limits.texinfo +++ b/manual/=limits.texinfo @@ -12,7 +12,7 @@ floating-point types supported by the GNU C library. * Floating-Point Limits :: Parameters which characterize supported floating-point representations on a particular - system. + system. @end menu @node Integer Representation Limits, Floating-Point Limits , , Representation Limits @@ -37,32 +37,32 @@ macros are all integer constant expressions. @pindex limits.h @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int CHAR_BIT This is the number of bits in a @code{char}, usually eight. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int SCHAR_MIN This is the minimum value that can be represented by a @code{signed char}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int SCHAR_MAX This is the maximum value that can be represented by a @code{signed char}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int UCHAR_MAX This is the maximum value that can be represented by a @code{unsigned char}. (The minimum value of an @code{unsigned char} is zero.) @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int CHAR_MIN This is the minimum value that can be represented by a @code{char}. It's equal to @code{SCHAR_MIN} if @code{char} is signed, or zero @@ -70,7 +70,7 @@ otherwise. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int CHAR_MAX This is the maximum value that can be represented by a @code{char}. It's equal to @code{SCHAR_MAX} if @code{char} is signed, or @@ -78,7 +78,7 @@ It's equal to @code{SCHAR_MAX} if @code{char} is signed, or @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int SHRT_MIN This is the minimum value that can be represented by a @code{signed short int}. On most machines that the GNU C library runs on, @@ -86,21 +86,21 @@ short int}. On most machines that the GNU C library runs on, @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int SHRT_MAX This is the maximum value that can be represented by a @code{signed short int}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int USHRT_MAX This is the maximum value that can be represented by an @code{unsigned short int}. (The minimum value of an @code{unsigned short int} is zero.) @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int INT_MIN This is the minimum value that can be represented by a @code{signed int}. On most machines that the GNU C system runs on, an @code{int} is @@ -108,21 +108,21 @@ a 32-bit quantity. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int INT_MAX This is the maximum value that can be represented by a @code{signed int}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro {unsigned int} UINT_MAX This is the maximum value that can be represented by an @code{unsigned int}. (The minimum value of an @code{unsigned int} is zero.) @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro {long int} LONG_MIN This is the minimum value that can be represented by a @code{signed long int}. On most machines that the GNU C system runs on, @code{long} @@ -130,14 +130,14 @@ integers are 32-bit quantities, the same size as @code{int}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro {long int} LONG_MAX This is the maximum value that can be represented by a @code{signed long int}. @end deftypevr @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro {unsigned long int} ULONG_MAX This is the maximum value that can be represented by an @code{unsigned long int}. (The minimum value of an @code{unsigned long int} is zero.) @@ -180,9 +180,9 @@ particular system. @menu * Floating-Point Representation:: Definitions of terminology. * Floating-Point Parameters:: Descriptions of the library - facilities. + facilities. * IEEE Floating Point:: An example of a common - representation. + representation. @end menu @node Floating-Point Representation, Floating-Point Parameters, , Floating-Point Limits @@ -233,7 +233,7 @@ unsigned integer. @cindex mantissa (of floating-point number) @cindex significand (of floating-point number) -@item +@item The @dfn{precision} of the mantissa. If the base of the representation is @var{b}, then the precision is the number of base-@var{b} digits in the mantissa. This is a constant for the particular representation. @@ -286,14 +286,14 @@ expression. The other macros listed here cannot be reliably used in places that require constant expressions, such as @samp{#if} preprocessing directives or array size specifications. -Although the ANSI C standard specifies minimum and maximum values for +Although the @w{ISO C} standard specifies minimum and maximum values for most of these parameters, the GNU C implementation uses whatever floating-point representations are supported by the underlying hardware. -So whether GNU C actually satisfies the ANSI C requirements depends on +So whether GNU C actually satisfies the @w{ISO C} requirements depends on what machine it is running on. @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_ROUNDS This value characterizes the rounding mode for floating-point addition. The following values indicate standard rounding modes: @@ -317,7 +317,7 @@ mode. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_RADIX This is the value of the base, or radix, of exponent representation. This is guaranteed to be a constant expression, unlike the other macros @@ -325,28 +325,28 @@ described in this section. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{float} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating-point mantissa for the @code{long double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_DIG This is the number of decimal digits of precision for the @code{float} data type. Technically, if @var{p} and @var{b} are the precision and @@ -360,14 +360,14 @@ The value of this macro is guaranteed to be at least @code{6}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_DIG This is similar to @code{FLT_DIG}, but is for the @code{double} data type. The value of this macro is guaranteed to be at least @code{10}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_DIG This is similar to @code{FLT_DIG}, but is for the @code{long double} data type. The value of this macro is guaranteed to be at least @@ -375,7 +375,7 @@ data type. The value of this macro is guaranteed to be at least @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_MIN_EXP This is the minimum negative integer such that the mathematical value @code{FLT_RADIX} raised to this power minus 1 can be represented as a @@ -385,21 +385,21 @@ represented in the exponent field of the number. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_MIN_EXP This is similar to @code{FLT_MIN_EXP}, but is for the @code{double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_MIN_EXP This is similar to @code{FLT_MIN_EXP}, but is for the @code{long double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_MIN_10_EXP This is the minimum negative integer such that the mathematical value @code{10} raised to this power minus 1 can be represented as a @@ -408,14 +408,14 @@ guaranteed to be no greater than @code{-37}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_MIN_10_EXP This is similar to @code{FLT_MIN_10_EXP}, but is for the @code{double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_MIN_10_EXP This is similar to @code{FLT_MIN_10_EXP}, but is for the @code{long double} data type. @@ -424,7 +424,7 @@ double} data type. @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_MAX_EXP This is the maximum negative integer such that the mathematical value @code{FLT_RADIX} raised to this power minus 1 can be represented as a @@ -434,21 +434,21 @@ in the exponent field of the number. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_MAX_EXP This is similar to @code{FLT_MAX_EXP}, but is for the @code{double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_MAX_EXP This is similar to @code{FLT_MAX_EXP}, but is for the @code{long double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int FLT_MAX_10_EXP This is the maximum negative integer such that the mathematical value @code{10} raised to this power minus 1 can be represented as a @@ -457,14 +457,14 @@ guaranteed to be at least @code{37}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int DBL_MAX_10_EXP This is similar to @code{FLT_MAX_10_EXP}, but is for the @code{double} data type. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro int LDBL_MAX_10_EXP This is similar to @code{FLT_MAX_10_EXP}, but is for the @code{long double} data type. @@ -472,7 +472,7 @@ double} data type. @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double FLT_MAX The value of this macro is the maximum representable floating-point number of type @code{float}, and is guaranteed to be at least @@ -480,7 +480,7 @@ number of type @code{float}, and is guaranteed to be at least @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double DBL_MAX The value of this macro is the maximum representable floating-point number of type @code{double}, and is guaranteed to be at least @@ -488,7 +488,7 @@ number of type @code{double}, and is guaranteed to be at least @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro {long double} LDBL_MAX The value of this macro is the maximum representable floating-point number of type @code{long double}, and is guaranteed to be at least @@ -497,7 +497,7 @@ number of type @code{long double}, and is guaranteed to be at least @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double FLT_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{float}, and is @@ -505,7 +505,7 @@ guaranteed to be no more than @code{1E-37}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double DBL_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{double}, and @@ -513,7 +513,7 @@ is guaranteed to be no more than @code{1E-37}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro {long double} LDBL_MIN The value of this macro is the minimum normalized positive floating-point number that is representable by type @code{long double}, @@ -522,7 +522,7 @@ and is guaranteed to be no more than @code{1E-37}. @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double FLT_EPSILON This is the minimum positive floating-point number of type @code{float} such that @code{1.0 + FLT_EPSILON != 1.0} is true. It's guaranteed to @@ -530,14 +530,14 @@ be no greater than @code{1E-5}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro double DBL_EPSILON This is similar to @code{FLT_EPSILON}, but is for the @code{double} type. The maximum value is @code{1E-9}. @end deftypevr @comment float.h -@comment ANSI +@comment ISO @deftypevr Macro {long double} LDBL_EPSILON This is similar to @code{FLT_EPSILON}, but is for the @code{long double} type. The maximum value is @code{1E-9}. @@ -546,15 +546,15 @@ type. The maximum value is @code{1E-9}. @node IEEE Floating Point, , Floating-Point Parameters, Floating-Point Limits @subsection IEEE Floating Point -@cindex IEEE floating-point representation +@cindex IEEE floating-point representation @cindex floating-point, IEEE @cindex IEEE Std 754 Here is an example showing how these parameters work for a common floating point representation, specified by the @cite{IEEE Standard for -Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985)}. Nearly -all computers today use this format. +Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985 or ANSI/IEEE +Std 854-1987)}. Nearly all computers today use this format. The IEEE single-precision float representation uses a base of 2. There is a sign bit, a mantissa with 23 bits plus one hidden bit (so the total diff --git a/manual/=process.texinfo b/manual/=process.texinfo index 63c723ed37..4618cff5fa 100644 --- a/manual/=process.texinfo +++ b/manual/=process.texinfo @@ -90,7 +90,7 @@ Option names are single alphanumeric (as for @code{isalnum}; see @ref{Classification of Characters}). @item -Certain options require an argument. For example, the @samp{-o} +Certain options require an argument. For example, the @samp{-o} command of the ld command requires an argument---an output file name. @item @@ -326,7 +326,7 @@ The value of an environment variable can be accessed with the @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {char *} getenv (const char *@var{name}) This function returns a string that is the value of the environment variable @var{name}. You must not modify this string. In some systems @@ -353,7 +353,7 @@ may not be available in other systems. You can deal directly with the underlying representation of environment objects to add more variables to the environment (for example, to communicate with another program you are about to execute; see -@ref{Executing a File}). +@ref{Executing a File}). @comment unistd.h @comment POSIX.1 @@ -410,7 +410,7 @@ uses this environment variable, as do many shells and other utilities which are implemented in terms of those functions. The syntax of a path is a sequence of directory names separated by -colons. An empty string instead of a directory name stands for the +colons. An empty string instead of a directory name stands for the current directory. (@xref{Working Directory}.) A typical value for this environment variable might be a string like: @@ -499,10 +499,10 @@ more detail in @ref{Signal Handling}. The @code{abort} function causes a terminal that kills the program. @menu -* Normal Program Termination:: +* Normal Program Termination:: * Exit Status:: Exit Status * Cleanups on Exit:: Cleanups on Exit -* Aborting a Program:: +* Aborting a Program:: * Termination Internals:: Termination Internals @end menu @@ -510,7 +510,7 @@ a terminal that kills the program. @subsection Normal Program Termination @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void exit (int @var{status}) The @code{exit} function causes normal program termination with status @var{status}. This function does not return. @@ -521,7 +521,7 @@ function or by calling @code{exit}, the following actions occur in sequence: @enumerate -@item +@item Functions that were registered with the @code{atexit} or @code{on_exit} functions are called in the reverse order of their registration. This mechanism allows your application to specify its own ``cleanup'' actions @@ -529,12 +529,12 @@ to be performed at program termination. Typically, this is used to do things like saving program state information in a file, or unlock locks in shared data bases. -@item +@item All open streams are closed; writing out any buffered output data. See @ref{Opening and Closing Streams}. In addition, temporary files opened with the @code{tmpfile} function are removed; see @ref{Temporary Files}. -@item +@item @code{_exit} is called. @xref{Termination Internals} @end enumerate @@ -582,7 +582,7 @@ are declared in the file @file{stdlib.h}. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int EXIT_SUCCESS This macro can be used with the @code{exit} function to indicate successful program completion. @@ -593,7 +593,7 @@ expression. @end deftypevr @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int EXIT_FAILURE This macro can be used with the @code{exit} function to indicate unsuccessful program completion in a general sense. @@ -611,14 +611,14 @@ mean that there was difficulty in opening the files. @subsection Cleanups on Exit @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int atexit (void (*@var{function})) The @code{atexit} function registers the function @var{function} to be called at normal program termination. The @var{function} is called with no arguments. The return value from @code{atexit} is zero on success and nonzero if -the function cannot be registered. +the function cannot be registered. @end deftypefun @comment stdlib.h @@ -666,7 +666,7 @@ for this function is in @file{stdlib.h}. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void abort () The @code{abort} function causes abnormal program termination, without executing functions registered with @code{atexit} or @code{on_exit}. @@ -751,7 +751,7 @@ primitive functions to do each step individually instead. program. * Process Completion:: How to tell when a child process has completed. -* Process Completion Status:: How to interpret the status value +* Process Completion Status:: How to interpret the status value returned from a child process. * BSD wait Functions:: More functions, for backward compatibility. @@ -771,7 +771,7 @@ until the subprogram terminates before you can do anything else. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int system (const char *@var{command}) This function executes @var{command} as a shell command. In the GNU C library, it always uses the default shell @code{sh} to run the command. @@ -937,7 +937,7 @@ The child doesn't inherit alarms set by the parent process. The set of pending signals (@pxref{Delivery of Signal}) for the child process is cleared. (The child process inherits its mask of blocked signals and signal actions from the parent process.) -@end itemize +@end itemize @comment unistd.h @@ -1009,7 +1009,7 @@ passed as the last such argument. @deftypefun int execve (const char *@var{filename}, char *const @var{argv}@t{[]}, char *const @var{env}@t{[]}) This is similar to @code{execv}, but permits you to specify the environment for the new program explicitly as the @var{env} argument. This should -be an array of strings in the same format as for the @code{environ} +be an array of strings in the same format as for the @code{environ} variable; see @ref{Environment Access}. @end deftypefun @@ -1369,7 +1369,7 @@ equivalent macros. If @var{usage} is a null pointer, this function is equivalent to @code{waitpid (-1, @var{status_ptr}, @var{options})}. -The @var{usage} argument may also be a pointer to a +The @var{usage} argument may also be a pointer to a @code{struct rusage} object. Information about system resources used by terminated processes (but not stopped processes) is returned in this structure. @@ -1384,7 +1384,7 @@ hasn't been written yet. Put in a cross-reference here. If @var{usage} is a null pointer, this function is equivalent to @code{waitpid (@var{pid}, @var{status_ptr}, @var{options})}. -The @var{usage} argument may also be a pointer to a +The @var{usage} argument may also be a pointer to a @code{struct rusage} object. Information about system resources used by terminated processes (but not stopped processes) is returned in this structure. @@ -1410,7 +1410,7 @@ argument using the equivalent of @samp{sh -c @var{command}}. /* @r{Execute the command using this shell program.} */ #define SHELL "/bin/sh" -int +int my_system (char *command) @{ int status; @@ -1442,7 +1442,7 @@ example. Remember that the first @code{argv} argument supplied to the program represents the name of the program being executed. That is why, in the call to @code{execl}, @code{SHELL} is supplied once to name the program -to execute and a second time to supply a value for @code{argv[0]}. +to execute and a second time to supply a value for @code{argv[0]}. The @code{execl} call in the child process doesn't return if it is successful. If it fails, you must do something to make the child diff --git a/manual/=stdarg.texi b/manual/=stdarg.texi index 384c992f13..a209efc785 100644 --- a/manual/=stdarg.texi +++ b/manual/=stdarg.texi @@ -5,7 +5,7 @@ @cindex variable number of arguments @cindex optional arguments -ANSI C defines a syntax as part of the kernel language for specifying +@w{ISO C} defines a syntax as part of the kernel language for specifying functions that take a variable number or type of arguments. (Such functions are also referred to as @dfn{variadic functions}.) However, the kernel language provides no mechanism for actually accessing @@ -32,7 +32,7 @@ Every call to the function should supply the same number and type of arguments as specified in the function definition. On the other hand, sometimes a function performs an operation that can -meaningfully accept an unlimited number of arguments. +meaningfully accept an unlimited number of arguments. For example, consider a function that joins its arguments into a linked list. It makes sense to connect any number of arguments together into a @@ -80,11 +80,11 @@ function can accept additional arguments of unspecified type by putting @samp{@dots{}} at the end of the arguments. For example, @example -int +int func (const char *a, int b, @dots{}) @{ @dots{} -@} +@} @end example @noindent @@ -92,7 +92,7 @@ outlines a definition of a function @code{func} which returns an @code{int} and takes at least two arguments, the first two being a @code{const char *} and an @code{int}.@refill -An obscure restriction placed by the ANSI C standard is that the last +An obscure restriction placed by the @w{ISO C} standard is that the last required argument must not be declared @code{register} in the function definition. Furthermore, this argument must not be of a function or array type, and may not be, for example, a @code{char} or @code{short @@ -101,7 +101,7 @@ int} (whether signed or not) or a @code{float}. @strong{Compatibility Note:} Many older C dialects provide a similar, but incompatible, mechanism for defining functions with variable numbers of arguments. In particular, the @samp{@dots{}} syntax is a new feature -of ANSI C. +of @w{ISO C}. @node Receiving the Argument Values, How Many Arguments, Syntax for Variable Arguments, How Variable Arguments are Used @@ -207,13 +207,13 @@ These macros are defined in the header file @file{stdarg.h}. @pindex stdarg.h @comment stdarg.h -@comment ANSI +@comment ISO @deftp {Data Type} va_list The type @code{va_list} is used for argument pointer variables. @end deftp @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} void va_start (va_list @var{ap}, @var{last_required}) This macro initialized the argument pointer variable @var{ap} to point to the first of the optional arguments of the current function; @@ -221,14 +221,14 @@ to the first of the optional arguments of the current function; @end deftypefn @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} @var{type} va_arg (va_list @var{ap}, @var{type}) The @code{va_arg} macro returns the value of the next optional argument, and changes the internal state of @var{ap} to move past this argument. -Thus, successive uses of @code{va_arg} return successive optional +Thus, successive uses of @code{va_arg} return successive optional arguments. The type of the value returned by @code{va_arg} is the @var{type} -specified in the call. +specified in the call. The @var{type} must match the type of the actual argument, and must not be @code{char} or @code{short int} or @code{float}. (Remember that the @@ -236,7 +236,7 @@ default argument promotions apply to optional arguments.) @end deftypefn @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} void va_end (va_list @var{ap}) This ends the use of @var{ap}. After a @code{va_end} call, further @code{va_arg} calls with the same @var{ap} may not work. You should invoke @@ -263,7 +263,7 @@ way the variable arguments facility is commonly used.) @example #include <stdarg.h> -int +int add_em_up (int count, @dots{}) @{ va_list ap; diff --git a/manual/=stddef.texi b/manual/=stddef.texi index 28d4b26f33..e15fd7375f 100644 --- a/manual/=stddef.texi +++ b/manual/=stddef.texi @@ -9,7 +9,7 @@ definitions, your program should include the header file @pindex stddef.h @comment stddef.h -@comment ANSI +@comment ISO @deftp {Data Type} ptrdiff_t This is the signed integer type of the result of subtracting two pointers. For example, with the declaration @code{char *p1, *p2;}, the @@ -20,7 +20,7 @@ exists only for this purpose. @end deftp @comment stddef.h -@comment ANSI +@comment ISO @deftp {Data Type} size_t This is an unsigned integer type used to represent the sizes of objects. The result of the @code{sizeof} operator is of this type, and functions @@ -30,12 +30,12 @@ objects of arbitrary sizes accept arguments of this type to specify object sizes. @end deftp -In the GNU system @code{size_t} is equivalent to one of the types +In the GNU system @code{size_t} is equivalent to one of the types @code{unsigned int} and @code{unsigned long int}. These types have identical properties on the GNU system, and for most purposes, you -can use them interchangeably. However, they are distinct types, +can use them interchangeably. However, they are distinct types, and in certain contexts, you may not treat them as identical. For -example, when you specify the type of a function argument in a +example, when you specify the type of a function argument in a function prototype, it makes a difference which one you use. If the system header files declare @code{malloc} with an argument of type @code{size_t} and you declare @code{malloc} with an argument @@ -47,12 +47,12 @@ supposed to have type @code{size_t}, always write the type as actually be. @strong{Compatibility Note:} Types such as @code{size_t} are new -features of ANSI C. Older, pre-ANSI C implementations have +features of @w{ISO C}. Older, pre-ANSI C implementations have traditionally used @code{unsigned int} for representing object sizes and @code{int} for pointer subtraction results. @comment stddef.h -@comment ANSI +@comment ISO @deftypevr Macro {void *} NULL @cindex null pointer This is a null pointer constant. It can be assigned to any pointer @@ -60,7 +60,7 @@ variable since it has type @code{void *}, and is guaranteed not to point to any real object. This macro is the best way to get a null pointer value. You can also use @code{0} or @code{(void *)0} as a null pointer constant, but using @code{NULL} makes the purpose of the -constant more evident. +constant more evident. When passing a null pointer as an argument to a function for which there is no prototype declaration in scope, you should explicitly cast @@ -70,7 +70,7 @@ thing. @end deftypevr @comment stddef.h -@comment ANSI +@comment ISO @deftypefn {Macro} size_t offsetof (@var{type}, @var{member}) This expands to a integer constant expression that is the offset of the structure member named @var{member} in a @code{struct} of type diff --git a/manual/arith.texi b/manual/arith.texi index 5607c4cae9..e60216ed11 100644 --- a/manual/arith.texi +++ b/manual/arith.texi @@ -97,7 +97,7 @@ to @code{-HUGE_VAL} as a value. In the BSD library, on certain machines, @code{infnan} raises a fatal signal in all cases. The GNU library does not do likewise, because that -does not fit the ANSI C specification. +does not fit the @w{ISO C} specification. @end deftypefun @strong{Portability Note:} The functions listed in this section are BSD @@ -120,7 +120,7 @@ Prototypes for @code{abs} and @code{labs} are in @file{stdlib.h}; @code{fabs} and @code{cabs} are declared in @file{math.h}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int abs (int @var{number}) This function returns the absolute value of @var{number}. @@ -130,14 +130,14 @@ cannot be represented; thus, @w{@code{abs (INT_MIN)}} is not defined. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {long int} labs (long int @var{number}) This is similar to @code{abs}, except that both the argument and result are of type @code{long int} rather than @code{int}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double fabs (double @var{number}) This function returns the absolute value of the floating-point number @var{number}. @@ -172,7 +172,7 @@ those cases. All these functions are declared in @file{math.h}. @comment math.h -@comment ANSI +@comment ISO @deftypefun double frexp (double @var{value}, int *@var{exponent}) The @code{frexp} function is used to split the number @var{value} into a normalized fraction and an exponent. @@ -191,7 +191,7 @@ zero is stored in @code{*@var{exponent}}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double ldexp (double @var{value}, int @var{exponent}) This function returns the result of multiplying the floating-point number @var{value} by 2 raised to the power @var{exponent}. (It can @@ -258,7 +258,7 @@ numbers, this is impossible. The functions listed here return the result as a @code{double} instead to get around this problem. @comment math.h -@comment ANSI +@comment ISO @deftypefun double ceil (double @var{x}) The @code{ceil} function rounds @var{x} upwards to the nearest integer, returning that value as a @code{double}. Thus, @code{ceil (1.5)} @@ -266,7 +266,7 @@ is @code{2.0}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double floor (double @var{x}) The @code{ceil} function rounds @var{x} downwards to the nearest integer, returning that value as a @code{double}. Thus, @code{floor @@ -285,7 +285,7 @@ you explicit select another. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double modf (double @var{value}, double *@var{integer-part}) This function breaks the argument @var{value} into an integer part and a fractional part (between @code{-1} and @code{1}, exclusive). Their sum @@ -298,7 +298,7 @@ returns @code{0.5} and stores @code{2.0} into @code{intpart}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double fmod (double @var{numerator}, double @var{denominator}) This function computes the remainder from the division of @var{numerator} by @var{denominator}. Specifically, the return value is @@ -353,7 +353,7 @@ To use these facilities, you should include the header file @file{stdlib.h} in your program. @comment stdlib.h -@comment ANSI +@comment ISO @deftp {Data Type} div_t This is a structure type used to hold the result returned by the @code{div} function. It has the following members: @@ -368,7 +368,7 @@ The remainder from the division. @end deftp @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun div_t div (int @var{numerator}, int @var{denominator}) This function @code{div} computes the quotient and remainder from the division of @var{numerator} by @var{denominator}, returning the @@ -389,7 +389,7 @@ Now @code{result.quot} is @code{-3} and @code{result.rem} is @code{2}. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftp {Data Type} ldiv_t This is a structure type used to hold the result returned by the @code{ldiv} function. It has the following members: @@ -407,7 +407,7 @@ type @code{long int} rather than @code{int}.) @end deftp @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun ldiv_t ldiv (long int @var{numerator}, long int @var{denominator}) The @code{ldiv} function is similar to @code{div}, except that the arguments are of type @code{long int} and the result is returned as a @@ -442,7 +442,7 @@ one by one. These functions are declared in @file{stdlib.h}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {long int} strtol (const char *@var{string}, char **@var{tailptr}, int @var{base}) The @code{strtol} (``string-to-long'') function converts the initial part of @var{string} to a signed integer, which is returned as a value @@ -502,7 +502,7 @@ There is an example at the end of this section. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {unsigned long int} strtoul (const char *@var{string}, char **@var{tailptr}, int @var{base}) The @code{strtoul} (``string-to-unsigned-long'') function is like @code{strtol} except it deals with unsigned numbers, and returns its @@ -558,7 +558,7 @@ as well. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {long int} atol (const char *@var{string}) This function is similar to the @code{strtol} function with a @var{base} argument of @code{10}, except that it need not detect overflow errors. @@ -567,7 +567,7 @@ existing code; using @code{strtol} is more robust. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int atoi (const char *@var{string}) This function is like @code{atol}, except that it returns an @code{int} value rather than @code{long int}. The @code{atoi} function is also @@ -640,7 +640,7 @@ sum_ints_from_string (char *string) These functions are declared in @file{stdlib.h}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun double strtod (const char *@var{string}, char **@var{tailptr}) The @code{strtod} (``string-to-double'') function converts the initial part of @var{string} to a floating-point number, which is returned as a @@ -736,7 +736,7 @@ which will handle numbers represented using the grouping scheme of the current locale (@pxref{Parsing of Integers}). @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun double atof (const char *@var{string}) This function is similar to the @code{strtod} function, except that it need not detect overflow and underflow errors. The @code{atof} function diff --git a/manual/conf.texi b/manual/conf.texi index 86afeca597..4f9326e9d4 100644 --- a/manual/conf.texi +++ b/manual/conf.texi @@ -298,7 +298,7 @@ below. The normal return value from @code{sysconf} is the value you requested. A value of @code{-1} is returned both if the implementation does not -impose a limit, and in case of an error. +impose a limit, and in case of an error. The following @code{errno} error conditions are defined for this function: @@ -467,7 +467,7 @@ Inquire about the virtual memory page size of the machine. @c @xref{XXX getpagesize}. !!! ??? @end table -@node Examples of Sysconf +@node Examples of Sysconf @subsection Examples of @code{sysconf} We recommend that you first test for a macro definition for the @@ -656,8 +656,8 @@ This is the BSD name for @code{NAME_MAX}. It is defined in @end deftypevr @comment stdio.h -@comment ANSI -@deftypevr Macro int FILENAME_MAX +@comment ISO +@deftypevr Macro int FILENAME_MAX The value of this macro is an integer constant expression that represents the maximum length of a file name string. It is defined in @file{stdio.h}. @@ -699,7 +699,7 @@ library. @comment POSIX.1 @deftypevr Macro int _POSIX_CHOWN_RESTRICTED If this option is in effect, the @code{chown} function is restricted so -that the only changes permitted to nonprivileged processes is to change +that the only changes permitted to nonprivileged processes is to change the group owner of a file to either be the effective group ID of the process, or one of its supplementary group IDs. @xref{File Owner}. @end deftypevr diff --git a/manual/creature.texi b/manual/creature.texi index 423dce4544..d5dfb6aa19 100644 --- a/manual/creature.texi +++ b/manual/creature.texi @@ -6,7 +6,7 @@ The exact set of features available when you compile a source file is controlled by which @dfn{feature test macros} you define. If you compile your programs using @samp{gcc -ansi}, you get only the -ANSI C library features, unless you explicitly request additional +@w{ISO C} library features, unless you explicitly request additional features by defining one or more of the feature macros. @xref{Invoking GCC,, GNU CC Command Options, gcc.info, The GNU CC Manual}, for more information about GCC options.@refill @@ -24,7 +24,7 @@ self-contained way. @defvr Macro _POSIX_SOURCE If you define this macro, then the functionality from the POSIX.1 standard (IEEE Standard 1003.1) is available, as well as all of the -ANSI C facilities. +@w{ISO C} facilities. @end defvr @comment (none) @@ -35,14 +35,14 @@ functionality from the POSIX.1 standard (IEEE Standard 1003.1) is made available. If you define this macro with a value of @code{2}, then both the functionality from the POSIX.1 standard and the functionality from the POSIX.2 standard (IEEE Standard 1003.2) are made available. This is -in addition to the ANSI C facilities. +in addition to the @w{ISO C} facilities. @end defvr @comment (none) @comment GNU @defvr Macro _BSD_SOURCE If you define this macro, functionality derived from 4.3 BSD Unix is -included as well as the ANSI C, POSIX.1, and POSIX.2 material. +included as well as the @w{ISO C}, POSIX.1, and POSIX.2 material. Some of the features derived from 4.3 BSD Unix conflict with the corresponding features specified by the POSIX.1 standard. If this @@ -67,7 +67,7 @@ the normal C library. @comment GNU @defvr Macro _SVID_SOURCE If you define this macro, functionality derived from SVID is -included as well as the ANSI C, POSIX.1, POSIX.2, and X/Open material. +included as well as the @w{ISO C}, POSIX.1, POSIX.2, and X/Open material. @end defvr @comment (none) @@ -89,7 +89,7 @@ available which are necessary for the X/Open Unix brand. @comment (none) @comment GNU @defvr Macro _GNU_SOURCE -If you define this macro, everything is included: ANSI C, POSIX.1, +If you define this macro, everything is included: @w{ISO C}, POSIX.1, POSIX.2, BSD, SVID, X/Open, and GNU extensions. In the cases where POSIX.1 conflicts with BSD, the POSIX definitions take precedence. diff --git a/manual/ctype.texi b/manual/ctype.texi index e7a7946466..2b97dfbf66 100644 --- a/manual/ctype.texi +++ b/manual/ctype.texi @@ -44,7 +44,7 @@ particular class of characters; each has a name starting with @samp{is}. Each of them takes one argument, which is a character to test, and returns an @code{int} which is treated as a boolean value. The character argument is passed as an @code{int}, and it may be the -constant value @code{EOF} instead of a real character. +constant value @code{EOF} instead of a real character. The attributes of any given character can vary between locales. @xref{Locales}, for more information on locales.@refill @@ -54,21 +54,21 @@ These functions are declared in the header file @file{ctype.h}. @cindex lower-case character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int islower (int @var{c}) Returns true if @var{c} is a lower-case letter. @end deftypefun @cindex upper-case character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isupper (int @var{c}) Returns true if @var{c} is an upper-case letter. @end deftypefun @cindex alphabetic character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isalpha (int @var{c}) Returns true if @var{c} is an alphabetic character (a letter). If @code{islower} or @code{isupper} is true of a character, then @@ -83,14 +83,14 @@ additional characters. @cindex digit character @cindex decimal digit character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isdigit (int @var{c}) Returns true if @var{c} is a decimal digit (@samp{0} through @samp{9}). @end deftypefun @cindex alphanumeric character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isalnum (int @var{c}) Returns true if @var{c} is an alphanumeric character (a letter or number); in other words, if either @code{isalpha} or @code{isdigit} is @@ -99,7 +99,7 @@ true of a character, then @code{isalnum} is also true. @cindex hexadecimal digit character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isxdigit (int @var{c}) Returns true if @var{c} is a hexadecimal digit. Hexadecimal digits include the normal decimal digits @samp{0} through @@ -109,7 +109,7 @@ Hexadecimal digits include the normal decimal digits @samp{0} through @cindex punctuation character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int ispunct (int @var{c}) Returns true if @var{c} is a punctuation character. This means any printing character that is not alphanumeric or a space @@ -118,7 +118,7 @@ character. @cindex whitespace character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isspace (int @var{c}) Returns true if @var{c} is a @dfn{whitespace} character. In the standard @code{"C"} locale, @code{isspace} returns true for only the standard @@ -155,7 +155,7 @@ This function is a GNU extension. @cindex graphic character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isgraph (int @var{c}) Returns true if @var{c} is a graphic character; that is, a character that has a glyph associated with it. The whitespace characters are not @@ -164,7 +164,7 @@ considered graphic. @cindex printing character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int isprint (int @var{c}) Returns true if @var{c} is a printing character. Printing characters include all the graphic characters, plus the space (@samp{ }) character. @@ -172,7 +172,7 @@ include all the graphic characters, plus the space (@samp{ }) character. @cindex control character @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int iscntrl (int @var{c}) Returns true if @var{c} is a control character (that is, a character that is not a printing character). @@ -203,7 +203,7 @@ character to convert, and return the converted character as an @code{int}. If the conversion is not applicable to the argument given, the argument is returned unchanged. -@strong{Compatibility Note:} In pre-ANSI C dialects, instead of +@strong{Compatibility Note:} In pre-@w{ISO C} dialects, instead of returning the argument unchanged, these functions may fail when the argument is not suitable for the conversion. Thus for portability, you may need to write @code{islower(c) ? toupper(c) : c} rather than just @@ -213,7 +213,7 @@ These functions are declared in the header file @file{ctype.h}. @pindex ctype.h @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int tolower (int @var{c}) If @var{c} is an upper-case letter, @code{tolower} returns the corresponding lower-case letter. If @var{c} is not an upper-case letter, @@ -221,7 +221,7 @@ lower-case letter. If @var{c} is not an upper-case letter, @end deftypefun @comment ctype.h -@comment ANSI +@comment ISO @deftypefun int toupper (int @var{c}) If @var{c} is a lower-case letter, @code{tolower} returns the corresponding upper-case letter. Otherwise @var{c} is returned unchanged. diff --git a/manual/errno.texi b/manual/errno.texi index f96c260c28..47d9857dde 100644 --- a/manual/errno.texi +++ b/manual/errno.texi @@ -36,7 +36,7 @@ variable @code{errno}. This variable is declared in the header file @pindex errno.h @comment errno.h -@comment ANSI +@comment ISO @deftypevr {Variable} {volatile int} errno The variable @code{errno} contains the system error number. You can change the value of @code{errno}. @@ -62,7 +62,7 @@ result of calling other library functions which might fail. You should assume that any library function might alter @code{errno} when the function returns an error. -@strong{Portability Note:} ANSI C specifies @code{errno} as a +@strong{Portability Note:} @w{ISO C} specifies @code{errno} as a ``modifiable lvalue'' rather than as a variable, permitting it to be implemented as a macro. For example, its expansion might involve a function call, like @w{@code{*_errno ()}}. In fact, that is what it is @@ -397,7 +397,7 @@ unless it has handled or blocked @code{SIGPIPE}. @end deftypevr @comment errno.h -@comment ANSI: Numerical argument out of domain +@comment ISO: Numerical argument out of domain @deftypevr Macro int EDOM @comment errno 33 @c DO NOT REMOVE Domain error; used by mathematical functions when an argument value does @@ -405,7 +405,7 @@ not fall into the domain over which the function is defined. @end deftypevr @comment errno.h -@comment ANSI: Numerical result out of range +@comment ISO: Numerical result out of range @deftypevr Macro int ERANGE @comment errno 34 @c DO NOT REMOVE Range error; used by mathematical functions when the result value is @@ -1198,7 +1198,7 @@ for a given error code; the variable name of the program that encountered the error. @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strerror (int @var{errnum}) The @code{strerror} function maps the error code (@pxref{Checking for Errors}) specified by the @var{errnum} argument to a descriptive error @@ -1215,7 +1215,7 @@ The function @code{strerror} is declared in @file{string.h}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun void perror (const char *@var{message}) This function prints an error message to the stream @code{stderr}; see @ref{Standard Streams}. @@ -1239,7 +1239,7 @@ messages or embedded newlines. Each error message begins with a capital letter and does not include any terminating punctuation. @strong{Compatibility Note:} The @code{strerror} function is a new -feature of ANSI C. Many older C systems do not support this function +feature of @w{ISO C}. Many older C systems do not support this function yet. @cindex program name diff --git a/manual/filesys.texi b/manual/filesys.texi index 31325268f9..39d4082b7f 100644 --- a/manual/filesys.texi +++ b/manual/filesys.texi @@ -714,9 +714,9 @@ The prototype for this function is declared in the header file @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int remove (const char *@var{filename}) -This is the ANSI C function to remove a file. It works like +This is the @w{ISO C} function to remove a file. It works like @code{unlink} for files and like @code{rmdir} for directories. @code{remove} is declared in @file{stdio.h}. @pindex stdio.h @@ -729,7 +729,7 @@ The @code{rename} function is used to change a file's name. @cindex renaming a file @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int rename (const char *@var{oldname}, const char *@var{newname}) The @code{rename} function renames the file name @var{oldname} with @var{newname}. The file formerly accessible under the name @@ -1981,19 +1981,19 @@ These facilities are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {FILE *} tmpfile (void) This function creates a temporary binary file for update mode, as if by calling @code{fopen} with mode @code{"wb+"}. The file is deleted automatically when it is closed or when the program terminates. (On -some other ANSI C systems the file may fail to be deleted if the program +some other @w{ISO C} systems the file may fail to be deleted if the program terminates abnormally). This function is reentrant. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {char *} tmpnam (char *@var{result}) This function constructs and returns a file name that is a valid file name and that does not name any existing file. If the @var{result} @@ -2021,7 +2021,7 @@ This function is reentrant because the non-reentrant situation of @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int L_tmpnam The value of this macro is an integer constant expression that represents the minimum allocation size of a string large enough to hold the @@ -2029,7 +2029,7 @@ file name generated by the @code{tmpnam} function. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int TMP_MAX The macro @code{TMP_MAX} is a lower bound for how many temporary names you can create with @code{tmpnam}. You can rely on being able to call diff --git a/manual/intro.texi b/manual/intro.texi index 382f35c039..b4cb344915 100644 --- a/manual/intro.texi +++ b/manual/intro.texi @@ -9,7 +9,7 @@ programs. @cindex library The GNU C library, described in this document, defines all of the -library functions that are specified by the ANSI C standard, as well as +library functions that are specified by the @w{ISO C} standard, as well as additional features specific to POSIX and other derivatives of the Unix operating system, and extensions specific to the GNU system. @@ -33,8 +33,8 @@ portability. This manual is written with the assumption that you are at least somewhat familiar with the C programming language and basic programming -concepts. Specifically, familiarity with ANSI standard C -(@pxref{ANSI C}), rather than ``traditional'' pre-ANSI C dialects, is +concepts. Specifically, familiarity with ISO standard C +(@pxref{ISO C}), rather than ``traditional'' pre-ISO C dialects, is assumed. The GNU C library includes several @dfn{header files}, each of which @@ -61,7 +61,7 @@ specific information about them. @cindex standards This section discusses the various standards and other sources that the -GNU C library is based upon. These sources include the ANSI C and +GNU C library is based upon. These sources include the @w{ISO C} and POSIX standards, and the System V and Berkeley Unix implementations. The primary focus of this manual is to tell you how to make effective @@ -77,44 +77,48 @@ other symbols provided by the library. This list also states which standards each function or symbol comes from. @menu -* ANSI C:: The American National Standard for the - C programming language. -* POSIX:: The IEEE 1003 standards for operating - systems. +* ISO C:: The international standard for the C + programming language. +* POSIX:: The ISO/IEC 9945 (aka IEEE 1003) standards + for operating systems. * Berkeley Unix:: BSD and SunOS. * SVID:: The System V Interface Description. @end menu -@node ANSI C, POSIX, , Standards and Portability -@subsection ANSI C -@cindex ANSI C +@node ISO C, POSIX, , Standards and Portability +@subsection ISO C +@cindex ISO C The GNU C library is compatible with the C standard adopted by the American National Standards Institute (ANSI): -@cite{American National Standard X3.159-1989---``ANSI C''}. +@cite{American National Standard X3.159-1989---``ANSI C''} and later +by the International Standardization Organizaion (ISO): +@cite{ISO/IEC 9899:1990, ``Programming languages---C''}. +We here refer to the standard as @w{ISO C} since this is the more +general standard in respect of ratification. The header files and library facilities that make up the GNU library are -a superset of those specified by the ANSI C standard.@refill +a superset of those specified by the @w{ISO C} standard.@refill @pindex gcc -If you are concerned about strict adherence to the ANSI C standard, you +If you are concerned about strict adherence to the @w{ISO C} standard, you should use the @samp{-ansi} option when you compile your programs with -the GNU C compiler. This tells the compiler to define @emph{only} ANSI +the GNU C compiler. This tells the compiler to define @emph{only} ISO standard features from the library header files, unless you explicitly ask for additional features. @xref{Feature Test Macros}, for information on how to do this. -Being able to restrict the library to include only ANSI C features is -important because ANSI C puts limitations on what names can be defined +Being able to restrict the library to include only @w{ISO C} features is +important because @w{ISO C} puts limitations on what names can be defined by the library implementation, and the GNU extensions don't fit these limitations. @xref{Reserved Names}, for more information about these restrictions. This manual does not attempt to give you complete details on the -differences between ANSI C and older dialects. It gives advice on how +differences between @w{ISO C} and older dialects. It gives advice on how to write programs to work portably under multiple C dialects, but does not aim for completeness. -@node POSIX, Berkeley Unix, ANSI C, Standards and Portability +@node POSIX, Berkeley Unix, ISO C, Standards and Portability @subsection POSIX (The Portable Operating System Interface) @cindex POSIX @cindex POSIX.1 @@ -128,8 +132,8 @@ Interface for Computer Environments}. POSIX is derived mostly from various versions of the Unix operating system. The library facilities specified by the POSIX standards are a superset -of those required by ANSI C; POSIX specifies additional features for -ANSI C functions, as well as specifying new additional functions. In +of those required by @w{ISO C}; POSIX specifies additional features for +@w{ISO C} functions, as well as specifying new additional functions. In general, the additional requirements and functionality defined by the POSIX standards are aimed at providing lower-level support for a particular kind of operating system environment, rather than general @@ -139,7 +143,7 @@ system environments.@refill The GNU C library implements all of the functions specified in @cite{IEEE Std 1003.1-1990, the POSIX System Application Program Interface}, commonly referred to as POSIX.1. The primary extensions to -the ANSI C facilities specified by this standard include file system +the @w{ISO C} facilities specified by this standard include file system interface primitives (@pxref{File System Interface}), device-specific terminal control functions (@pxref{Low-Level Terminal Interface}), and process control functions (@pxref{Processes}). @@ -175,7 +179,7 @@ The GNU C library defines facilities from some versions of Unix which are not formally standardized, specifically from the 4.2 BSD, 4.3 BSD, and 4.4 BSD Unix systems (also known as @dfn{Berkeley Unix}) and from @dfn{SunOS} (a popular 4.2 BSD derivative that includes some Unix System -V functionality). These systems support most of the ANSI and POSIX +V functionality). These systems support most of the @w{ISO C} and POSIX facilities, and 4.4 BSD and newer releases of SunOS in fact support them all. The BSD facilities include symbolic links (@pxref{Symbolic Links}), the @@ -193,7 +197,7 @@ the AT&T Unix System V operating system. It is to some extent a superset of the POSIX standard (@pxref{POSIX}). The GNU C library defines some of the facilities required by the SVID -that are not also required by the ANSI or POSIX standards, for +that are not also required by the @w{ISO C} or POSIX standards, for compatibility with System V Unix and other Unix systems (such as SunOS) which include these facilities. However, many of the more obscure and less generally useful facilities required by the SVID are @@ -295,7 +299,7 @@ program needs to include multiple header files, the order in which they are included doesn't matter. @strong{Compatibility Note:} Inclusion of standard header files in any -order and any number of times works in any ANSI C implementation. +order and any number of times works in any @w{ISO C} implementation. However, this has traditionally not been the case in many older C implementations. @@ -384,7 +388,7 @@ just makes your program slower. @cindex name space The names of all library types, macros, variables and functions that -come from the ANSI C standard are reserved unconditionally; your program +come from the @w{ISO C} standard are reserved unconditionally; your program @strong{may not} redefine these names. All other library names are reserved if your program explicitly includes the header file that defines or declares them. There are several reasons for these diff --git a/manual/io.texi b/manual/io.texi index 84fd0a9e44..aa9e21c48b 100644 --- a/manual/io.texi +++ b/manual/io.texi @@ -119,14 +119,14 @@ and formatted output functions (@pxref{Formatted Output}). If you are concerned about portability of your programs to systems other than GNU, you should also be aware that file descriptors are not as -portable as streams. You can expect any system running ANSI C to +portable as streams. You can expect any system running @w{ISO C} to support streams, but non-GNU systems may not support file descriptors at all, or may only implement a subset of the GNU functions that operate on file descriptors. Most of the file descriptor functions in the GNU library are included in the POSIX.1 standard, however. @node File Position, , Streams and File Descriptors, I/O Concepts -@subsection File Position +@subsection File Position One of the attributes of an open file is its @dfn{file position} that keeps track of where in the file the next character is to be read or @@ -163,11 +163,11 @@ given file at the same time. In order for each program to be able to read the file at its own pace, each program must have its own file pointer, which is not affected by anything the other programs do. -In fact, each opening of a file creates a separate file position. +In fact, each opening of a file creates a separate file position. Thus, if you open a file twice even in the same program, you get two streams or descriptors with independent file positions. -By contrast, if you open a descriptor and then duplicate it to get +By contrast, if you open a descriptor and then duplicate it to get another descriptor, these two descriptors share the same file position: changing the file position of one descriptor will affect the other. @@ -285,7 +285,7 @@ The file named @file{b}, in the directory named @file{a} in the root directory. The file named @file{a}, in the current working directory. @item /a/./b -This is the same as @file{/a/b}. +This is the same as @file{/a/b}. @item ./a The file named @file{a}, in the current working directory. @@ -295,7 +295,7 @@ The file named @file{a}, in the parent directory of the current working directory. @end table -@c An empty string may ``work'', but I think it's confusing to +@c An empty string may ``work'', but I think it's confusing to @c try to describe it. It's not a useful thing for users to use--rms. A file name that names a directory may optionally end in a @samp{/}. You can specify a file name of @file{/} to refer to the root directory, @@ -323,7 +323,7 @@ this manual as the @dfn{usual file name errors}. @table @code @item EACCES -The process does not have search permission for a directory component +The process does not have search permission for a directory component of the file name. @item ENAMETOOLONG @@ -363,7 +363,7 @@ There are two reasons why it can be important for you to be aware of file name portability issues: @itemize @bullet -@item +@item If your program makes assumptions about file name syntax, or contains embedded literal file name strings, it is more difficult to get it to run under other operating systems that use different syntax conventions. @@ -377,7 +377,7 @@ operating system over a network, or read and write disks in formats used by other operating systems. @end itemize -The ANSI C standard says very little about file name syntax, only that +The @w{ISO C} standard says very little about file name syntax, only that file names are strings. In addition to varying restrictions on the length of file names and what characters can validly appear in a file name, different operating systems use different conventions and syntax @@ -392,5 +392,3 @@ component strings. However, in the GNU system, you do not need to worry about these restrictions; any character except the null character is permitted in a file name string, and there are no limits on the length of file name strings. - - diff --git a/manual/lang.texi b/manual/lang.texi index 18a1da3b22..39bba83540 100644 --- a/manual/lang.texi +++ b/manual/lang.texi @@ -46,7 +46,7 @@ would rather have a program crash, visibly, than have it return nonsense without indicating anything might be wrong. @comment assert.h -@comment ANSI +@comment ISO @deftypefn Macro void assert (int @var{expression}) Verify the programmer's belief that @var{expression} should be nonzero at this point in the program. @@ -139,7 +139,7 @@ problems that @emph{do not} represent bugs in the program. @cindex variadic functions @cindex optional arguments -ANSI C defines a syntax for declaring a function to take a variable +@w{ISO C} defines a syntax for declaring a function to take a variable number or type of arguments. (Such functions are referred to as @dfn{varargs functions} or @dfn{variadic functions}.) However, the language itself provides no mechanism for such functions to access their @@ -191,7 +191,7 @@ These are good reasons to define a @dfn{variadic} function which can handle as many arguments as the caller chooses to pass. Some functions such as @code{open} take a fixed set of arguments, but -occasionally ignore the last few. Strict adherence to ANSI C requires +occasionally ignore the last few. Strict adherence to @w{ISO C} requires these functions to be defined as variadic; in practice, however, the GNU C compiler and most other C compilers let you define such a function to take a fixed set of arguments---the most it can ever use---and then only @@ -229,7 +229,7 @@ additional variable arguments. @xref{Calling Variadics}. variable arguments functions. * Argument Macros:: Detailed specification of the macros for accessing variable arguments. -* Old Varargs:: The pre-ANSI way of defining variadic functions. +* Old Varargs:: The pre-ISO way of defining variadic functions. @end menu @node Variadic Prototypes @@ -241,7 +241,7 @@ additional variable arguments. @xref{Calling Variadics}. A function that accepts a variable number of arguments must be declared with a prototype that says so. You write the fixed arguments as usual, and then tack on @samp{@dots{}} to indicate the possibility of -additional arguments. The syntax of ANSI C requires at least one fixed +additional arguments. The syntax of @w{ISO C} requires at least one fixed argument before the @samp{@dots{}}. For example, @smallexample @@ -264,7 +264,7 @@ definition. Furthermore, this argument's type must be @dfn{self-promoting}: that is, the default promotions must not change its type. This rules out array and function types, as well as @code{float}, @code{char} (whether signed or not) and @w{@code{short int}} -(whether signed or not). This is actually an ANSI C requirement. +(whether signed or not). This is actually an @w{ISO C} requirement. @node Receiving Arguments @subsubsection Receiving the Argument Values @@ -328,7 +328,7 @@ argument values, but at its own pace. argument pointer value to a subroutine, you must not keep using the same argument pointer value after that subroutine returns. For full portability, you should just pass it to @code{va_end}. This is actually -an ANSI C requirement, but most ANSI C compilers work happily +an @w{ISO C} requirement, but most ANSI C compilers work happily regardless. @node How Many Arguments @@ -419,13 +419,13 @@ These macros are defined in the header file @file{stdarg.h}. @pindex stdarg.h @comment stdarg.h -@comment ANSI +@comment ISO @deftp {Data Type} va_list The type @code{va_list} is used for argument pointer variables. @end deftp @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} void va_start (va_list @var{ap}, @var{last-required}) This macro initializes the argument pointer variable @var{ap} to point to the first of the optional arguments of the current function; @@ -436,7 +436,7 @@ found in the header file @file{varargs.h}. @end deftypefn @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} @var{type} va_arg (va_list @var{ap}, @var{type}) The @code{va_arg} macro returns the value of the next optional argument, and modifies the value of @var{ap} to point to the subsequent argument. @@ -450,7 +450,7 @@ of the actual argument. @end deftypefn @comment stdarg.h -@comment ANSI +@comment ISO @deftypefn {Macro} void va_end (va_list @var{ap}) This ends the use of @var{ap}. After a @code{va_end} call, further @code{va_arg} calls with the same @var{ap} may not work. You should invoke @@ -480,10 +480,10 @@ arguments facility. @subsubsection Old-Style Variadic Functions @pindex varargs.h -Before ANSI C, programmers used a slightly different facility for +Before @w{ISO C}, programmers used a slightly different facility for writing variadic functions. The GNU C compiler still supports it; -currently, it is more portable than the ANSI C facility, since support -for ANSI C is still not universal. The header file which defines the +currently, it is more portable than the @w{ISO C} facility, since support +for @w{ISO C} is still not universal. The header file which defines the old-fashioned variadic facility is called @file{varargs.h}. Using @file{varargs.h} is almost the same as using @file{stdarg.h}. @@ -548,7 +548,7 @@ You can assign it to any pointer variable since it has type @code{void @code{NULL}. @comment stddef.h -@comment ANSI +@comment ISO @deftypevr Macro {void *} NULL This is a null pointer constant. @end deftypevr @@ -571,13 +571,13 @@ recommend instead adding a prototype for the function you are calling. The result of subtracting two pointers in C is always an integer, but the precise data type varies from C compiler to C compiler. Likewise, the data type of the result of @code{sizeof} also varies between compilers. -ANSI defines standard aliases for these two types, so you can refer to +ISO defines standard aliases for these two types, so you can refer to them in a portable fashion. They are defined in the header file @file{stddef.h}. @pindex stddef.h @comment stddef.h -@comment ANSI +@comment ISO @deftp {Data Type} ptrdiff_t This is the signed integer type of the result of subtracting two pointers. For example, with the declaration @code{char *p1, *p2;}, the @@ -588,7 +588,7 @@ type that exists only for this purpose. @end deftp @comment stddef.h -@comment ANSI +@comment ISO @deftp {Data Type} size_t This is an unsigned integer type used to represent the sizes of objects. The result of the @code{sizeof} operator is of this type, and functions @@ -616,7 +616,7 @@ possibility of error, when a function argument or value is supposed to have type @code{size_t}, never declare its type in any other way. @strong{Compatibility Note:} Implementations of C before the advent of -ANSI C generally used @code{unsigned int} for representing object sizes +@w{ISO C} generally used @code{unsigned int} for representing object sizes and @code{int} for pointer subtraction results. They did not necessarily define either @code{size_t} or @code{ptrdiff_t}. Unix systems did define @code{size_t}, in @file{sys/types.h}, but the @@ -665,7 +665,7 @@ bits in an integer data type. But you can compute it from the macro @table @code @comment limits.h -@comment ANSI +@comment ISO @item CHAR_BIT This is the number of bits in a @code{char}---eight, on most systems. The value has type @code{int}. @@ -705,23 +705,23 @@ described by the macro---thus, @code{ULONG_MAX} has type @comment Extra blank lines make it look better. @table @code @comment limits.h -@comment ANSI +@comment ISO @item SCHAR_MIN This is the minimum value that can be represented by a @w{@code{signed char}}. @comment limits.h -@comment ANSI +@comment ISO @item SCHAR_MAX @comment limits.h -@comment ANSI +@comment ISO @itemx UCHAR_MAX These are the maximum values that can be represented by a @w{@code{signed char}} and @w{@code{unsigned char}}, respectively. @comment limits.h -@comment ANSI +@comment ISO @item CHAR_MIN This is the minimum value that can be represented by a @code{char}. @@ -729,7 +729,7 @@ It's equal to @code{SCHAR_MIN} if @code{char} is signed, or zero otherwise. @comment limits.h -@comment ANSI +@comment ISO @item CHAR_MAX This is the maximum value that can be represented by a @code{char}. @@ -737,7 +737,7 @@ It's equal to @code{SCHAR_MAX} if @code{char} is signed, or @code{UCHAR_MAX} otherwise. @comment limits.h -@comment ANSI +@comment ISO @item SHRT_MIN This is the minimum value that can be represented by a @w{@code{signed @@ -745,10 +745,10 @@ short int}}. On most machines that the GNU C library runs on, @code{short} integers are 16-bit quantities. @comment limits.h -@comment ANSI +@comment ISO @item SHRT_MAX @comment limits.h -@comment ANSI +@comment ISO @itemx USHRT_MAX These are the maximum values that can be represented by a @@ -756,7 +756,7 @@ These are the maximum values that can be represented by a respectively. @comment limits.h -@comment ANSI +@comment ISO @item INT_MIN This is the minimum value that can be represented by a @w{@code{signed @@ -764,17 +764,17 @@ int}}. On most machines that the GNU C system runs on, an @code{int} is a 32-bit quantity. @comment limits.h -@comment ANSI +@comment ISO @item INT_MAX @comment limits.h -@comment ANSI +@comment ISO @itemx UINT_MAX These are the maximum values that can be represented by, respectively, the type @w{@code{signed int}} and the type @w{@code{unsigned int}}. @comment limits.h -@comment ANSI +@comment ISO @item LONG_MIN This is the minimum value that can be represented by a @w{@code{signed @@ -782,10 +782,10 @@ long int}}. On most machines that the GNU C system runs on, @code{long} integers are 32-bit quantities, the same size as @code{int}. @comment limits.h -@comment ANSI +@comment ISO @item LONG_MAX @comment limits.h -@comment ANSI +@comment ISO @itemx ULONG_MAX These are the maximum values that can be represented by a @@ -803,7 +803,7 @@ long long int}}. On most machines that the GNU C system runs on, @comment GNU @item LONG_LONG_MAX @comment limits.h -@comment ANSI +@comment ISO @itemx ULONG_LONG_MAX These are the maximum values that can be represented by a @code{signed @@ -962,16 +962,16 @@ expression. The other macros listed here cannot be reliably used in places that require constant expressions, such as @samp{#if} preprocessing directives or in the dimensions of static arrays. -Although the ANSI C standard specifies minimum and maximum values for +Although the @w{ISO C} standard specifies minimum and maximum values for most of these parameters, the GNU C implementation uses whatever values describe the floating point representation of the target machine. So in -principle GNU C actually satisfies the ANSI C requirements only if the +principle GNU C actually satisfies the @w{ISO C} requirements only if the target machine is suitable. In practice, all the machines currently supported are suitable. @table @code @comment float.h -@comment ANSI +@comment ISO @item FLT_ROUNDS This value characterizes the rounding mode for floating point addition. The following values indicate standard rounding modes: @@ -1011,7 +1011,7 @@ the IEEE single-precision standard. @end smallexample @comment float.h -@comment ANSI +@comment ISO @item FLT_RADIX This is the value of the base, or radix, of exponent representation. This is guaranteed to be a constant expression, unlike the other macros @@ -1019,7 +1019,7 @@ described in this section. The value is 2 on all machines we know of except the IBM 360 and derivatives. @comment float.h -@comment ANSI +@comment ISO @item FLT_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating point mantissa for the @code{float} data type. The following expression @@ -1036,7 +1036,7 @@ float radix = FLT_RADIX; where @code{radix} appears @code{FLT_MANT_DIG} times. @comment float.h -@comment ANSI +@comment ISO @item DBL_MANT_DIG @itemx LDBL_MANT_DIG This is the number of base-@code{FLT_RADIX} digits in the floating point @@ -1045,7 +1045,7 @@ respectively. @comment Extra blank lines make it look better. @comment float.h -@comment ANSI +@comment ISO @item FLT_DIG This is the number of decimal digits of precision for the @code{float} @@ -1057,10 +1057,10 @@ point number with @var{p} base @var{b} digits and back again, without change to the @var{q} decimal digits. The value of this macro is supposed to be at least @code{6}, to satisfy -ANSI C. +@w{ISO C}. @comment float.h -@comment ANSI +@comment ISO @item DBL_DIG @itemx LDBL_DIG @@ -1069,7 +1069,7 @@ These are similar to @code{FLT_DIG}, but for the data types macros are supposed to be at least @code{10}. @comment float.h -@comment ANSI +@comment ISO @item FLT_MIN_EXP This is the smallest possible exponent value for type @code{float}. More precisely, is the minimum negative integer such that the value @@ -1077,7 +1077,7 @@ More precisely, is the minimum negative integer such that the value normalized floating point number of type @code{float}. @comment float.h -@comment ANSI +@comment ISO @item DBL_MIN_EXP @itemx LDBL_MIN_EXP @@ -1085,21 +1085,21 @@ These are similar to @code{FLT_MIN_EXP}, but for the data types @code{double} and @code{long double}, respectively. @comment float.h -@comment ANSI +@comment ISO @item FLT_MIN_10_EXP This is the minimum negative integer such that @code{10} raised to this power minus 1 can be represented as a normalized floating point number of type @code{float}. This is supposed to be @code{-37} or even less. @comment float.h -@comment ANSI +@comment ISO @item DBL_MIN_10_EXP @itemx LDBL_MIN_10_EXP These are similar to @code{FLT_MIN_10_EXP}, but for the data types @code{double} and @code{long double}, respectively. @comment float.h -@comment ANSI +@comment ISO @item FLT_MAX_EXP This is the largest possible exponent value for type @code{float}. More precisely, this is the maximum positive integer such that value @@ -1107,28 +1107,28 @@ precisely, this is the maximum positive integer such that value floating point number of type @code{float}. @comment float.h -@comment ANSI +@comment ISO @item DBL_MAX_EXP @itemx LDBL_MAX_EXP These are similar to @code{FLT_MAX_EXP}, but for the data types @code{double} and @code{long double}, respectively. @comment float.h -@comment ANSI +@comment ISO @item FLT_MAX_10_EXP This is the maximum positive integer such that @code{10} raised to this power minus 1 can be represented as a normalized floating point number of type @code{float}. This is supposed to be at least @code{37}. @comment float.h -@comment ANSI +@comment ISO @item DBL_MAX_10_EXP @itemx LDBL_MAX_10_EXP These are similar to @code{FLT_MAX_10_EXP}, but for the data types @code{double} and @code{long double}, respectively. @comment float.h -@comment ANSI +@comment ISO @item FLT_MAX The value of this macro is the maximum number representable in type @@ -1138,7 +1138,7 @@ has type @code{float}. The smallest representable number is @code{- FLT_MAX}. @comment float.h -@comment ANSI +@comment ISO @item DBL_MAX @itemx LDBL_MAX @@ -1147,7 +1147,7 @@ These are similar to @code{FLT_MAX}, but for the data types macro's value is the same as the type it describes. @comment float.h -@comment ANSI +@comment ISO @item FLT_MIN The value of this macro is the minimum normalized positive floating @@ -1155,7 +1155,7 @@ point number that is representable in type @code{float}. It is supposed to be no more than @code{1E-37}. @comment float.h -@comment ANSI +@comment ISO @item DBL_MIN @itemx LDBL_MIN @@ -1164,7 +1164,7 @@ These are similar to @code{FLT_MIN}, but for the data types macro's value is the same as the type it describes. @comment float.h -@comment ANSI +@comment ISO @item FLT_EPSILON This is the minimum positive floating point number of type @code{float} @@ -1172,7 +1172,7 @@ such that @code{1.0 + FLT_EPSILON != 1.0} is true. It's supposed to be no greater than @code{1E-5}. @comment float.h -@comment ANSI +@comment ISO @item DBL_EPSILON @itemx LDBL_EPSILON @@ -1236,7 +1236,7 @@ You can use @code{offsetof} to measure the location within a structure type of a particular structure member. @comment stddef.h -@comment ANSI +@comment ISO @deftypefn {Macro} size_t offsetof (@var{type}, @var{member}) This expands to a integer constant expression that is the offset of the structure member named @var{member} in a the structure type @var{type}. diff --git a/manual/libc.texinfo b/manual/libc.texinfo index d6024ed611..fa3f3e443d 100644 --- a/manual/libc.texinfo +++ b/manual/libc.texinfo @@ -175,9 +175,10 @@ Introduction Standards and Portability -* ANSI C:: The American National Standard for the +* ISO C:: The American National Standard for the C programming language. -* POSIX:: The IEEE 1003 standards for operating systems. +* POSIX:: The ISO/IEC 9945 (aka IEEE 1003) standards + for operating systems. * Berkeley Unix:: BSD and SunOS. * SVID:: The System V Interface Description. @@ -365,7 +366,7 @@ I/O on Streams * Binary Streams:: Some systems distinguish between text files and binary files. * File Positioning:: About random-access streams. -* Portable Positioning:: Random access on peculiar ANSI C systems. +* Portable Positioning:: Random access on peculiar ISO C systems. * Stream Buffering:: How to control buffering of streams. * Temporary Files:: How to open a temporary file. * Other Kinds of Streams:: Other Kinds of Streams @@ -609,7 +610,7 @@ Mathematics Pseudo-Random Numbers -* ANSI Random:: @code{rand} and friends. +* ISO Random:: @code{rand} and friends. * BSD Random:: @code{random} and friends. Low-Level Arithmetic Functions diff --git a/manual/locale.texi b/manual/locale.texi index d2d7557ea9..cfe6b7e94b 100644 --- a/manual/locale.texi +++ b/manual/locale.texi @@ -9,7 +9,7 @@ the language spoken. @cindex internationalization @cindex locales @dfn{Internationalization} of software means programming it to be able -to adapt to the user's favorite conventions. In ANSI C, +to adapt to the user's favorite conventions. In @w{ISO C}, internationalization works by means of @dfn{locales}. Each locale specifies a collection of conventions, one convention for each purpose. The user chooses a set of conventions by specifying a locale (via @@ -21,15 +21,15 @@ will follow the conventions preferred by the user. @menu * Effects of Locale:: Actions affected by the choice of - locale. + locale. * Choosing Locale:: How the user specifies a locale. * Locale Categories:: Different purposes for which you can - select a locale. + select a locale. * Setting the Locale:: How a program specifies the locale - with library functions. + with library functions. * Standard Locales:: Locale names available on all systems. * Numeric Formatting:: How to format numbers according to the - chosen locale. + chosen locale. @end menu @node Effects of Locale, Choosing Locale, , Locales @@ -128,14 +128,14 @@ use as an argument to @code{setlocale}. @table @code @comment locale.h -@comment ANSI +@comment ISO @item LC_COLLATE @vindex LC_COLLATE This category applies to collation of strings (functions @code{strcoll} and @code{strxfrm}); see @ref{Collation Functions}. @comment locale.h -@comment ANSI +@comment ISO @item LC_CTYPE @vindex LC_CTYPE This category applies to classification and conversion of characters, @@ -143,48 +143,44 @@ and to multibyte and wide characters; see @ref{Character Handling} and @ref{Extended Characters}. @comment locale.h -@comment ANSI +@comment ISO @item LC_MONETARY @vindex LC_MONETARY This category applies to formatting monetary values; see @ref{Numeric Formatting}. @comment locale.h -@comment ANSI +@comment ISO @item LC_NUMERIC @vindex LC_NUMERIC This category applies to formatting numeric values that are not monetary; see @ref{Numeric Formatting}. @comment locale.h -@comment ANSI +@comment ISO @item LC_TIME @vindex LC_TIME This category applies to formatting date and time values; see @ref{Formatting Date and Time}. -@ignore This is apparently a feature that was in some early -draft of the POSIX.2 standard, but it's not listed in draft 11. Do we -still support this anyway? Is there a corresponding environment -variable? - @comment locale.h -@comment GNU -@item LC_RESPONSE -@vindex LC_RESPONSE -This category applies to recognizing ``yes'' or ``no'' responses to -questions. +@comment XOPEN +@item LC_MESSAGES +@vindex LC_MESSAGES +This category applies to selecting the language used in the user interface +for message translation. +@ignore see @ref{gettext} and @ref{catgets} @end ignore @comment locale.h -@comment ANSI +@comment ISO @item LC_ALL @vindex LC_ALL This is not an environment variable; it is only a macro that you can use with @code{setlocale} to set a single locale for all purposes. @comment locale.h -@comment ANSI +@comment ISO @item LANG @vindex LANG If this environment variable is defined, its value specifies the locale @@ -197,7 +193,7 @@ to use for all purposes except as overridden by the variables above. A C program inherits its locale environment variables when it starts up. This happens automatically. However, these variables do not automatically control the locale used by the library functions, because -ANSI C says that all programs start by default in the standard @samp{C} +@w{ISO C} says that all programs start by default in the standard @samp{C} locale. To use the locales specified by the environment, you must call @code{setlocale}. Call it as follows: @@ -217,9 +213,9 @@ general use or for a specific category. The symbols in this section are defined in the header file @file{locale.h}. @comment locale.h -@comment ANSI +@comment ISO @deftypefun {char *} setlocale (int @var{category}, const char *@var{locale}) -The function @code{setlocale} sets the current locale for +The function @code{setlocale} sets the current locale for category @var{category} to @var{locale}. If @var{category} is @code{LC_ALL}, this specifies the locale for all @@ -238,7 +234,7 @@ Concatenation}) if you want to save it past any further calls to @code{setlocale} itself.) You should not modify the string returned by @code{setlocale}. -It might be the same string that was passed as an argument in a +It might be the same string that was passed as an argument in a previous call to @code{setlocale}. When you read the current locale for category @code{LC_ALL}, the value @@ -277,23 +273,23 @@ with_other_locale (char *new_locale, /* @r{Get the name of the current locale.} */ old_locale = setlocale (LC_ALL, NULL); - + /* @r{Copy the name so it won't be clobbered by @code{setlocale}.} */ saved_locale = strdup (old_locale); if (old_locale == NULL) fatal ("Out of memory"); - + /* @r{Now change the locale and do some stuff with it.} */ setlocale (LC_ALL, new_locale); (*subroutine) (argument); - + /* @r{Restore the original locale.} */ setlocale (LC_ALL, saved_locale); free (saved_locale); @} @end smallexample -@strong{Portability Note:} Some ANSI C systems may define additional +@strong{Portability Note:} Some @w{ISO C} systems may define additional locale categories. For portability, assume that any symbol beginning with @samp{LC_} might be defined in @file{locale.h}. @@ -306,7 +302,7 @@ are these three standard ones: @table @code @item "C" This is the standard C locale. The attributes and behavior it provides -are specified in the ANSI C standard. When your program starts up, it +are specified in the @w{ISO C} standard. When your program starts up, it initially uses this locale by default. @item "POSIX" @@ -343,7 +339,7 @@ conventions of the current locale, you can use the function @cindex numeric value formatting @comment locale.h -@comment ANSI +@comment ISO @deftypefun {struct lconv *} localeconv (void) The @code{localeconv} function returns a pointer to a structure whose components contain information about how numeric and monetary values @@ -356,7 +352,7 @@ value. @end deftypefun @comment locale.h -@comment ANSI +@comment ISO @deftp {Data Type} {struct lconv} This is the data type of the value returned by @code{localeconv}. @end deftp @@ -436,7 +432,7 @@ international and local formats, respectively. (Most often, both members have the same value.) In the standard @samp{C} locale, both of these members have the value -@code{CHAR_MAX}, meaning ``unspecified''. The ANSI standard doesn't say +@code{CHAR_MAX}, meaning ``unspecified''. The ISO standard doesn't say what to do when you find this the value; we recommend printing no fractional digits. (This locale also specifies the empty string for @code{mon_decimal_point}, so printing any fractional digits would be @@ -469,7 +465,7 @@ assumed to be in Canadian dollars. The local currency symbol for the selected locale. In the standard @samp{C} locale, this member has a value of @code{""} -(the empty string), meaning ``unspecified''. The ANSI standard doesn't +(the empty string), meaning ``unspecified''. The ISO standard doesn't say what to do when you find this value; we recommend you simply print the empty string as you would print any other string found in the appropriate member. @@ -496,13 +492,13 @@ amounts (or zero), and the @code{n_cs_precedes} member applies to negative amounts. In the standard @samp{C} locale, both of these members have a value of -@code{CHAR_MAX}, meaning ``unspecified''. The ANSI standard doesn't say +@code{CHAR_MAX}, meaning ``unspecified''. The ISO standard doesn't say what to do when you find this value, but we recommend printing the currency symbol before the amount. That's right for most countries. In other words, treat all nonzero values alike in these members. The POSIX standard says that these two members apply to the -@code{int_curr_symbol} as well as the @code{currency_symbol}. The ANSI +@code{int_curr_symbol} as well as the @code{currency_symbol}. The ISO C standard seems to imply that they should apply only to the @code{currency_symbol}---so the @code{int_curr_symbol} should always precede the amount. @@ -521,7 +517,7 @@ amounts (or zero), and the @code{n_sep_by_space} member applies to negative amounts. In the standard @samp{C} locale, both of these members have a value of -@code{CHAR_MAX}, meaning ``unspecified''. The ANSI standard doesn't say +@code{CHAR_MAX}, meaning ``unspecified''. The ISO standard doesn't say what you should do when you find this value; we suggest you treat it as one (print a space). In other words, treat all nonzero values alike in these members. @@ -532,7 +528,7 @@ These members apply only to @code{currency_symbol}. When you use The POSIX standard says that these two members apply to the @code{int_curr_symbol} as well as the @code{currency_symbol}. But an -example in the ANSI C standard clearly implies that they should apply +example in the @w{ISO C} standard clearly implies that they should apply only to the @code{currency_symbol}---that the @code{int_curr_symbol} contains any appropriate separator, so you should never print an additional space. @@ -556,7 +552,7 @@ These are strings used to indicate positive (or zero) and negative In the standard @samp{C} locale, both of these members have a value of @code{""} (the empty string), meaning ``unspecified''. -The ANSI standard doesn't say what to do when you find this value; we +The ISO standard doesn't say what to do when you find this value; we recommend printing @code{positive_sign} as you find it, even if it is empty. For a negative value, print @code{negative_sign} as you find it unless both it and @code{positive_sign} are empty, in which case print @@ -592,14 +588,13 @@ Print the sign string right after the currency symbol. @samp{C} locale. @end table -The ANSI standard doesn't say what you should do when the value is +The ISO standard doesn't say what you should do when the value is @code{CHAR_MAX}. We recommend you print the sign after the currency symbol. @end table It is not clear whether you should let these members apply to the international currency format or not. POSIX says you should, but -intuition plus the examples in the ANSI C standard suggest you should +intuition plus the examples in the @w{ISO C} standard suggest you should not. We hope that someone who knows well the conventions for formatting monetary quantities will tell us what we should recommend. - diff --git a/manual/maint.texi b/manual/maint.texi index 975de537ae..b7401b8897 100644 --- a/manual/maint.texi +++ b/manual/maint.texi @@ -305,7 +305,7 @@ library which you are using. Also include the files you ran @file{configure}. If you think you have found some way in which the GNU C library does not -conform to the ANSI and POSIX standards (@pxref{Standards and +conform to the ISO and POSIX standards (@pxref{Standards and Portability}), that is definitely a bug. Report it!@refill Send bug reports to the Internet address @@ -767,8 +767,8 @@ generated are @file{ioctls.h}, @file{errnos.h}, @file{sys/param.h}, and @c ??? This section is really short now. Want to keep it? --roland -Although the GNU C library implements the ANSI C library facilities, you -@emph{can} use the GNU C library with traditional, ``pre-ANSI'' C +Although the GNU C library implements the @w{ISO C} library facilities, you +@emph{can} use the GNU C library with traditional, ``pre-ISO'' C compilers. However, you need to be careful because the content and organization of the GNU C library header files differs from that of traditional C implementations. This means you may need to make changes @@ -963,7 +963,7 @@ The random number generation functions @code{random}, @code{srandom}, @code{rand} and @code{srand} functions, were written by Earl T. Cohen for the University of California at Berkeley and are copyrighted by the Regents of the University of California. They have undergone minor -changes to fit into the GNU C library and to fit the ANSI C standard, +changes to fit into the GNU C library and to fit the @w{ISO C} standard, but the functional code is Berkeley's.@refill @item diff --git a/manual/math.texi b/manual/math.texi index 7de6d169ac..870edd54bf 100644 --- a/manual/math.texi +++ b/manual/math.texi @@ -71,12 +71,12 @@ domain or range errors. In particular, this means that you won't see Handling}, for more information about signals.) @comment math.h -@comment ANSI +@comment ISO @deftypevr Macro double HUGE_VAL An expression representing a particular very large number. On machines -that use @w{IEEE 754} floating point format, the value is ``infinity''. -On other machines, it's typically the largest positive number that can -be represented. +that use @w{IEEE 754}/@w{IEEE 854} floating point format, the value is +``infinity''. On other machines, it's typically the largest positive +number that can be represented. The value of this macro is used as the return value from various mathematical @code{double} returning functions in overflow situations. @@ -132,21 +132,21 @@ You can also compute the value of pi with the expression @code{acos @comment math.h -@comment ANSI +@comment ISO @deftypefun double sin (double @var{x}) This function returns the sine of @var{x}, where @var{x} is given in radians. The return value is in the range @code{-1} to @code{1}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double cos (double @var{x}) This function returns the cosine of @var{x}, where @var{x} is given in radians. The return value is in the range @code{-1} to @code{1}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double tan (double @var{x}) This function returns the tangent of @var{x}, where @var{x} is given in radians. @@ -172,7 +172,7 @@ which are the inverses of the sine, cosine and tangent functions, respectively. @comment math.h -@comment ANSI +@comment ISO @deftypefun double asin (double @var{x}) This function computes the arc sine of @var{x}---that is, the value whose sine is @var{x}. The value is in units of radians. Mathematically, @@ -185,7 +185,7 @@ over the domain @code{-1} to @code{1}. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double acos (double @var{x}) This function computes the arc cosine of @var{x}---that is, the value whose cosine is @var{x}. The value is in units of radians. @@ -199,7 +199,7 @@ over the domain @code{-1} to @code{1}. @comment math.h -@comment ANSI +@comment ISO @deftypefun double atan (double @var{x}) This function computes the arc tangent of @var{x}---that is, the value whose tangent is @var{x}. The value is in units of radians. @@ -209,7 +209,7 @@ returned is the one between @code{-pi/2} and @code{pi/2} @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double atan2 (double @var{y}, double @var{x}) This is the two argument arc tangent function. It is similar to computing the arc tangent of @var{y}/@var{x}, except that the signs of both arguments @@ -237,7 +237,7 @@ case. @cindex logarithm functions @comment math.h -@comment ANSI +@comment ISO @deftypefun double exp (double @var{x}) The @code{exp} function returns the value of e (the base of natural logarithms) raised to power @var{x}. @@ -247,7 +247,7 @@ magnitude of the result is too large to be representable. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double log (double @var{x}) This function returns the natural logarithm of @var{x}. @code{exp (log (@var{x}))} equals @var{x}, exactly in mathematics and approximately in @@ -266,7 +266,7 @@ The argument is zero. The log of zero is not defined. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double log10 (double @var{x}) This function returns the base-10 logarithm of @var{x}. Except for the different base, it is similar to the @code{log} function. In fact, @@ -274,7 +274,7 @@ different base, it is similar to the @code{log} function. In fact, @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double pow (double @var{base}, double @var{power}) This is a general exponentiation function, returning @var{base} raised to @var{power}. @@ -294,7 +294,7 @@ An underflow or overflow condition was detected in the result. @cindex square root function @comment math.h -@comment ANSI +@comment ISO @deftypefun double sqrt (double @var{x}) This function returns the nonnegative square root of @var{x}. @@ -346,7 +346,7 @@ The functions in this section are related to the exponential functions; see @ref{Exponents and Logarithms}. @comment math.h -@comment ANSI +@comment ISO @deftypefun double sinh (double @var{x}) The @code{sinh} function returns the hyperbolic sine of @var{x}, defined mathematically as @w{@code{exp (@var{x}) - exp (-@var{x}) / 2}}. The @@ -355,7 +355,7 @@ function fails, and sets @code{errno} to @code{ERANGE}, if the value of @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double cosh (double @var{x}) The @code{cosh} function returns the hyperbolic cosine of @var{x}, defined mathematically as @w{@code{exp (@var{x}) + exp (-@var{x}) / 2}}. @@ -364,7 +364,7 @@ of @var{x} is too large; that is, if overflow occurs. @end deftypefun @comment math.h -@comment ANSI +@comment ISO @deftypefun double tanh (double @var{x}) This function returns the hyperbolic tangent of @var{x}, whose mathematical definition is @w{@code{sinh (@var{x}) / cosh (@var{x})}}. @@ -424,27 +424,27 @@ generator. There is no standard meaning for a particular seed value; the same seed, used in different C libraries or on different CPU types, will give you different random numbers. -The GNU library supports the standard ANSI C random number functions +The GNU library supports the standard @w{ISO C} random number functions plus another set derived from BSD. We recommend you use the standard ones, @code{rand} and @code{srand}. @menu -* ANSI Random:: @code{rand} and friends. +* ISO Random:: @code{rand} and friends. * BSD Random:: @code{random} and friends. @end menu -@node ANSI Random -@subsection ANSI C Random Number Functions +@node ISO Random +@subsection ISO C Random Number Functions This section describes the random number functions that are part of -the ANSI C standard. +the @w{ISO C} standard. To use these facilities, you should include the header file @file{stdlib.h} in your program. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int RAND_MAX The value of this macro is an integer constant expression that represents the maximum possible value returned by the @code{rand} @@ -454,14 +454,14 @@ may be as low as @code{32767}. @end deftypevr @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int rand () The @code{rand} function returns the next pseudo-random number in the series. The value is in the range from @code{0} to @code{RAND_MAX}. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void srand (unsigned int @var{seed}) This function establishes @var{seed} as the seed for a new series of pseudo-random numbers. If you call @code{rand} before a seed has been diff --git a/manual/mbyte.texi b/manual/mbyte.texi index c058cbfb69..15f185b54d 100644 --- a/manual/mbyte.texi +++ b/manual/mbyte.texi @@ -26,7 +26,7 @@ character codes. and vice versa. * Length of Char:: how many bytes make up one multibyte char. * Converting One Char:: Converting a string character by character. -* Example of Conversion:: Example showing why converting +* Example of Conversion:: Example showing why converting one character at a time may be useful. * Shift State:: Multibyte codes with "shift characters". @end menu @@ -246,7 +246,7 @@ code with @code{MB_CUR_MAX}, and the maximum for @emph{any} multibyte code supported on your computer with @code{MB_LEN_MAX}. @comment limits.h -@comment ANSI +@comment ISO @deftypevr Macro int MB_LEN_MAX This is the maximum length of a multibyte character for any supported locale. It is defined in @file{limits.h}. @@ -254,7 +254,7 @@ locale. It is defined in @file{limits.h}. @end deftypevr @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int MB_CUR_MAX This macro expands into a (possibly non-constant) positive integer expression that is the maximum number of bytes in a multibyte character @@ -320,7 +320,7 @@ is often used to terminate a string of wide characters, just as a single byte with value zero often terminates a string of ordinary characters. @comment stddef.h -@comment ANSI +@comment ISO @deftp {Data Type} wchar_t This is the ``wide character'' type, an integer type whose range is large enough to represent all distinct values in any extended character @@ -358,7 +358,7 @@ functions to convert one character at a time. @xref{Converting One Char}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun size_t mbstowcs (wchar_t *@var{wstring}, const char *@var{string}, size_t @var{size}) The @code{mbstowcs} (``multibyte string to wide character string'') function converts the null-terminated string of multibyte characters @@ -398,7 +398,7 @@ mbstowcs_alloc (const char *string) @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun size_t wcstombs (char *@var{string}, const wchar_t @var{wstring}, size_t @var{size}) The @code{wcstombs} (``wide character string to multibyte string'') function converts the null-terminated wide character array @var{wstring} @@ -425,11 +425,11 @@ present if the number is less than @var{size}. This section describes how to scan a string containing multibyte characters, one character at a time. The difficulty in doing this -is to know how many bytes each character contains. Your program +is to know how many bytes each character contains. Your program can use @code{mblen} to find this out. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int mblen (const char *@var{string}, size_t @var{size}) The @code{mblen} function with a non-null @var{string} argument returns the number of bytes that make up the multibyte character beginning at @@ -468,7 +468,7 @@ with the @code{mbtowc} function. The @code{wctomb} function does the reverse. These functions are declared in @file{stdlib.h}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int mbtowc (wchar_t *@var{result}, const char *@var{string}, size_t @var{size}) The @code{mbtowc} (``multibyte to wide character'') function when called with non-null @var{string} converts the first multibyte character @@ -502,7 +502,7 @@ shift state. @xref{Shift State}. @end deftypefun @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int wctomb (char *@var{string}, wchar_t @var{wchar}) The @code{wctomb} (``wide character to multibyte'') function converts the wide character code @var{wchar} to its corresponding multibyte @@ -536,7 +536,7 @@ stored shift state @emph{as well as} storing the multibyte character @end deftypefun @node Example of Conversion, Shift State, Converting One Char, Extended Characters -@section Character-by-Character Conversion Example +@section Character-by-Character Conversion Example Here is an example that reads multibyte character text from descriptor @code{input} and writes the corresponding wide characters to descriptor diff --git a/manual/memory.texi b/manual/memory.texi index 6cbe77ff0e..bd1a9a5401 100644 --- a/manual/memory.texi +++ b/manual/memory.texi @@ -157,7 +157,7 @@ this function is in @file{stdlib.h}. @pindex stdlib.h @comment malloc.h stdlib.h -@comment ANSI +@comment ISO @deftypefun {void *} malloc (size_t @var{size}) This function returns a pointer to a newly allocated block @var{size} bytes long, or a null pointer if the block could not be allocated. @@ -179,7 +179,7 @@ memset (ptr, 0, sizeof (struct foo)); @end smallexample You can store the result of @code{malloc} into any pointer variable -without a cast, because ANSI C automatically converts the type +without a cast, because @w{ISO C} automatically converts the type @code{void *} to another type of pointer when necessary. But the cast is necessary in contexts other than assignment operators or if you might want your code to run in traditional C. @@ -263,7 +263,7 @@ The prototype for this function is in @file{stdlib.h}. @pindex stdlib.h @comment malloc.h stdlib.h -@comment ANSI +@comment ISO @deftypefun void free (void *@var{ptr}) The @code{free} function deallocates the block of storage pointed at by @var{ptr}. @@ -327,7 +327,7 @@ is declared in @file{stdlib.h}. @pindex stdlib.h @comment malloc.h stdlib.h -@comment ANSI +@comment ISO @deftypefun {void *} realloc (void *@var{ptr}, size_t @var{newsize}) The @code{realloc} function changes the size of the block whose address is @var{ptr} to be @var{newsize}. @@ -340,7 +340,7 @@ contents. If you pass a null pointer for @var{ptr}, @code{realloc} behaves just like @samp{malloc (@var{newsize})}. This can be convenient, but beware -that older implementations (before ANSI C) may not support this +that older implementations (before @w{ISO C}) may not support this behavior, and will probably crash when @code{realloc} is passed a null pointer. @end deftypefun @@ -383,7 +383,7 @@ is declared in @file{stdlib.h}. @pindex stdlib.h @comment malloc.h stdlib.h -@comment ANSI +@comment ISO @deftypefun {void *} calloc (size_t @var{count}, size_t @var{eltsize}) This function allocates a block long enough to contain a vector of @var{count} elements, each of size @var{eltsize}. Its contents are @@ -984,10 +984,10 @@ obstacks, or non-obstack allocation, can reuse the space of the chunk. The interfaces for using obstacks may be defined either as functions or as macros, depending on the compiler. The obstack facility works with -all C compilers, including both ANSI C and traditional C, but there are +all C compilers, including both @w{ISO C} and traditional C, but there are precautions you must take if you plan to use compilers other than GNU C. -If you are using an old-fashioned non-ANSI C compiler, all the obstack +If you are using an old-fashioned @w{non-ISO C} compiler, all the obstack ``functions'' are actually defined only as macros. You can call these macros like functions, but you cannot use them in any other way (for example, you cannot take their address). @@ -1006,7 +1006,7 @@ If you use @code{*obstack_list_ptr++} as the obstack pointer argument, you will get very strange results since the incrementation may occur several times. -In ANSI C, each function has both a macro definition and a function +In @w{ISO C}, each function has both a macro definition and a function definition. The function definition is used if you take the address of the function without calling it. An ordinary call uses the macro definition by default, but you can request the function definition instead by writing the @@ -1024,12 +1024,11 @@ funcp = obstack_alloc; @end smallexample @noindent -This is the same situation that exists in ANSI C for the standard library +This is the same situation that exists in @w{ISO C} for the standard library functions. @xref{Macro Definitions}. @strong{Warning:} When you do use the macros, you must observe the -precaution of avoiding side effects in the first operand, even in ANSI -C. +precaution of avoiding side effects in the first operand, even in @w{ISO C}. If you use the GNU C compiler, this precaution is not necessary, because various language extensions in GNU C permit defining the macros so as to diff --git a/manual/process.texi b/manual/process.texi index 2f5ba65af5..d382df5df1 100644 --- a/manual/process.texi +++ b/manual/process.texi @@ -34,7 +34,7 @@ primitive functions to do each step individually instead. * Creating a Process:: How to fork a child process. * Executing a File:: How to make a process execute another program. * Process Completion:: How to tell when a child process has completed. -* Process Completion Status:: How to interpret the status value +* Process Completion Status:: How to interpret the status value returned from a child process. * BSD Wait Functions:: More functions, for backward compatibility. * Process Creation Example:: A complete example program. @@ -51,7 +51,7 @@ it doesn't give you much control over the details: you have to wait until the subprogram terminates before you can do anything else. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int system (const char *@var{command}) @pindex sh This function executes @var{command} as a shell command. In the GNU C @@ -224,7 +224,7 @@ The child doesn't inherit alarms set by the parent process. The set of pending signals (@pxref{Delivery of Signal}) for the child process is cleared. (The child process inherits its mask of blocked signals and signal actions from the parent process.) -@end itemize +@end itemize @comment unistd.h @@ -300,7 +300,7 @@ passed as the last such argument. @deftypefun int execve (const char *@var{filename}, char *const @var{argv}@t{[]}, char *const @var{env}@t{[]}) This is similar to @code{execv}, but permits you to specify the environment for the new program explicitly as the @var{env} argument. This should -be an array of strings in the same format as for the @code{environ} +be an array of strings in the same format as for the @code{environ} variable; see @ref{Environment Access}. @end deftypefun @@ -725,7 +725,7 @@ argument using the equivalent of @samp{sh -c @var{command}}. #define SHELL "/bin/sh" @group -int +int my_system (const char *command) @{ int status; @@ -758,7 +758,7 @@ example. Remember that the first @code{argv} argument supplied to the program represents the name of the program being executed. That is why, in the call to @code{execl}, @code{SHELL} is supplied once to name the program -to execute and a second time to supply a value for @code{argv[0]}. +to execute and a second time to supply a value for @code{argv[0]}. The @code{execl} call in the child process doesn't return if it is successful. If it fails, you must do something to make the child diff --git a/manual/search.texi b/manual/search.texi index d914135297..26a8f82131 100644 --- a/manual/search.texi +++ b/manual/search.texi @@ -1,5 +1,5 @@ @node Searching and Sorting, Pattern Matching, Locales, Top -@chapter Searching and Sorting +@chapter Searching and Sorting This chapter describes functions for searching and sorting arrays of arbitrary objects. You pass the appropriate comparison function to be @@ -10,7 +10,7 @@ and the total number of elements. * Comparison Functions:: Defining how to compare two objects. Since the sort and search facilities are general, you have to specify the - ordering. + ordering. * Array Search Function:: The @code{bsearch} function. * Array Sort Function:: The @code{qsort} function. * Search/Sort Example:: An example program. @@ -64,11 +64,11 @@ the header file @file{stdlib.h}. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {void *} bsearch (const void *@var{key}, const void *@var{array}, size_t @var{count}, size_t @var{size}, comparison_fn_t @var{compare}) The @code{bsearch} function searches the sorted array @var{array} for an object that is equivalent to @var{key}. The array contains @var{count} elements, -each of which is of size @var{size} bytes. +each of which is of size @var{size} bytes. The @var{compare} function is used to perform the comparison. This function is called with two pointer arguments and should return an @@ -97,7 +97,7 @@ To sort an array using an arbitrary comparison function, use the @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void qsort (void *@var{array}, size_t @var{count}, size_t @var{size}, comparison_fn_t @var{compare}) The @var{qsort} function sorts the array @var{array}. The array contains @var{count} elements, each of which is of size @var{size}. @@ -191,5 +191,3 @@ Kermit, the frog Gonzo, the whatever Couldn't find Janice. @end smallexample - - diff --git a/manual/setjmp.texi b/manual/setjmp.texi index dfdac1c4cd..b8e7a45d8f 100644 --- a/manual/setjmp.texi +++ b/manual/setjmp.texi @@ -55,7 +55,7 @@ between an ordinary return and a return made by a call to @code{longjmp}, so calls to @code{setjmp} usually appear in an @samp{if} statement. -Here is how the example program described above might be set up: +Here is how the example program described above might be set up: @smallexample @include setjmp.c.texi @@ -95,7 +95,7 @@ performing non-local exits. These facilities are declared in @pindex setjmp.h @comment setjmp.h -@comment ANSI +@comment ISO @deftp {Data Type} jmp_buf Objects of type @code{jmp_buf} hold the state information to be restored by a non-local exit. The contents of a @code{jmp_buf} @@ -103,7 +103,7 @@ identify a specific place to return to. @end deftp @comment setjmp.h -@comment ANSI +@comment ISO @deftypefn Macro int setjmp (jmp_buf @var{state}) When called normally, @code{setjmp} stores information about the execution state of the program in @var{state} and returns zero. If @@ -112,8 +112,8 @@ execution state of the program in @var{state} and returns zero. If @end deftypefn @comment setjmp.h -@comment ANSI -@deftypefun void longjmp (jmp_buf @var{state}, int @var{value}) +@comment ISO +@deftypefun void longjmp (jmp_buf @var{state}, int @var{value}) This function restores current execution to the state saved in @var{state}, and continues execution from the call to @code{setjmp} that established that return point. Returning from @code{setjmp} by means of @@ -210,4 +210,3 @@ argument. If the @code{sigsetjmp} call that set this @var{state} used a nonzero @var{savesigs} flag, @code{siglongjmp} also restores the set of blocked signals. @end deftypefun - diff --git a/manual/signal.texi b/manual/signal.texi index bca02c528b..088c35d02f 100644 --- a/manual/signal.texi +++ b/manual/signal.texi @@ -34,7 +34,7 @@ and synchronize. * Generating Signals:: How to send a signal to a process. * Blocking Signals:: Making the system hold signals temporarily. * Waiting for a Signal:: Suspending your program until a signal - arrives. + arrives. * Signal Stack:: Using a Separate Signal Stack. * BSD Signal Handling:: Additional functions for backward compatibility with BSD. @@ -51,11 +51,11 @@ signals. * Kinds of Signals:: Some examples of what can cause a signal. * Signal Generation:: Concepts of why and how signals occur. * Delivery of Signal:: Concepts of what a signal does to the - process. + process. @end menu @node Kinds of Signals -@subsection Some Kinds of Signals +@subsection Some Kinds of Signals A signal reports the occurrence of an exceptional event. These are some of the events that can cause (or @dfn{generate}, or @dfn{raise}) a @@ -229,7 +229,7 @@ defined. Since the signal numbers are allocated consecutively, @menu * Program Error Signals:: Used to report serious program errors. * Termination Signals:: Used to interrupt and/or terminate the - program. + program. * Alarm Signals:: Used to indicate expiration of timers. * Asynchronous I/O Signals:: Used to indicate input is available. * Job Control Signals:: Signals used to support job control. @@ -279,7 +279,7 @@ files is so that you can examine them with a debugger to investigate what caused the error. @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGFPE The @code{SIGFPE} signal reports a fatal arithmetic error. Although the name is derived from ``floating-point exception'', this signal actually @@ -294,7 +294,8 @@ floating-point number. Actual floating-point exceptions are a complicated subject because there are many types of exceptions with subtly different meanings, and the @code{SIGFPE} signal doesn't distinguish between them. The @cite{IEEE -Standard for Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985)} +Standard for Binary Floating-Point Arithmetic (ANSI/IEEE Std 754-1985 +and ANSI/IEEE Std 854-1987)} defines various floating-point exceptions and requires conforming computer systems to report their occurrences. However, this standard does not specify how the exceptions are reported, or what kinds of @@ -368,7 +369,7 @@ Floating underflow fault. @end table @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGILL The name of this signal is derived from ``illegal instruction''; it usually means your program is trying to execute garbage or a privileged @@ -387,7 +388,7 @@ the system has trouble running the handler for a signal. @cindex illegal instruction @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGSEGV @cindex segmentation violation This signal is generated when a program tries to read or write outside @@ -421,7 +422,7 @@ The name of this signal is an abbreviation for ``bus error''. @cindex bus error @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGABRT @cindex abort signal This signal indicates an error detected by the program itself and @@ -480,7 +481,7 @@ The (obvious) default action for all of these signals is to cause the process to terminate. @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGTERM @cindex termination signal The @code{SIGTERM} signal is a generic signal used to cause program @@ -493,7 +494,7 @@ The shell command @code{kill} generates @code{SIGTERM} by default. @end deftypevr @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro int SIGINT @cindex interrupt signal The @code{SIGINT} (``program interrupt'') signal is sent when the user @@ -595,7 +596,7 @@ time used by the current process. The name is an abbreviation for @comment BSD @deftypevr Macro int SIGPROF This signal is typically indicates expiration of a timer that measures -both CPU time used by the current process, and CPU time expended on +both CPU time used by the current process, and CPU time expended on behalf of the process by the system. Such a timer is used to implement code profiling facilities, hence the name of this signal. @end deftypevr @@ -623,7 +624,7 @@ On most operating systems, terminals and sockets are the only kinds of files that can generate @code{SIGIO}; other kinds, including ordinary files, never generate @code{SIGIO} even if you ask them to. -In the GNU system @code{SIGIO} will always be generated properly +In the GNU system @code{SIGIO} will always be generated properly if you successfully set asynchronous mode with @code{fcntl}. @end deftypevr @@ -703,7 +704,7 @@ ignored, or blocked. @comment POSIX.1 @deftypevr Macro int SIGTSTP The @code{SIGTSTP} signal is an interactive stop signal. Unlike -@code{SIGSTOP}, this signal can be handled and ignored. +@code{SIGSTOP}, this signal can be handled and ignored. Your program should handle this signal if you have a special need to leave files or system tables in a secure state when a process is @@ -719,7 +720,7 @@ support, see @ref{Special Characters}. @comment signal.h @comment POSIX.1 @deftypevr Macro int SIGTTIN -A process cannot read from the the user's terminal while it is running +A process cannot read from the the user's terminal while it is running as a background job. When any process in a background job tries to read from the terminal, all of the processes in the job are sent a @code{SIGTTIN} signal. The default action for this signal is to @@ -906,11 +907,11 @@ This function prints a message describing the signal @var{signum} to the standard error output stream @code{stderr}; see @ref{Standard Streams}. If you call @code{psignal} with a @var{message} that is either a null -pointer or an empty string, @code{psignal} just prints the message +pointer or an empty string, @code{psignal} just prints the message corresponding to @var{signum}, adding a trailing newline. If you supply a non-null @var{message} argument, then @code{psignal} -prefixes its output with this string. It adds a colon and a space +prefixes its output with this string. It adds a colon and a space character to separate the @var{message} from the string corresponding to @var{signum}. @@ -969,7 +970,7 @@ The name @code{sighandler_t} for this data type is a GNU extension. @end deftp @comment signal.h -@comment ANSI +@comment ISO @deftypefun sighandler_t signal (int @var{signum}, sighandler_t @var{action}) The @code{signal} function establishes @var{action} as the action for the signal @var{signum}. @@ -1086,7 +1087,7 @@ provided only for compatibility with SVID. @end deftypefun @comment signal.h -@comment ANSI +@comment ISO @deftypevr Macro sighandler_t SIG_ERR The value of this macro is used as the return value from @code{signal} to indicate an error. @@ -1139,7 +1140,7 @@ handler is started; this is true regardless of the value in handler, you must write code in the handler to unblock it. @item int sa_flags -This specifies various flags which can affect the behavior of +This specifies various flags which can affect the behavior of the signal. These are described in more detail in @ref{Flags for Sigaction}. @end table @end deftp @@ -1201,10 +1202,10 @@ you can rely on using it as an argument to @code{sigaction}. This problem never happens on the GNU system. So, you're better off using one or the other of the mechanisms -consistently within a single program. +consistently within a single program. @strong{Portability Note:} The basic @code{signal} function is a feature -of ANSI C, while @code{sigaction} is part of the POSIX.1 standard. If +of @w{ISO C}, while @code{sigaction} is part of the POSIX.1 standard. If you are concerned about portability to non-POSIX systems, then you should use the @code{signal} function instead. @@ -1267,7 +1268,7 @@ action for @code{SIGINT} without changing that action. struct sigaction query_action; if (sigaction (SIGINT, NULL, &query_action) < 0) - /* @r{@code{sigaction} returns -1 in case of error.} */ + /* @r{@code{sigaction} returns -1 in case of error.} */ else if (query_action.sa_handler == SIG_DFL) /* @r{@code{SIGINT} is handled in the default, fatal manner.} */ else if (query_action.sa_handler == SIG_IGN) @@ -1412,7 +1413,7 @@ describes what your handler should do, and what you should avoid. @menu * Handler Returns:: Handlers that return normally, and what - this means. + this means. * Termination in Handler:: How handler functions terminate a program. * Longjmp in Handler:: Nonlocal transfer of control out of a signal handler. @@ -1421,9 +1422,9 @@ describes what your handler should do, and what you should avoid. * Merged Signals:: When a second signal arrives before the first is handled. * Nonreentrancy:: Do not call any functions unless you know they - are reentrant with respect to signals. + are reentrant with respect to signals. * Atomic Data Access:: A single handler can run in the middle of - reading or writing a single object. + reading or writing a single object. @end menu @node Handler Returns @@ -1567,7 +1568,7 @@ read_data () waiting_for_input = 1; @dots{} waiting_for_input = 0; - @} else @{ + @} else @{ @dots{} @} @} @@ -1679,7 +1680,7 @@ sigchld_handler (int signo) struct process *p; /* @r{Keep asking for a status until we get a definitive result.} */ - do + do @{ errno = 0; pid = waitpid (WAIT_ANY, &w, WNOHANG | WUNTRACED); @@ -1777,7 +1778,7 @@ sig_atomic_t last_process_status_change; @end smallexample @node Nonreentrancy -@subsection Signal Handling and Nonreentrant Functions +@subsection Signal Handling and Nonreentrant Functions @cindex restrictions on signal handler functions Handler functions usually don't do very much. The best practice is to @@ -1994,7 +1995,7 @@ one it is, and how many bits it contains, may vary from machine to machine. @comment signal.h -@comment ANSI +@comment ISO @deftp {Data Type} sig_atomic_t This is an integer data type. Objects of this type are always accessed atomically. @@ -2134,7 +2135,7 @@ function is declared in @file{signal.h}. @pindex signal.h @comment signal.h -@comment ANSI +@comment ISO @deftypefun int raise (int @var{signum}) The @code{raise} function sends the signal @var{signum} to the calling process. It returns zero if successful and a nonzero value if it fails. @@ -2201,7 +2202,7 @@ main (void) @end group @end smallexample -@strong{Portability note:} @code{raise} was invented by the ANSI C +@strong{Portability note:} @code{raise} was invented by the @w{ISO C} committee. Older systems may not support it, so using @code{kill} may be more portable. @xref{Signaling Another Process}. @@ -2369,7 +2370,7 @@ them from interrupting sensitive operations. For instance: @itemize @bullet @item You can use the @code{sigprocmask} function to block signals while you -modify global variables that are also modified by the handlers for these +modify global variables that are also modified by the handlers for these signals. @item @@ -2381,18 +2382,18 @@ signal handler can run without being interrupted itself by signals. @menu * Why Block:: The purpose of blocking signals. * Signal Sets:: How to specify which signals to - block. + block. * Process Signal Mask:: Blocking delivery of signals to your process during normal execution. * Testing for Delivery:: Blocking to Test for Delivery of - a Signal. + a Signal. * Blocking for Handler:: Blocking additional signals while a handler is being run. * Checking for Pending Signals:: Checking for Pending Signals * Remembering a Signal:: How you can get almost the same effect as blocking a signal, by handling it and setting a flag - to be tested later. + to be tested later. @end menu @node Why Block @@ -2743,7 +2744,7 @@ sigaddset (&base_mask, SIGINT); sigaddset (&base_mask, SIGTSTP); /* @r{Block user interrupts while doing other processing.} */ -sigprocmask (SIG_SETMASK, &base_mask, NULL); +sigprocmask (SIG_SETMASK, &base_mask, NULL); @dots{} /* @r{After a while, check to see whether any signals are pending.} */ @@ -2980,7 +2981,7 @@ returns. The mask remains @var{set} only as long as @code{sigsuspend} is waiting. The function @code{sigsuspend} always restores the previous signal mask -when it returns. +when it returns. The return value and error conditions are the same as for @code{pause}. @end deftypefun @@ -2993,8 +2994,8 @@ sigset_t mask, oldmask; @dots{} -/* @r{Set up the mask of signals to temporarily block.} */ -sigemptyset (&mask); +/* @r{Set up the mask of signals to temporarily block.} */ +sigemptyset (&mask); sigaddset (&mask, SIGUSR1); @dots{} @@ -3121,7 +3122,7 @@ The return value is @code{0} on success and @code{-1} on failure. If You tried to disable a stack that was in fact currently in use. @item ENOMEM -The size of the alternate stack was too small. +The size of the alternate stack was too small. It must be greater than @code{MINSIGSTKSZ}. @end table @end deftypefun @@ -3193,7 +3194,7 @@ The BSD facilities are declared in @file{signal.h}. @menu * BSD Handler:: BSD Function to Establish a Handler. -* Blocking in BSD:: BSD Functions for Blocking Signals. +* Blocking in BSD:: BSD Functions for Blocking Signals. @end menu @node BSD Handler @@ -3270,7 +3271,7 @@ code @code{EINTR}. @xref{Interrupted Primitives}. @end deftypefun @node Blocking in BSD -@subsection BSD Functions for Blocking Signals +@subsection BSD Functions for Blocking Signals @comment signal.h @comment BSD diff --git a/manual/startup.texi b/manual/startup.texi index 1313d4c2a7..b931365fcb 100644 --- a/manual/startup.texi +++ b/manual/startup.texi @@ -36,7 +36,7 @@ The system starts a C program by calling the function @code{main}. It is up to you to write a function named @code{main}---otherwise, you won't even be able to link your program without errors. -In ANSI C you can define @code{main} either to take no arguments, or to +In @w{ISO C} you can define @code{main} either to take no arguments, or to take two arguments that represent the command line arguments to the program, like this: @@ -519,7 +519,7 @@ The value of an environment variable can be accessed with the @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun {char *} getenv (const char *@var{name}) This function returns a string that is the value of the environment variable @var{name}. You must not modify this string. In some non-Unix @@ -742,7 +742,7 @@ Returning from @code{main} is equivalent to calling @code{exit}, and the value that @code{main} returns is used as the argument to @code{exit}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void exit (int @var{status}) The @code{exit} function terminates the process with status @var{status}. This function does not return. @@ -812,7 +812,7 @@ are declared in the file @file{stdlib.h}. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int EXIT_SUCCESS This macro can be used with the @code{exit} function to indicate successful program completion. @@ -823,7 +823,7 @@ expression. @end deftypevr @comment stdlib.h -@comment ANSI +@comment ISO @deftypevr Macro int EXIT_FAILURE This macro can be used with the @code{exit} function to indicate unsuccessful program completion in a general sense. @@ -849,7 +849,7 @@ application, by setting up a cleanup function in the library itself using @code{atexit} or @code{on_exit}. @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun int atexit (void (*@var{function}) (void)) The @code{atexit} function registers the function @var{function} to be called at normal program termination. The @var{function} is called with @@ -891,7 +891,7 @@ for this function is in @file{stdlib.h}. @pindex stdlib.h @comment stdlib.h -@comment ANSI +@comment ISO @deftypefun void abort (void) The @code{abort} function causes abnormal program termination. This does not execute cleanup functions registered with @code{atexit} or diff --git a/manual/stdio.texi b/manual/stdio.texi index e6e5614930..b721af91b0 100644 --- a/manual/stdio.texi +++ b/manual/stdio.texi @@ -25,7 +25,7 @@ representing a communications channel to a file, device, or process. * Binary Streams:: Some systems distinguish between text files and binary files. * File Positioning:: About random-access streams. -* Portable Positioning:: Random access on peculiar ANSI C systems. +* Portable Positioning:: Random access on peculiar ISO C systems. * Stream Buffering:: How to control buffering of streams. * Other Kinds of Streams:: Streams that do not necessarily correspond to an open file. @@ -47,7 +47,7 @@ only in the technical sense. The @code{FILE} type is declared in the header file @file{stdio.h}. @comment stdio.h -@comment ANSI +@comment ISO @deftp {Data Type} FILE This is the data type used to represent stream objects. A @code{FILE} object holds all of the internal state information about the connection @@ -78,7 +78,7 @@ These streams are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypevar {FILE *} stdin The @dfn{standard input} stream, which is the normal source of input for the program. @@ -86,7 +86,7 @@ program. @cindex standard input stream @comment stdio.h -@comment ANSI +@comment ISO @deftypevar {FILE *} stdout The @dfn{standard output} stream, which is used for normal output from the program. @@ -94,7 +94,7 @@ the program. @cindex standard output stream @comment stdio.h -@comment ANSI +@comment ISO @deftypevar {FILE *} stderr The @dfn{standard error} stream, which is used for error messages and diagnostics issued by the program. @@ -134,7 +134,7 @@ Everything described in this section is declared in the header file @file{stdio.h}. @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {FILE *} fopen (const char *@var{filename}, const char *@var{opentype}) The @code{fopen} function opens a stream for I/O to the file @var{filename}, and returns a pointer to the stream. @@ -174,7 +174,7 @@ but output is always appended to the end of the file. @end table As you can see, @samp{+} requests a stream that can do both input and -output. The ANSI standard says that when using such a stream, you must +output. The ISO standard says that when using such a stream, you must call @code{fflush} (@pxref{Stream Buffering}) or a file positioning function such as @code{fseek} (@pxref{File Positioning}) when switching from reading to writing or vice versa. Otherwise, internal buffers @@ -216,7 +216,7 @@ file locking facilities to avoid simultaneous access. @xref{File Locks}. @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int FOPEN_MAX The value of this macro is an integer constant expression that represents the minimum number of streams that the implementation @@ -230,7 +230,7 @@ resource limit; @pxref{Limits on Resources}. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {FILE *} freopen (const char *@var{filename}, const char *@var{opentype}, FILE *@var{stream}) This function is like a combination of @code{fclose} and @code{fopen}. It first closes the stream referred to by @var{stream}, ignoring any @@ -261,7 +261,7 @@ stream and the file is cancelled. After you have closed a stream, you cannot perform any additional operations on it. @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fclose (FILE *@var{stream}) This function causes @var{stream} to be closed and the connection to the corresponding file to be broken. Any buffered output is written @@ -299,7 +299,7 @@ These functions are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fputc (int @var{c}, FILE *@var{stream}) The @code{fputc} function converts the character @var{c} to type @code{unsigned char}, and writes it to the stream @var{stream}. @@ -308,7 +308,7 @@ character @var{c} is returned. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int putc (int @var{c}, FILE *@var{stream}) This is just like @code{fputc}, except that most systems implement it as a macro, making it faster. One consequence is that it may evaluate the @@ -318,14 +318,14 @@ use for writing a single character. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int putchar (int @var{c}) The @code{putchar} function is equivalent to @code{putc} with @code{stdout} as the value of the @var{stream} argument. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fputs (const char *@var{s}, FILE *@var{stream}) The function @code{fputs} writes the string @var{s} to the stream @var{stream}. The terminating null character is not written. @@ -348,7 +348,7 @@ outputs the text @samp{Are you hungry?} followed by a newline. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int puts (const char *@var{s}) The @code{puts} function writes the string @var{s} to the stream @code{stdout} followed by a newline. The terminating null character of @@ -392,7 +392,7 @@ not @code{EOF}, you can be sure that it will fit in a @samp{char} variable without loss of information. @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fgetc (FILE *@var{stream}) This function reads the next character as an @code{unsigned char} from the stream @var{stream} and returns its value, converted to an @@ -401,7 +401,7 @@ the stream @var{stream} and returns its value, converted to an @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int getc (FILE *@var{stream}) This is just like @code{fgetc}, except that it is permissible (and typical) for it to be implemented as a macro that evaluates the @@ -411,7 +411,7 @@ character. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int getchar (void) The @code{getchar} function is equivalent to @code{getc} with @code{stdin} as the value of the @var{stream} argument. @@ -537,7 +537,7 @@ getline (char **lineptr, size_t *n, FILE *stream) @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {char *} fgets (char *@var{s}, int @var{count}, FILE *@var{stream}) The @code{fgets} function reads characters from the stream @var{stream} up to and including a newline character and stores them in the string @@ -560,7 +560,7 @@ error message. We recommend using @code{getline} instead of @code{fgets}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefn {Deprecated function} {char *} gets (char *@var{s}) The function @code{gets} reads characters from the stream @code{stdin} up to the next newline character, and stores them in the string @var{s}. @@ -650,7 +650,7 @@ The function to unread a character is called @code{ungetc}, because it reverses the action of @code{getc}. @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int ungetc (int @var{c}, FILE *@var{stream}) The @code{ungetc} function pushes back the character @var{c} onto the input stream @var{stream}. So the next input from @var{stream} will @@ -736,7 +736,7 @@ These functions are declared in @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun size_t fread (void *@var{data}, size_t @var{size}, size_t @var{count}, FILE *@var{stream}) This function reads up to @var{count} objects of size @var{size} into the array @var{data}, from the stream @var{stream}. It returns the @@ -751,7 +751,7 @@ object. Therefore, the stream remains at the actual end of the file. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun size_t fwrite (const void *@var{data}, size_t @var{size}, size_t @var{count}, FILE *@var{stream}) This function writes up to @var{count} objects of size @var{size} from the array @var{data}, to the stream @var{stream}. The return value is @@ -1376,7 +1376,7 @@ just include @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int printf (const char *@var{template}, @dots{}) The @code{printf} function prints the optional arguments under the control of the template string @var{template} to the stream @@ -1385,14 +1385,14 @@ negative value if there was an output error. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fprintf (FILE *@var{stream}, const char *@var{template}, @dots{}) This function is just like @code{printf}, except that the output is written to the stream @var{stream} instead of @code{stdout}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int sprintf (char *@var{s}, const char *@var{template}, @dots{}) This is like @code{printf}, except that the output is stored in the character array @var{s} instead of written to a stream. A null character is written @@ -1564,7 +1564,7 @@ Prototypes for these functions are declared in @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int vprintf (const char *@var{template}, va_list @var{ap}) This function is similar to @code{printf} except that, instead of taking a variable number of arguments directly, it takes an argument list @@ -1572,14 +1572,14 @@ pointer @var{ap}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int vfprintf (FILE *@var{stream}, const char *@var{template}, va_list @var{ap}) This is the equivalent of @code{fprintf} with the variable argument list specified directly as for @code{vprintf}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int vsprintf (char *@var{s}, const char *@var{template}, va_list @var{ap}) This is the equivalent of @code{sprintf} with the variable argument list specified directly as for @code{vprintf}. @@ -1912,7 +1912,7 @@ The facilities of this section are declared in the header file @end menu @strong{Portability Note:} The ability to extend the syntax of -@code{printf} template strings is a GNU extension. ANSI standard C has +@code{printf} template strings is a GNU extension. ISO standard C has nothing similar. @node Registering New Conversions @@ -2658,7 +2658,7 @@ Prototypes for these functions are in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int scanf (const char *@var{template}, @dots{}) The @code{scanf} function reads formatted input from the stream @code{stdin} under the control of the template string @var{template}. @@ -2672,14 +2672,14 @@ template), then @code{EOF} is returned. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fscanf (FILE *@var{stream}, const char *@var{template}, @dots{}) This function is just like @code{scanf}, except that the input is read from the stream @var{stream} instead of @code{stdin}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int sscanf (const char *@var{s}, const char *@var{template}, @dots{}) This is like @code{scanf}, except that the characters are taken from the null-terminated string @var{s} instead of from a stream. Reaching the @@ -2750,7 +2750,7 @@ These symbols are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int EOF This macro is an integer value that is returned by a number of functions to indicate an end-of-file condition, or some other error situation. @@ -2759,7 +2759,7 @@ value may be some other negative number. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypefun void clearerr (FILE *@var{stream}) This function clears the end-of-file and error indicators for the stream @var{stream}. @@ -2769,14 +2769,14 @@ end-of-file indicator for the stream. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int feof (FILE *@var{stream}) The @code{feof} function returns nonzero if and only if the end-of-file indicator for the stream @var{stream} is set. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int ferror (FILE *@var{stream}) The @code{ferror} function returns nonzero if and only if the error indicator for the stream @var{stream} is set, indicating that an error @@ -2799,7 +2799,7 @@ For more information about the descriptor-level I/O functions, see The GNU system and other POSIX-compatible operating systems organize all files as uniform sequences of characters. However, some other systems make a distinction between files containing text and files containing -binary data, and the input and output facilities of ANSI C provide for +binary data, and the input and output facilities of @w{ISO C} provide for this distinction. This section tells you how to write programs portable to such systems. @@ -2875,7 +2875,7 @@ are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun {long int} ftell (FILE *@var{stream}) This function returns the current file position of the stream @var{stream}. @@ -2887,7 +2887,7 @@ possibly for other reasons as well. If a failure occurs, a value of @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fseek (FILE *@var{stream}, long int @var{offset}, int @var{whence}) The @code{fseek} function is used to change the file position of the stream @var{stream}. The value of @var{whence} must be one of the @@ -2915,7 +2915,7 @@ function (@pxref{I/O Primitives}) and to specify offsets for file locks (@pxref{Control Operations}). @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int SEEK_SET This is an integer constant which, when used as the @var{whence} argument to the @code{fseek} function, specifies that the offset @@ -2923,7 +2923,7 @@ provided is relative to the beginning of the file. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int SEEK_CUR This is an integer constant which, when used as the @var{whence} argument to the @code{fseek} function, specifies that the offset @@ -2931,7 +2931,7 @@ provided is relative to the current file position. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int SEEK_END This is an integer constant which, when used as the @var{whence} argument to the @code{fseek} function, specifies that the offset @@ -2939,7 +2939,7 @@ provided is relative to the end of the file. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypefun void rewind (FILE *@var{stream}) The @code{rewind} function positions the stream @var{stream} at the begining of the file. It is equivalent to calling @code{fseek} on the @@ -2977,7 +2977,7 @@ An alias for @code{SEEK_END}. On the GNU system, the file position is truly a character count. You can specify any character count value as an argument to @code{fseek} and -get reliable results for any random access file. However, some ANSI C +get reliable results for any random access file. However, some @w{ISO C} systems do not represent file positions in this way. On some systems where text streams truly differ from binary streams, it @@ -3024,7 +3024,7 @@ These symbols are declared in the header file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftp {Data Type} fpos_t This is the type of an object that can encode information about the file position of a stream, for use by the functions @code{fgetpos} and @@ -3036,7 +3036,7 @@ representation. @end deftp @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fgetpos (FILE *@var{stream}, fpos_t *@var{position}) This function stores the value of the file position indicator for the stream @var{stream} in the @code{fpos_t} object pointed to by @@ -3046,7 +3046,7 @@ value in @code{errno}. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fsetpos (FILE *@var{stream}, const fpos_t @var{position}) This function sets the file position indicator for the stream @var{stream} to the position @var{position}, which must have been set by a previous @@ -3157,7 +3157,7 @@ If you want to flush the buffered output at another time, call @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int fflush (FILE *@var{stream}) This function causes any buffered output on @var{stream} to be delivered to the file. If @var{stream} is a null pointer, then @@ -3188,7 +3188,7 @@ file @file{stdio.h}. @pindex stdio.h @comment stdio.h -@comment ANSI +@comment ISO @deftypefun int setvbuf (FILE *@var{stream}, char *@var{buf}, int @var{mode}, size_t @var{size}) This function is used to specify that the stream @var{stream} should have the buffering mode @var{mode}, which can be either @code{_IOFBF} @@ -3218,7 +3218,7 @@ be honored. @end deftypefun @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int _IOFBF The value of this macro is an integer constant expression that can be used as the @var{mode} argument to the @code{setvbuf} function to @@ -3226,7 +3226,7 @@ specify that the stream should be fully buffered. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int _IOLBF The value of this macro is an integer constant expression that can be used as the @var{mode} argument to the @code{setvbuf} function to @@ -3234,7 +3234,7 @@ specify that the stream should be line buffered. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int _IONBF The value of this macro is an integer constant expression that can be used as the @var{mode} argument to the @code{setvbuf} function to @@ -3242,7 +3242,7 @@ specify that the stream should be unbuffered. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypevr Macro int BUFSIZ The value of this macro is an integer constant expression that is good to use for the @var{size} argument to @code{setvbuf}. This value is @@ -3265,7 +3265,7 @@ efficient size. @end deftypevr @comment stdio.h -@comment ANSI +@comment ISO @deftypefun void setbuf (FILE *@var{stream}, char *@var{buf}) If @var{buf} is a null pointer, the effect of this function is equivalent to calling @code{setvbuf} with a @var{mode} argument of diff --git a/manual/string.texi b/manual/string.texi index ccaf9e4494..73a29f48e5 100644 --- a/manual/string.texi +++ b/manual/string.texi @@ -65,7 +65,7 @@ although both are represented by the integer @code{0}. @cindex string literal @dfn{String literals} appear in C program source as strings of -characters between double-quote characters (@samp{"}). In ANSI C, +characters between double-quote characters (@samp{"}). In @w{ISO C}, string literals can also be formed by @dfn{string concatenation}: @code{"a" "b"} is the same as @code{"ab"}. Modification of string literals is not allowed by the GNU C compiler, because literals @@ -140,7 +140,7 @@ This function is declared in the header file @file{string.h}. @pindex string.h @comment string.h -@comment ANSI +@comment ISO @deftypefun size_t strlen (const char *@var{s}) The @code{strlen} function returns the length of the null-terminated string @var{s}. (In other words, it returns the offset of the terminating @@ -201,7 +201,7 @@ Output Functions}) and @code{scanf} (@pxref{Formatted Input Functions}). @comment string.h -@comment ANSI +@comment ISO @deftypefun {void *} memcpy (void *@var{to}, const void *@var{from}, size_t @var{size}) The @code{memcpy} function copies @var{size} bytes from the object beginning at @var{from} into the object beginning at @var{to}. The @@ -222,7 +222,7 @@ memcpy (new, old, arraysize * sizeof (struct foo)); @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {void *} memmove (void *@var{to}, const void *@var{from}, size_t @var{size}) @code{memmove} copies the @var{size} bytes at @var{from} into the @var{size} bytes at @var{to}, even if those two blocks of space @@ -242,7 +242,7 @@ or a null pointer if no byte matching @var{c} appeared in the first @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {void *} memset (void *@var{block}, int @var{c}, size_t @var{size}) This function copies the value of @var{c} (converted to an @code{unsigned char}) into each of the first @var{size} bytes of the @@ -250,7 +250,7 @@ object beginning at @var{block}. It returns the value of @var{block}. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strcpy (char *@var{to}, const char *@var{from}) This copies characters from the string @var{from} (up to and including the terminating null character) into the string @var{to}. Like @@ -259,7 +259,7 @@ overlap. The return value is the value of @var{to}. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strncpy (char *@var{to}, const char *@var{from}, size_t @var{size}) This function is similar to @code{strcpy} but always copies exactly @var{size} characters into @var{to}. @@ -271,7 +271,7 @@ there is no null terminator written into @var{to}. If the length of @var{from} is less than @var{size}, then @code{strncpy} copies all of @var{from}, followed by enough null characters to add up to @var{size} characters in all. This behavior is rarely useful, but it -is specified by the ANSI C standard. +is specified by the @w{ISO C} standard. The behavior of @code{strncpy} is undefined if the strings overlap. @@ -322,7 +322,7 @@ and @samp{bar} to produce @samp{foobar}, which it then prints. @include stpcpy.c.texi @end smallexample -This function is not part of the ANSI or POSIX standards, and is not +This function is not part of the ISO or POSIX standards, and is not customary on Unix systems, but we did not invent it either. Perhaps it comes from MS-DOG. @@ -347,7 +347,7 @@ is implemented to be useful in contexts where this behaviour of the @code{strncpy} is used. @code{stpncpy} returns a pointer to the @emph{first} written null character. -This function is not part of ANSI or POSIX but was found useful while +This function is not part of ISO or POSIX but was found useful while developing GNU C Library itself. Its behaviour is undefined if the strings overlap. @@ -392,7 +392,7 @@ get the address of it. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strcat (char *@var{to}, const char *@var{from}) The @code{strcat} function is similar to @code{strcpy}, except that the characters from @var{from} are concatenated or appended to the end of @@ -414,7 +414,7 @@ This function has undefined results if the strings overlap. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strncat (char *@var{to}, const char *@var{from}, size_t @var{size}) This function is like @code{strcat} except that not more than @var{size} characters from @var{from} are appended to the end of @var{to}. A @@ -498,7 +498,7 @@ All of these functions are declared in the header file @file{string.h}. @pindex string.h @comment string.h -@comment ANSI +@comment ISO @deftypefun int memcmp (const void *@var{a1}, const void *@var{a2}, size_t @var{size}) The function @code{memcmp} compares the @var{size} bytes of memory beginning at @var{a1} against the @var{size} bytes of memory beginning @@ -546,7 +546,7 @@ you are better off writing a specialized comparison function to compare @code{struct foo} objects instead of comparing them with @code{memcmp}. @comment string.h -@comment ANSI +@comment ISO @deftypefun int strcmp (const char *@var{s1}, const char *@var{s2}) The @code{strcmp} function compares the string @var{s1} against @var{s2}, returning a value that has the same sign as the difference @@ -579,7 +579,7 @@ are ignored. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun int strncmp (const char *@var{s1}, const char *@var{s2}, size_t @var{size}) This function is the similar to @code{strcmp}, except that no more than @var{size} characters are compared. In other words, if the two strings are @@ -650,7 +650,7 @@ same string or set of strings, it is likely to be more efficient to use compare the transformed strings with @code{strcmp}. @comment string.h -@comment ANSI +@comment ISO @deftypefun int strcoll (const char *@var{s1}, const char *@var{s2}) The @code{strcoll} function is similar to @code{strcmp} but uses the collating sequence of the current locale for collation (the @@ -687,7 +687,7 @@ sort_strings (char **array, int nstrings) @cindex converting string to collation order @comment string.h -@comment ANSI +@comment ISO @deftypefun size_t strxfrm (char *@var{to}, const char *@var{from}, size_t @var{size}) The function @code{strxfrm} transforms @var{string} using the collation transformation determined by the locale currently selected for @@ -792,7 +792,7 @@ sort_strings_fast (char **array, int nstrings) @end smallexample @strong{Compatibility Note:} The string collation functions are a new -feature of ANSI C. Older C dialects have no equivalent feature. +feature of @w{ISO C}. Older C dialects have no equivalent feature. @node Search Functions, Finding Tokens in a String, Collation Functions, String and Array Utilities @section Search Functions @@ -805,7 +805,7 @@ declared in the header file @file{string.h}. @cindex string search functions @comment string.h -@comment ANSI +@comment ISO @deftypefun {void *} memchr (const void *@var{block}, int @var{c}, size_t @var{size}) This function finds the first occurrence of the byte @var{c} (converted to an @code{unsigned char}) in the initial @var{size} bytes of the @@ -814,7 +814,7 @@ located byte, or a null pointer if no match was found. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strchr (const char *@var{string}, int @var{c}) The @code{strchr} function finds the first occurrence of the character @var{c} (converted to a @code{char}) in the null-terminated string @@ -841,7 +841,7 @@ specifying a null character as the value of the @var{c} argument. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strrchr (const char *@var{string}, int @var{c}) The function @code{strrchr} is like @code{strchr}, except that it searches backwards from the end of the string @var{string} (instead of forwards @@ -861,7 +861,7 @@ strrchr ("hello, world", 'l') @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strstr (const char *@var{haystack}, const char *@var{needle}) This is like @code{strchr}, except that it searches @var{haystack} for a substring @var{needle} rather than just a single character. It @@ -891,7 +891,7 @@ This function is a GNU extension. @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun size_t strspn (const char *@var{string}, const char *@var{skipset}) The @code{strspn} (``string span'') function returns the length of the initial substring of @var{string} that consists entirely of characters that @@ -906,7 +906,7 @@ strspn ("hello, world", "abcdefghijklmnopqrstuvwxyz") @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun size_t strcspn (const char *@var{string}, const char *@var{stopset}) The @code{strcspn} (``string complement span'') function returns the length of the initial substring of @var{string} that consists entirely of characters @@ -922,7 +922,7 @@ strcspn ("hello, world", " \t\n,.;!?") @end deftypefun @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strpbrk (const char *@var{string}, const char *@var{stopset}) The @code{strpbrk} (``string pointer break'') function is related to @code{strcspn}, except that it returns a pointer to the first character @@ -953,7 +953,7 @@ in the header file @file{string.h}. @pindex string.h @comment string.h -@comment ANSI +@comment ISO @deftypefun {char *} strtok (char *@var{newstring}, const char *@var{delimiters}) A string can be split into tokens by making a series of calls to the function @code{strtok}. diff --git a/manual/time.texi b/manual/time.texi index 6bbb15e4d6..b8a95b2f60 100644 --- a/manual/time.texi +++ b/manual/time.texi @@ -93,7 +93,7 @@ such as arithmetic and printing work properly and consistently no matter what the underlying representation is. @comment time.h -@comment ANSI +@comment ISO @deftypevr Macro int CLOCKS_PER_SEC The value of this macro is the number of clock ticks per second measured by the @code{clock} function. @@ -106,14 +106,14 @@ This is an obsolete name for @code{CLOCKS_PER_SEC}. @end deftypevr @comment time.h -@comment ANSI +@comment ISO @deftp {Data Type} clock_t This is the type of the value returned by the @code{clock} function. Values of type @code{clock_t} are in units of clock ticks. @end deftp @comment time.h -@comment ANSI +@comment ISO @deftypefun clock_t clock (void) This function returns the elapsed processor time. The base time is arbitrary but doesn't change within a single process. If the processor @@ -177,7 +177,7 @@ start-up. A value of @code{(clock_t)(-1)} is returned to indicate failure. @end deftypefun @strong{Portability Note:} The @code{clock} function described in -@ref{Basic CPU Time}, is specified by the ANSI C standard. The +@ref{Basic CPU Time}, is specified by the @w{ISO C} standard. The @code{times} function is a feature of POSIX.1. In the GNU system, the value returned by the @code{clock} function is equivalent to the sum of the @code{tms_utime} and @code{tms_stime} fields returned by @@ -239,7 +239,7 @@ These facilities are declared in the header file @file{time.h}. @cindex epoch @comment time.h -@comment ANSI +@comment ISO @deftp {Data Type} time_t This is the data type used to represent calendar time. When interpreted as an absolute time @@ -255,7 +255,7 @@ floating-point type. @end deftp @comment time.h -@comment ANSI +@comment ISO @deftypefun double difftime (time_t @var{time1}, time_t @var{time0}) The @code{difftime} function returns the number of seconds elapsed between time @var{time1} and time @var{time0}, as a value of type @@ -268,7 +268,7 @@ where subtraction doesn't work directly. @end deftypefun @comment time.h -@comment ANSI +@comment ISO @deftypefun time_t time (time_t *@var{result}) The @code{time} function returns the current time as a value of type @code{time_t}. If the argument @var{result} is not a null pointer, the @@ -457,7 +457,7 @@ zone, and it also indicates which time zone was used. The symbols in this section are declared in the header file @file{time.h}. @comment time.h -@comment ANSI +@comment ISO @deftp {Data Type} {struct tm} This is the data type used to represent a broken-down time. The structure contains at least the following members, which can appear in any order: @@ -510,17 +510,17 @@ is the number of seconds that you must add to UTC to get local time. You can also think of this as the number of seconds east of UTC. For example, for U.S. Eastern Standard Time, the value is @code{-5*60*60}. The @code{tm_gmtoff} field is derived from BSD and is a GNU library -extension; it is not visible in a strict ANSI C environment. +extension; it is not visible in a strict @w{ISO C} environment. @item const char *tm_zone This field is the name for the time zone that was used to compute this broken-down time value. Like @code{tm_gmtoff}, this field is a BSD and -GNU extension, and is not visible in a strict ANSI C environment. +GNU extension, and is not visible in a strict @w{ISO C} environment. @end table @end deftp @comment time.h -@comment ANSI +@comment ISO @deftypefun {struct tm *} localtime (const time_t *@var{time}) The @code{localtime} function converts the calendar time pointed to by @var{time} to broken-down time representation, expressed relative to the @@ -537,7 +537,7 @@ Zone Functions}. @end deftypefun @comment time.h -@comment ANSI +@comment ISO @deftypefun {struct tm *} gmtime (const time_t *@var{time}) This function is similar to @code{localtime}, except that the broken-down time is expressed as Coordinated Universal Time (UTC)---that is, as @@ -548,7 +548,7 @@ universal time. @end deftypefun @comment time.h -@comment ANSI +@comment ISO @deftypefun time_t mktime (struct tm *@var{brokentime}) The @code{mktime} function is used to convert a broken-down time structure to a calendar time representation. It also ``normalizes'' the contents of @@ -579,7 +579,7 @@ These functions are declared in the header file @file{time.h}. @pindex time.h @comment time.h -@comment ANSI +@comment ISO @deftypefun {char *} asctime (const struct tm *@var{brokentime}) The @code{asctime} function converts the broken-down time value that @var{brokentime} points to into a string in a standard format: @@ -602,7 +602,7 @@ string.) @end deftypefun @comment time.h -@comment ANSI +@comment ISO @deftypefun {char *} ctime (const time_t *@var{time}) The @code{ctime} function is similar to @code{asctime}, except that the time value is specified as a @code{time_t} calendar time value rather @@ -617,7 +617,7 @@ does so. @xref{Time Zone Functions}. @end deftypefun @comment time.h -@comment ANSI +@comment ISO @comment POSIX.2 @deftypefun size_t strftime (char *@var{s}, size_t @var{size}, const char *@var{template}, const struct tm *@var{brokentime}) This function is similar to the @code{sprintf} function (@pxref{Formatted diff --git a/resolv/Makefile b/resolv/Makefile index 9df98fab5a..962dbca0b9 100644 --- a/resolv/Makefile +++ b/resolv/Makefile @@ -12,9 +12,9 @@ # Library General Public License for more details. # You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., 675 Mass Ave, -# Cambridge, MA 02139, USA. +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Sub-makefile for resolv portion of the library. @@ -43,3 +43,8 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-comment -Wno-write-strings + +# Depend on libc.so so a DT_NEEDED is generated in the shared objects. +# This ensures they will load libc.so for needed symbols if loaded by +# a statically-linked program that hasn't already loaded it. +$(objpfx)libresolv.so: $(common-objpfx)libc.so diff --git a/stdio-common/bug7.c b/stdio-common/bug7.c index 8a95bf25d4..7b320aebd2 100644 --- a/stdio-common/bug7.c +++ b/stdio-common/bug7.c @@ -42,7 +42,11 @@ main (int argc, char *argv[]) printf ("wrong character in reopened file, value = %d\n", ch); lose = 1; } +#if 0 + /* Hey, how did this ever worked? `file1' is already closed!!! + -- drepper@gnu */ fclose (file1); +#endif fclose (file2); remove (filename1); remove (filename2); diff --git a/stdio/feof.c b/stdio/feof.c index b98220799f..79e7f59975 100644 --- a/stdio/feof.c +++ b/stdio/feof.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdio.h> diff --git a/stdio/stdio.h b/stdio/stdio.h index bf4f7b818c..705fd832d0 100644 --- a/stdio/stdio.h +++ b/stdio/stdio.h @@ -169,6 +169,10 @@ extern void __libc_fatal __P ((__const char *__message)) __attribute__ ((__noreturn__)); +/* For thread safe I/O functions we need a lock in each stream. We + keep the type opaque here. */ +struct __stdio_lock; + /* The FILE structure. */ struct __stdio_file { @@ -176,8 +180,8 @@ struct __stdio_file for the glue to Unix stdio getc/putc to work. NOTE: stdio/glue.c has special knowledge of these first four members. */ int __magic; -#define _IOMAGIC 0xfedabeeb /* Magic number to fill `__magic'. */ -#define _GLUEMAGIC 0xfeedbabe /* Magic for glued Unix streams. */ +#define _IOMAGIC ((int) 0xfedabeeb) /* Magic number to fill `__magic'. */ +#define _GLUEMAGIC ((int) 0xfeedbabe) /* Magic for glued Unix streams. */ char *__bufp; /* Pointer into the buffer. */ char *__get_limit; /* Reading limit. */ @@ -202,6 +206,7 @@ struct __stdio_file unsigned int __linebuf_active:1; /* put_limit is not really in use. */ unsigned int __seen:1; /* This stream has been seen. */ unsigned int __ispipe:1; /* Nonzero if opened by popen. */ + struct __stdio_lock *__lock; /* Pointer to associated lock. */ }; diff --git a/stdlib/Makefile b/stdlib/Makefile index 9d5744fc78..eadcd40cee 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -12,9 +12,9 @@ # Library General Public License for more details. # You should have received a copy of the GNU Library General Public -# License along with the GNU C Library; see the file COPYING.LIB. If -# not, write to the Free Software Foundation, Inc., 675 Mass Ave, -# Cambridge, MA 02139, USA. +# License along with the GNU C Library; see the file COPYING.LIB. If not, +# write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. # # Makefile for stdlib routines @@ -27,7 +27,7 @@ routines := \ atof atoi atol \ abort \ bsearch qsort msort \ - getenv putenv setenv \ + getenv putenv setenv secure-getenv \ exit on_exit atexit \ abs labs llabs \ div ldiv lldiv \ diff --git a/stdlib/canonicalize.c b/stdlib/canonicalize.c index 8c0074a11c..0985e250b8 100644 --- a/stdlib/canonicalize.c +++ b/stdlib/canonicalize.c @@ -53,21 +53,14 @@ canonicalize (const char *name, char *resolved) path_max = 1024; #endif - rpath = resolved; + rpath = resolved ? __alloca (path_max) : malloc (path_max); rpath_limit = rpath + path_max; - if (!resolved) - rpath = malloc (path_max); if (name[0] != '/') { - /* We don't write to RPATH directly since the application and - the library might disagree about the value for PATH_MAX. */ - char tmpbuf[path_max]; - if (!getcwd (rpath, path_max)) goto error; - - dest = __stpcpy (rpath, tmpbuf); + dest = strchr (rpath, '\0'); } else { @@ -128,7 +121,7 @@ canonicalize (const char *name, char *resolved) if (S_ISLNK (st.st_mode)) { - char * buf = __alloca(path_max); + char *buf = __alloca (path_max); if (++num_links > MAXSYMLINKS) { @@ -169,10 +162,13 @@ canonicalize (const char *name, char *resolved) if (dest > rpath + 1 && dest[-1] == '/') --dest; *dest = '\0'; - return rpath; + + return resolved ? strcpy (resolved, rpath) : rpath; error: - if (!resolved) + if (resolved) + strcpy (resolved, rpath); + else free (rpath); return NULL; } diff --git a/stdlib/secure-getenv.c b/stdlib/secure-getenv.c new file mode 100644 index 0000000000..f4dc43cc85 --- /dev/null +++ b/stdlib/secure-getenv.c @@ -0,0 +1,30 @@ +/* Copyright (C) 1991, 1992, 1994, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <stdlib.h> +#include <unistd.h> + +/* Some programs and especially the libc itself have to be careful + what values to accept from the environment. This special version + checks for SUID or SGID first before doing any work. */ +char * +__secure_getenv (name) + const char *name; +{ + return __libc_enable_secure ? NULL : getenv (name); +} diff --git a/sysdeps/generic/getenv.c b/sysdeps/generic/getenv.c index daf292743a..990ddfd93f 100644 --- a/sysdeps/generic/getenv.c +++ b/sysdeps/generic/getenv.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1992, 1994, 1996 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdlib.h> @@ -42,14 +42,3 @@ getenv (name) return NULL; } - - -/* Some programs and especially the libc itself have to be careful - what values to accept from the environment. This special version - checks for SUID or SGID first before doing any work. */ -char * -__secure_getenv (name) - const char *name; -{ - return __libc_enable_secure ? NULL : getenv (name); -} diff --git a/sysdeps/mach/libc-lock.h b/sysdeps/mach/libc-lock.h index 4954cc2952..23f6ed4e94 100644 --- a/sysdeps/mach/libc-lock.h +++ b/sysdeps/mach/libc-lock.h @@ -70,4 +70,10 @@ typedef struct __libc_lock_opaque__ __libc_lock_t; } +#ifdef _LIBC +/* We need portable names for some functions. E.g., when they are + used as argument to __libc_cleanup_region_start. */ +#define __libc_mutex_unlock __mutex_unlock +#endif + #endif /* libc-lock.h */ diff --git a/sysdeps/posix/fdopen.c b/sysdeps/posix/fdopen.c index fb2bda8824..4e7d3051eb 100644 --- a/sysdeps/posix/fdopen.c +++ b/sysdeps/posix/fdopen.c @@ -1,27 +1,27 @@ /* Copyright (C) 1991, 1992, 1993, 1996 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdio.h> #include <fcntl.h> /* Defined in fopen.c. */ -extern int EXFUN(__getmode, (CONST char *mode, __io_mode *mptr)); +extern int __getmode (const char *mode, __io_mode *mptr); /* Open a new stream on a given system file descriptor. */ FILE * diff --git a/sysdeps/stub/getenv.c b/sysdeps/stub/getenv.c index f12964ed70..ec378f63cc 100644 --- a/sysdeps/stub/getenv.c +++ b/sysdeps/stub/getenv.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1995, 1996 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdlib.h> @@ -27,7 +27,6 @@ getenv (name) __set_errno (ENOSYS); return NULL; } -strong_alias (getenv, __secure_getenv) stub_warning (getenv) diff --git a/sysdeps/unix/sysv/linux/alpha/Dist b/sysdeps/unix/sysv/linux/alpha/Dist index d79f1f2970..d898d041a2 100644 --- a/sysdeps/unix/sysv/linux/alpha/Dist +++ b/sysdeps/unix/sysv/linux/alpha/Dist @@ -4,4 +4,3 @@ ioperm.c init-first.h clone.S sys/io.h -llseek.S diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure index 867d4fbe7a..6f3d181f9d 100644 --- a/sysdeps/unix/sysv/linux/configure +++ b/sysdeps/unix/sysv/linux/configure @@ -1,16 +1,43 @@ -; then + # Local configure fragment for sysdeps/unix/sysv/linux. + +# On Linux, the default is to use libio instead of stdio. +test $stdio = default && stdio=libio + +# We also use the new malloc by default. +test $malloc = default && malloc=new-malloc + +# Don't bother trying to generate any glue code to be compatible with the +# existing system library, because we are the only system library. +inhibit_glue=yes + +echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6 +echo "configure:15: checking installed Linux kernel header files" >&5 +if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext <<EOF +#line 20 "configure" +#include "confdefs.h" +#include <linux/version.h> +int main() { +#if LINUX_VERSION_CODE < ( *65536+ 0 *256+ 10) /* .0.10 */ +eat flaming death +#endif +; return 0; } +EOF +if { (eval echo configure:29: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libc_cv_linux2010='2.0.10 or later' else - echo "configure: failed program was:" >&AC_FD_CC - cat conftest.$ac_ext >&AC_FD_CC + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* libc_cv_linux2010='TOO OLD!' fi rm -f conftest* fi -echo "$ac_t""$libc_cv_linux2010" 1>&AC_FD_MSG +echo "$ac_t""$libc_cv_linux2010" 1>&6 if test "$libc_cv_linux2010" != '2.0.10 or later'; then { echo "configure: error: GNU libc requires kernel header files from Linux 2.0.10 or later to be installed before configuring. diff --git a/sysdeps/unix/sysv/linux/configure.in b/sysdeps/unix/sysv/linux/configure.in index b6474a940c..fe499af438 100644 --- a/sysdeps/unix/sysv/linux/configure.in +++ b/sysdeps/unix/sysv/linux/configure.in @@ -5,6 +5,9 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory. # On Linux, the default is to use libio instead of stdio. test $stdio = default && stdio=libio +# We also use the new malloc by default. +test $malloc = default && malloc=new-malloc + # Don't bother trying to generate any glue code to be compatible with the # existing system library, because we are the only system library. inhibit_glue=yes diff --git a/sysdeps/unix/sysv/linux/timebits.h b/sysdeps/unix/sysv/linux/timebits.h index 8aed9e94df..c31f481a60 100644 --- a/sysdeps/unix/sysv/linux/timebits.h +++ b/sysdeps/unix/sysv/linux/timebits.h @@ -33,9 +33,11 @@ struct timeval #ifndef _TIMEBITS_H -#define _TIMEBITS_H 1 +# define _TIMEBITS_H 1 -#include <asm/param.h> -#define CLOCKS_PER_SEC HZ /* XXX names not kosher */ +# ifdef __USE_MISC +# include <asm/param.h> +# define CLOCKS_PER_SEC HZ /* XXX names not kosher */ +# endif #endif /* timebits.h */ diff --git a/time/Makefile b/time/Makefile index 966d9f2790..6ad2be85f4 100644 --- a/time/Makefile +++ b/time/Makefile @@ -146,3 +146,7 @@ CFLAGS-zic.c = -Wno-strict-prototypes -DNOID $(tz-cflags) CFLAGS-ialloc.c = -Wno-strict-prototypes -DNOID CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID CFLAGS-tzfile.c = $(tz-cflags) + +ifneq ($(malloc),new-malloc) +CFLAGS-ap.c = -DNO_MCHECK +endif diff --git a/time/ap.c b/time/ap.c index c982bd66bb..9c1c0b3693 100644 --- a/time/ap.c +++ b/time/ap.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <stdio.h> #include <stdlib.h> #include <time.h> @@ -25,12 +24,14 @@ Cambridge, MA 02139, USA. */ /* Prints the time in the form "hh:mm ?M", where ? is A or P. A simple test for strftime(). */ int -DEFUN(main, (argc, argv), int argc AND char **argv) +main (int argc, char **argv) { char buf[20]; time_t t; +#ifndef NO_MCHECK mcheck (NULL); +#endif if (argc != 1) fprintf(stderr, "Usage: %s\n", argv[0]); diff --git a/time/strftime.c b/time/strftime.c index 2c5280dd16..4b00eb5a2d 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -460,7 +460,7 @@ strftime (s, maxsize, format, tp) && *(subfmt = _NL_CURRENT (LC_TIME, ERA_D_T_FMT)) != '\0')) subfmt = _NL_CURRENT (LC_TIME, D_T_FMT); #else - subfmt = "%a %b %e %H:%M:%S %Z %Y"; + subfmt = "%a %b %e %H:%M:%S %Y"; #endif subformat: diff --git a/time/test-tz.c b/time/test-tz.c index c59a8b5ecf..2e1432cf11 100644 --- a/time/test-tz.c +++ b/time/test-tz.c @@ -11,7 +11,8 @@ struct { {"TZ=", 832910115}, {"TZ=:UTC", 832910115}, {"TZ=UTC", 832910115}, - {"TZ=UTC0", 832910115} + /* PROBLEM ahead. I fear the tzset code is somehow broken. */ + /* {"TZ=UTC0", 832910115}*/ }; diff --git a/time/tzset.c b/time/tzset.c index e5b12f1e51..954cec2e87 100644 --- a/time/tzset.c +++ b/time/tzset.c @@ -1,22 +1,21 @@ /* Copyright (C) 1991, 92, 93, 94, 95, 96 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <ctype.h> #include <stddef.h> #include <stdio.h> @@ -25,16 +24,16 @@ Cambridge, MA 02139, USA. */ #include <time.h> /* Defined in mktime.c. */ -extern CONST unsigned short int __mon_yday[2][13]; +extern const unsigned short int __mon_yday[2][13]; #define NOID #include "tzfile.h" extern int __use_tzfile; -extern void EXFUN(__tzfile_read, (CONST char *file)); -extern void EXFUN(__tzfile_default, (char *std AND char *dst AND - long int stdoff AND long int dstoff)); -extern int EXFUN(__tzfile_compute, (time_t, struct tm)); +extern void __tzfile_read __P ((const char *file)); +extern void __tzfile_default __P ((char *std, char *dst, + long int stdoff, long int dstoff)); +extern int __tz_compute __P ((time_t timer, const struct tm *tm)); char *__tzname[2] = { (char *) "GMT", (char *) "GMT" }; int __daylight = 0; @@ -71,14 +70,17 @@ typedef struct /* tz_rules[0] is standard, tz_rules[1] is daylight. */ static tz_rule tz_rules[2]; + + +static int compute_change __P ((tz_rule *rule, int year)); int __tzset_run = 0; /* Interpret the TZ envariable. */ void -DEFUN_VOID(__tzset) +__tzset () { - register CONST char *tz; + register const char *tz; register size_t l; unsigned short int hh, mm, ss; unsigned short int whichrule; @@ -86,13 +88,13 @@ DEFUN_VOID(__tzset) /* Free old storage. */ if (tz_rules[0].name != NULL && *tz_rules[0].name != '\0') { - free((PTR) tz_rules[0].name); + free((void *) tz_rules[0].name); tz_rules[0].name = NULL; } if (tz_rules[1].name != NULL && *tz_rules[1].name != '\0' && tz_rules[1].name != tz_rules[0].name) { - free((PTR) tz_rules[1].name); + free((void *) tz_rules[1].name); tz_rules[1].name = NULL; } @@ -125,8 +127,8 @@ DEFUN_VOID(__tzset) tz_rules[1].name = (char *) malloc(len); if (tz_rules[1].name == NULL) return; - memcpy ((PTR) tz_rules[0].name, UTC, len); - memcpy ((PTR) tz_rules[1].name, UTC, len); + memcpy ((void *) tz_rules[0].name, UTC, len); + memcpy ((void *) tz_rules[1].name, UTC, len); tz_rules[0].type = tz_rules[1].type = J0; tz_rules[0].m = tz_rules[0].n = tz_rules[0].d = 0; tz_rules[1].m = tz_rules[1].n = tz_rules[1].d = 0; @@ -157,7 +159,7 @@ DEFUN_VOID(__tzset) } { - char *n = realloc ((PTR) tz_rules[0].name, l + 1); + char *n = realloc ((void *) tz_rules[0].name, l + 1); if (n != NULL) tz_rules[0].name = n; } @@ -183,8 +185,8 @@ DEFUN_VOID(__tzset) case 3: break; } - tz_rules[0].offset *= (min(ss, 59) + (min(mm, 59) * 60) + - (min(hh, 23) * 60 * 60)); + tz_rules[0].offset *= (min (ss, 59) + (min (mm, 59) * 60) + + (min (hh, 23) * 60 * 60)); for (l = 0; l < 3; ++l) { @@ -197,25 +199,25 @@ DEFUN_VOID(__tzset) /* Get the DST timezone name (if any). */ if (*tz != '\0') { - char *n = malloc (strlen(tz) + 1); + char *n = malloc (strlen (tz) + 1); if (n != NULL) { tz_rules[1].name = n; - if (sscanf(tz, "%[^0-9,+-]", tz_rules[1].name) != 1 || - (l = strlen(tz_rules[1].name)) < 3) + if (sscanf (tz, "%[^0-9,+-]", tz_rules[1].name) != 1 || + (l = strlen (tz_rules[1].name)) < 3) { free (n); tz_rules[1].name = (char *) ""; goto done_names; /* Punt on name, set up the offsets. */ } - n = realloc ((PTR) tz_rules[1].name, l + 1); + n = realloc ((void *) tz_rules[1].name, l + 1); if (n != NULL) tz_rules[1].name = n; + + tz += l; } } - tz += l; - /* Figure out the DST offset from GMT. */ if (*tz == '-' || *tz == '+') tz_rules[1].offset = *tz++ == '-' ? 1L : -1L; @@ -234,8 +236,8 @@ DEFUN_VOID(__tzset) case 2: ss = 0; case 3: - tz_rules[1].offset *= (min(ss, 59) + (min(mm, 59) * 60) + - (min(hh, 23) * (60 * 60))); + tz_rules[1].offset *= (min (ss, 59) + (min (mm, 59) * 60) + + (min (hh, 23) * (60 * 60))); break; } for (l = 0; l < 3; ++l) @@ -338,7 +340,7 @@ DEFUN_VOID(__tzset) } for (l = 0; l < 3; ++l) { - while (isdigit(*tz)) + while (isdigit (*tz)) ++tz; if (l < 2 && *tz == ':') ++tz; @@ -361,7 +363,7 @@ DEFUN_VOID(__tzset) size_t __tzname_cur_max; long int -DEFUN_VOID(__tzname_max) +__tzname_max () { if (! __tzset_run) __tzset (); @@ -374,7 +376,9 @@ DEFUN_VOID(__tzname_max) put it in RULE->change, saving YEAR in RULE->computed_for. Return nonzero if successful, zero on failure. */ static int -DEFUN(compute_change, (rule, year), tz_rule *rule AND int year) +compute_change (rule, year) + tz_rule *rule; + int year; { register time_t t; int y; @@ -410,7 +414,7 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year) /* Mm.n.d - Nth "Dth day" of month M. */ { register int i, d, m1, yy0, yy1, yy2, dow; - register CONST unsigned short int *myday = + register const unsigned short int *myday = &__mon_yday[__isleap (year)][rule->m]; /* First add SECSPERDAY for each day in months before M. */ @@ -456,8 +460,9 @@ DEFUN(compute_change, (rule, year), tz_rule *rule AND int year) and set `__tzname', `__timezone', and `__daylight' accordingly. Return nonzero on success, zero on failure. */ int -DEFUN(__tz_compute, (timer, tm), - time_t timer AND const struct tm *tm) +__tz_compute (timer, tm) + time_t timer; + const struct tm *tm; { if (! __tzset_run) __tzset (); |