diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 04:31:36 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 04:31:36 +0000 |
commit | c84142e8fe3cbcce43ae35ac957a74ac8216d11d (patch) | |
tree | da310b5d0928e6dab9d1195606a4b56376ae747c /posix | |
parent | 7434ccadbb6897d366d2377f84efe1e2cd61b02b (diff) |
Update to 2.1.x development versioncvs/libc-970218cvs/libc-970217cvs/libc-970216cvs/libc-970215
1997-02-15 02:41 Miles Bader <miles@gnu.ai.mit.edu>
* argp/argp-help.c: Gettextize sources.
* argp/argp-parse.c: Likewise.
1997-02-13 22:32 Ulrich Drepper <drepper@cygnus.com>
* features.h (__GLIBC_MINOR__): Bump to 1.
* xlocale.h: New file. Wrapper around locale/xlocale.h.
* Makefile (distribute): Add xlocale.h.
* locale/Makefile (routines): Add ctype_l.
* locale/ctype-extn.c: Update copyright. De-ANSI-declfy.
Add __isblank_l, __toascii_l and __isascii_l.
* ctype/ctype.h: Add definitions and declarations for *_l functions.
* locale/Makefile (headers): Add xlocale.h.
(routines): Add newlocale, duplocale, and freelocale.
* locale/localeinfo.h (MAX_USAGE_COUNT): New macro.
(struct locale_data): Add new fields mmaped and usage_count.
Correct various declarations.
* locale/C-collate.c: Define value for new fields mmaped and
usage_count.
* locale/C-ctype.c: Likewise.
* locale/C-messages.c: Likewise.
* locale/C-monetary.c: Likewise.
* locale/C-numeric.c: Likewise.
* locale/C-time.c: Likewise.
* locale/loadlocale.c (_nl_load_locale): Initialize mmaped and
usage_count fields.
* locale/locale.h: Don't define locale_t here (moved to xlocale.h).
Correct prototypes for __newlocale and __freelocale.
Add prototype for __duplocale.
* locale/findlocale.c (copy): Remove function. Use __strdup instead.
(_nl_remove_locale): New function.
* locale/nl_langinfo.c: Don't declare locale_data objects as const.
* locale/setlocale.c: Likewise.
* locale/weight.h: Change for use with locale objects.
* locale/xlocale.h: New file. Define __locale_t type.
* locale/newlocale.c: New file. Create new locale object.
* locale/freelocale.c: New file. Destroy locale object.
* locale/duplocale.c: New file. Create copy of locale object.
* stdlib/Makefile (routines): Add strfmon_l.
* stdlib/monetary.h [__USE_GNU]: Declare __strfmon_l.
* stdlib/strfmon.c: Add support for use in extended locale model.
* stdlib/strfmon_l.c: New file.
* string/Makefile (routines): Add strcoll_l and strxfrm_l.
* string/strcoll.c: Change for use in extended locale model.
* string/strxfrm.c: Likewise.
* string/strcoll_l.c: New file. Implement __strcoll_l function.
* string/strxfrm_l.c: New file. Implement __strxfrm_l function.
* wcsmbs/Makefile (routines): Add wcscoll_l and wcsxfrm_l.
* wcsmbs/wchar.h [__USE_GNU]: Declare wcscoll_l and wcsxfrm_l.
* wcsmbs/wcscoll.c: Change for use in extended locale model.
* wcsmbs/wcscoll_l.c: New file. Implement __wcscoll_l function.
* wcsmbs/wcsxfrm_l.c: New file. Implement __wcsxfrm_l function.
* wctype/Makefile (routines): Add wcextra, wcfuncs_l, iswctype_l,
and towctrans_l.
* wctype/cname-lookup.h: Prepare for use in extended locale model.
* wctype/iswctype_l.c: New file. Implement character classification
functions for use with locale objects.
* wctype/wctype.h: Declare functions for use with locale objects.
* wctype/towctrans_l.c: New file. Implement __towctrans_l function
for use with locale objects.
* wctype/wcfuncs_l.c: New file. Implement wide character
classification functions for use with locale objects.
* wctype/wcextra.c: New file. Implement real functions for
non-standard classification functions.
* elf/ldd.bash.in: Don't use --data-relocs and --function-relocs
parameters to ld.so. Use environment variables.
* elf/ldd.sh.in: Likewise.
* elf/rtld.c: Remove handling of --data-relocs and --function-relocs
options. Instead read environment variables.
* elf/link.h (receiver_fct): Add new argument to take error code.
* elf/dl-error.c (_dl_signal_error): Call receiver function with
another argument.
* elf/dl-object.c (_dl_new_object): Create new object with list of
names in l_libname member.
* elf/dl-load.c (_dl_map_object_from_fd): Add name which was used to
find to object to the list in the link_map variable.
(_dl_map_object): Use _dl_does_name_match_p to compare with all
available names of the object.
Optimize handling of LD_LIBRARY_PATH a bit.
* elf/rtld.c: Initialize l_libname member of _dl_rtld_map.
* elf/dl-lookup.c (_dl_elf_hash): Optimize function.
* elf/Makefile (routines): Add dl-version.
* elf/link.h (hash_name_pair): New type. Group pointer to string
and its hash value.
(struct link_map): Change l_libname member to be a list of names,
not a single pointer to a name.
Add new members l_nversions and l_versions.
(_dl_does_name_match_p): New function to test for all names of an
object.
Add prototypes for new lookup and versioning functions.
* elf/dl-lookup.c (do_lookup): Add new argument and handle case
when versioned symbol is requested.
(_dl_lookup_symbol): Call do_lookup with another argument.
(_dl_lookup_symbol_skip): Likewise.
(_dl_lookup_versioned_symbol): New function. Handle lookup of
versioned symbol.
(_dl_lookup_versioned_symbol_skip): Likewise, similar to
_dl_lookup_symbol_skip.
* elf/dl-reloc.c (RESOLVE): Call _dl_lookup_versioned_symbol or
_dl_lookup_symbol depending on availability of version information.
* elf/dl-runtime.c (RESOLVE): Likewise.
(fixup): Call elf_machine_relplt with additional argument to point
to versioning information if available.
* elf/do-rel.h (elf_dynamic_do_rel): Likewise.
* elf/dl-open.c (_dl_open): Call _dl_check_map_versions to check
for correct versions.
* elf/dl-version.c: New file. Check library versions and extract
version information for easier access.
* elf/dlfcn.h [__USE_GNU]: Add prototype for dlvsym.
* elf/dlvsym.c: New file. Implementation of function similar to
dlsym, but looks for versioned symbol.
* elf/elf.h: Add types and macros for versioning.
* elf/rtld.c (dl_main): Check availability of needed versions.
* sysdeps/alpha/dl-machine.h (elf_machine_rela): Add additional
argument for version information. Call RESOLVE with additional
argument.
* sysdeps/i386/dl-machine.h: Likewise.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.h: Likewise.
* elf/dlerror.c: Change comment to align with guidelines.
* elf/dlopen.c: Likewise.
* elf/dlsym.c: Likewise.
* locale/programs/localedef.c: Implement --quiet option.
* locale/programs/charset.h: Declare be_quiet variable.
* locale/programs/locfile.h: Likewise.
* locale/programs/charmap.c: Don't print warnings if quiet option
was given.
* locale/programs/ld-collate.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-messages.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/ld-numeric.c: Likewise.
* locale/programs/ld-time.c: Likewise.
* locale/programs/locfile.c: Likewise.
* Makefile (subdirs): Add argp.
* catgets/catgets.c (catopen): Little code improvement.
* posix/execl.c: Remove restriction to 1024 arguments.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* posix/getopt.c [_LIBC]: Define global objects with __ prefix
and make regular names weak aliases.
* posix/getopt1.c: Likewise.
* posix/getopt.h [_LIBC]: Provide prototypes and declarations for
__ protected forms.
* posix/unistd.h: Add prototype for __sleep.
* sysdeps/mach/sleep.c: Make sleep weak alias of __sleep.
* sysdeps/posix/sleep.c: Likewise.
* sysdeps/stub/sleep.c: Likewise.
* sysdeps/unix/sysv/linux/sleep.c: Likewise.
* ctype/ctype-info.c: Update copyright.
* ctype/ctype.c: Likewise.
* ctype/test_ctype.c: Likewise.
* dirent/alphasort.c: Likewise.
* dirent/list.c: Likewise.
* gmon/bb_exit_func.c: Likewise.
* grp/fgetgrent.c: Likewise.
* grp/getgrent.c: Likewise.
* grp/getgrent_r.c: Likewise.
* grp/getgrgid.c: Likewise.
* grp/getgrgid_r.c: Likewise.
* grp/getgrnam.c: Likewise.
* grp/getgrnam_r.c: Likewise.
* hurd/alloc-fd.c: Likewise.
* hurd/catch-exc.c: Likewise.
* hurd/ctty-input.c: Likewise.
* hurd/ctty-output.c: Likewise.
* hurd/dtable.c: Likewise.
* hurd/fchroot.c: Likewise.
* hurd/fd-close.c: Likewise.
* hurd/fd-read.c: Likewise.
* hurd/fd-write.c: Likewise.
* hurd/fopenport.c: Likewise.
* hurd/get-host.c: Likewise.
* hurd/getdport.c: Likewise.
* hurd/getuids.c: Likewise.
* hurd/getumask.c: Likewise.
* hurd/hurd-raise.c: Likewise.
* hurd/hurd.h: Likewise.
* hurd/hurdauth.c: Likewise.
* hurd/hurdexec.c: Likewise.
* hurd/hurdhost.h: Likewise.
* hurd/hurdid.c: Likewise.
* hurd/hurdinit.c: Likewise.
* hurd/hurdioctl.c: Likewise.
* hurd/hurdkill.c: Likewise.
* hurd/hurdlookup.c: Likewise.
* hurd/hurdmsg.c: Likewise.
* hurd/hurdpid.c: Likewise.
* hurd/hurdports.c: Likewise.
* hurd/hurdprio.c: Likewise.
* hurd/hurdrlimit.c: Likewise.
* hurd/hurdsock.c: Likewise.
* hurd/hurdstartup.c: Likewise.
* hurd/hurdstartup.h: Likewise.
* hurd/intern-fd.c: Likewise.
* hurd/intr-msg.c: Likewise.
* hurd/intr-rpc.defs: Likewise.
* hurd/intr-rpc.h: Likewise.
* hurd/msgportdemux.c: Likewise.
* hurd/new-fd.c: Likewise.
* hurd/openport.c: Likewise.
* hurd/pid2task.c: Likewise.
* hurd/port-cleanup.c: Likewise.
* hurd/port2fd.c: Likewise.
* hurd/ports-get.c: Likewise.
* hurd/ports-set.c: Likewise.
* hurd/privports.c: Likewise.
* hurd/report-wait.c: Likewise.
* hurd/set-host.c: Likewise.
* hurd/setauth.c: Likewise.
* hurd/setuids.c: Likewise.
* hurd/siginfo.c: Likewise.
* hurd/sigunwind.c: Likewise.
* hurd/task2pid.c: Likewise.
* hurd/thread-cancel.c: Likewise.
* hurd/thread-self.c: Likewise.
* hurd/vpprintf.c: Likewise.
* hurd/hurd/fd.h: Likewise.
* hurd/hurd/id.h: Likewise.
* hurd/hurd/ioctl.h: Likewise.
* hurd/hurd/lookup.h: Likewise.
* hurd/hurd/port.h: Likewise.
* hurd/hurd/resource.h: Likewise.
* hurd/hurd/threadvar.h: Likewise.
* hurd/hurd/userlink.h: Likewise.
* inet/ether_aton.c: Likewise.
* inet/ether_aton_r.c: Likewise.
* inet/ether_ntoa.c: Likewise.
* inet/ether_ntoa_r.c: Likewise.
* inet/gethstbyad.c: Likewise.
* inet/gethstbyad_r.c: Likewise.
* inet/gethstent.c: Likewise.
* inet/getnetbyad.c: Likewise.
* inet/getnetbyad_r.c: Likewise.
* inet/getnetbynm.c: Likewise.
* inet/getnetbynm_r.c: Likewise.
* inet/getnetent.c: Likewise.
* inet/getnetent_r.c: Likewise.
* inet/getproto.c: Likewise.
* inet/getproto_r.c: Likewise.
* inet/getprtent.c: Likewise.
* inet/getprtent_r.c: Likewise.
* inet/getprtname.c: Likewise.
* inet/getrpcbyname.c: Likewise.
* inet/getrpcbyname_r.c: Likewise.
* inet/getrpcbynumber.c: Likewise.
* inet/getrpcbynumber_r.c: Likewise.
* inet/getrpcent.c: Likewise.
* inet/getrpcent_r.c: Likewise.
* inet/getservent.c: Likewise.
* inet/getservent_r.c: Likewise.
* inet/getsrvbynm.c: Likewise.
* inet/getsrvbynm_r.c: Likewise.
* inet/getsrvbypt.c: Likewise.
* inet/getsrvbypt_r.c: Likewise.
* inet/herrno.c: Likewise.
* inet/netgroup.h: Likewise.
* ient/netinet/ether.h: Likewise.
* intl/bindtextdom.c: Likewise.
* intl/dcgettext.c: Likewise.
* intl/dgettext.c: Likewise.
* intl/gettext.c: Likewise.
* intl/gettext.h: Likewise.
* intl/gettextP.h: Likewise.
* intl/hash-string.h: Likewise.
* intl/loadmsgcat.c: Likewise.
* intl/localealias.c: Likewise.
* intl/textdomain.c: Likewise.
* io/creat.c: Likewise.
* io/getdirname.c: Likewise.
* io/lockf.c: Likewise.
* io/pwd.c: Likewise.
* io/test-utime.c: Likewise.
* locale/categories.def: Likewise.
* locale/codeset_name.c: Likewise.
* locale/lc-collate.c: Likewise.
* locale/lc-ctype.c: Likewise.
* locale/lc-messages.c: Likewise.
* locale/lc-monetary.c: Likewise.
* locale/lc-numeric.c: Likewise.
* locale/lc-time.c: Likewise.
* locale/loadlocale.c: Likewise.
* locale/localeconv.c: Likewise.
* locale/nl_langinfo.c: Likewise.
* locale/setlocale.c: Likewise.
* locale/strlen-hash.h: Likewise.
* locale/programs/charmap-kw.gperf: Likewise.
* locale/programs/charmap-kw.h: Likewise.
* locale/programs/charset.c: Likewise.
* locale/programs/ld-ctype.c: Likewise.
* locale/programs/ld-messages.c: Likewise.
* locale/programs/ld-monetary.c: Likewise.
* locale/programs/linereader.h: Likewise.
* locale/programs/locale-spec.c: Likewise.
* locale/programs/locales.h: Likewise.
* locale/programs/locfile-kw.gperf: Likewise.
* locale/programs/locfile-kw.h: Likewise.
* locale/programs/locfile-token.h: Likewise.
* locale/programs/simple-hash.h: Likewise.
* locale/programs/stringtrans.c: Likewise.
* locale/programs/stringtrans.h: Likewise.
* login/logout.c: Likewise.
* mach/bootprivport.c: Likewise.
* mach/devstream.c: Likewise.
* mach/hello.c: Likewise.
* mach/mach.h: Likewise.
* mach/mach_init.c: Likewise.
* mach/mach_init.h: Likewise.
* mach/mig-alloc.c: Likewise.
* mach/mig-dealloc.c: Likewise.
* mach/mutex-init.c: Likewise.
* mach/mutex-solid.c: Likewise.
* mach/setup-thread.c: Likewise.
* mach/spin-lock.h: Likewise.
* mach/spin-solid.c: Likewise.
* mach/mach/mig_support.h: Likewise.
* md5-crypt/md5-crypt.c: Likewise.
* misc/nlist.h: Likewise.
* nss/nss_files/files-ether.c: Likewise.
* posix/confstr.c: Likewise.
* posix/execl.c: Likewise.
* posix/execle.c: Likewise.
* posix/execlp.c: Likewise.
* posix/execv.c: Likewise.
* posix/execvp.c: Likewise.
* posix/fnmatch.c: Likewise.
* posix/getopt.c: Likewise.
* posix/getopt.h: Likewise.
* posix/getopt1.c: Likewise.
* posix/id.c: Likewise.
* posix/regex.c: Likewise.
* posix/setpgrp.c: Likewise.
* posix/unistd.h: Likewise.
* posix/wordexp.c: Likewise.
* pwd/fgetpwent.c: Likewise.
* pwd/getpwent.c: Likewise.
* pwd/getpwent_r.c: Likewise.
* pwd/getpwnam.c: Likewise.
* pwd/getpwnam_r.c: Likewise.
* pwd/getpwuid.c: Likewise.
* pwd/getpwuid_r.c: Likewise.
* pwd/putpwent.c: Likewise.
* resolv/gethnamaddr.c: Likewise.
* resolv/res_hconf.c: Likewise.
* resolv/res_hconf.h: Likewise.
* setjmp/longjmp.c: Likewise.
* setjmp/sigjmp.c: Likewise.
* setjmp/tst-setjmp.c: Likewise.
* stdio/clearerr.c: Likewise.
* stdio/ferror.c: Likewise.
* stdio/fgetc.c: Likewise.
* stdio/fgetpos.c: Likewise.
* stdio/fgets.c: Likewise.
* stdio/fileno.c: Likewise.
* stdio/fmemopen.c: Likewise.
* stdio/fopen.c: Likewise.
* stdio/fopncook.c: Likewise.
* stdio/fputc.c: Likewise.
* stdio/fputs.c: Likewise.
* stdio/fread.c: Likewise.
* stdio/freopen.c: Likewise.
* stdio/fseek.c: Likewise.
* stdio/fsetpos.c: Likewise.
* stdio/ftell.c: Likewise.
* stdio/fwrite.c: Likewise.
* stdio/getchar.c: Likewise.
* stdio/getdelim.c: Likewise.
* stdio/gets.c: Likewise.
* stdio/glue.c: Likewise.
* stdio/internals.c: Likewise.
* stdio/linewrap.c: Likewise.
* stdio/linewrap.h: Likewise.
* stdio/memstream.c: Likewise.
* stdio/newstream.c: Likewise.
* stdio/putchar.c: Likewise.
* stdio/puts.c: Likewise.
* stdio/rewind.c: Likewise.
* stdio/setbuf.c: Likewise.
* stdio/setbuffer.c: Likewise.
* stdio/setlinebuf.c: Likewise.
* stdio/setvbuf.c: Likewise.
* stdio/ungetc.c: Likewise.
* stdio/vasprintf.c: Likewise.
* stdio/vscanf.c: Likewise.
* stdio/vsnprintf.c: Likewise.
* stdio/vsprintf.c: Likewise.
* stdio/vsscanf.c: Likewise.
* stdio-common/asprintf.c: Likewise.
* stdio-common/dprintf.c: Likewise.
* stdio-common/errnobug.c: Likewise.
* stdio-common/fprintf.c: Likewise.
* stdio-common/getline.c: Likewise.
* stdio-common/getw.c: Likewise.
* stdio-common/perror.c: Likewise.
* stdio-common/psignal.c: Likewise.
* stdio-common/putw.c: Likewise.
* stdio-common/reg-printf.c: Likewise.
* stdio-common/scanf.c: Likewise.
* stdio-common/snprintf.c: Likewise.
* stdio-common/sprintf.c: Likewise.
* stdio-common/tempnam.c: Likewise.
* stdio-common/test_rdwr.c: Likewise.
* stdio-common/tst-fileno.c: Likewise.
* stdio-common/tst-printf.c: Likewise.
* stdio-common/tstgetln.c: Likewise.
* stdio-common/vprintf.c: Likewise.
* stdlib/drand48.c: Likewise.
* stdlib/drand48_r.c: Likewise.
* stdlib/erand48.c: Likewise.
* stdlib/erand48_r.c: Likewise.
* stdlib/exit.h: Likewise.
* stdlib/strtoq.c: Likewise.
* stdlib/strtoul.c: Likewise.
* stdlib/strtouq.c: Likewise.
* stdlib/test-canon.c: Likewise.
* stdlib/testdiv.c: Likewise.
* stdlib/testrand.c: Likewise.
* string/argz-append.c: Likewise.
* string/argz-count.c: Likewise.
* string/argz-create.c: Likewise.
* string/argz-ctsep.c: Likewise.
* string/argz-delete.c: Likewise.
* string/argz-extract.c: Likewise.
* string/argz-insert.c: Likewise.
* string/argz-next.c: Likewise.
* string/argz-stringify.c: Likewise.
* string/basename.c: Likewise.
* string/envz.c: Likewise.
* string/memfrob.c: Likewise.
* string/strcoll.c: Likewise.
* string/strdup.c: Likewise.
* string/string.h: Likewise.
* string/strndup.c: Likewise.
* string/strnlen.c: Likewise.
* string/strsignal.c: Likewise.
* string/strxfrm.c: Likewise.
* string/test-ffs.c: Likewise.
* string/testcopy.c: Likewise.
* sysdeps/generic/enbl-secure.c: Likewise.
* sysdeps/generic/memcopy.h: Likewise.
* sysdeps/generic/stpncpy.c: Likewise.
* sysdeps/generic/strcasecmp.c: Likewise.
* sysdeps/generic/strcat.c: Likewise.
* sysdeps/generic/strchr.c: Likewise.
* sysdeps/generic/strcpy.c: Likewise.
* sysdeps/generic/strcspn.c: Likewise.
* sysdeps/generic/strlen.c: Likewise.
* sysdeps/generic/strncase.c: Likewise.
* sysdeps/generic/strncat.c: Likewise.
* sysdeps/generic/strncpy.c: Likewise.
* sysdeps/generic/strpbrk.c: Likewise.
* sysdeps/generic/strsep.c: Likewise.
* sysdeps/generic/strspn.c: Likewise.
* sysdeps/generic/strstr.c: Likewise.
* sysdeps/generic/strtok.c: Likewise.
* sysdeps/generic/strtok_r.c: Likewise.
* sysdeps/mach/sleep.c: Likewise.
* sysdeps/posix/sleep.c: Likewise.
* sysdeps/stub/sleep.c: Likewise.
* time/date.c: Likewise.
* time/test_time.c: Likewise.
* wcsmbs/wmemcpy.c: Likewise.
* wctye/test_wctype.c: Likewise.
* wctye/towctrans.c: Likewise.
* wctye/wcfuncs.c: Likewise.
* wctye/wctrans.c: Likewise.
1997-02-13 22:15 Miles Bader <miles@gnu.ai.mit.edu>
* argp/Makefile: New file.
* argp/argp.h: Likewise.
* argp/argp-ba.c: Likewise.
* argp/argp-fmtstream.c: Likewise.
* argp/argp-fmtstream.h: Likewise.
* argp/argp-fs-xinl.c: Likewise.
* argp/argp-help.c: Likewise.
* argp/argp-namefrob.h: Likewise.
* argp/argp-parse.c: Likewise.
* argp/argp-pv.c: Likewise.
* argp/argp-pvh.c: Likewise.
* argp/argp-test.c: Likewise.
* argp/argp-xinl.c: Likewise.
* libio/_G_config.h: Make sure wint_t is also defined for old gcc
1997-02-09 04:35 Ulrich Drepper <drepper@cygnus.com>
* stdio-common/_itoa.h: Update copyright.
Diffstat (limited to 'posix')
-rw-r--r-- | posix/confstr.c | 34 | ||||
-rw-r--r-- | posix/execl.c | 64 | ||||
-rw-r--r-- | posix/execle.c | 67 | ||||
-rw-r--r-- | posix/execlp.c | 59 | ||||
-rw-r--r-- | posix/execv.c | 35 | ||||
-rw-r--r-- | posix/execvp.c | 34 | ||||
-rw-r--r-- | posix/fnmatch.c | 31 | ||||
-rw-r--r-- | posix/id.c | 119 | ||||
-rw-r--r-- | posix/regex.c | 30 | ||||
-rw-r--r-- | posix/setpgrp.c | 28 | ||||
-rw-r--r-- | posix/unistd.h | 1 | ||||
-rw-r--r-- | posix/wordexp.c | 39 |
12 files changed, 305 insertions, 236 deletions
diff --git a/posix/confstr.c b/posix/confstr.c index b511ea0ab8..850130b2a9 100644 --- a/posix/confstr.c +++ b/posix/confstr.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. */ +/* Copyright (C) 1991, 1996, 1997 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 <stddef.h> #include <errno.h> diff --git a/posix/execl.c b/posix/execl.c index 9aa13b958f..4772f15474 100644 --- a/posix/execl.c +++ b/posix/execl.c @@ -1,37 +1,38 @@ -/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1992, 1994, 1997 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 <unistd.h> #include <stdarg.h> #include <stddef.h> +#include <string.h> #ifndef HAVE_GNU_LD -#define __environ environ +# define __environ environ #endif /* Execute PATH with all arguments after PATH until a NULL pointer and environment from `environ'. */ int -DEFUN(execl, (path, arg), CONST char *path AND CONST char *arg DOTS) +execl (const char *path, const char *arg, ...) { - CONST char *argv[1024]; - register unsigned int i; + size_t argv_max = 1024; + const char **argv = alloca (argv_max * sizeof (const char *)); + unsigned int i; va_list args; argv[0] = arg; @@ -40,9 +41,28 @@ DEFUN(execl, (path, arg), CONST char *path AND CONST char *arg DOTS) i = 1; do { - argv[i] = va_arg (args, CONST char *); - } while (argv[i++] != NULL); + if (i == argv_max) + { + const char **nptr = alloca ((argv_max *= 2) * sizeof (const char *)); + + if ((char *) nptr + argv_max == (char *) argv) + { + /* Stack grows down. */ + argv = (const char **) memcpy (nptr, argv, i); + argv_max += i; + } + else if ((char *) argv + i == (char *) nptr) + /* Stack grows up. */ + argv_max += i; + else + /* We have a hole in the stack. */ + argv = (const char **) memcpy (nptr, argv, i); + } + + argv[i] = va_arg (args, const char *); + } + while (argv[i++] != NULL); va_end (args); - return __execve (path, (char *CONST *) argv, __environ); + return __execve (path, (char *const *) argv, __environ); } diff --git a/posix/execle.c b/posix/execle.c index a36d49a407..3e0fcee87e 100644 --- a/posix/execle.c +++ b/posix/execle.c @@ -1,45 +1,66 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1997 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 <unistd.h> #include <stdarg.h> #include <stddef.h> +#include <string.h> /* Execute PATH with all arguments after PATH until a NULL pointer, and the argument after that for environment. */ int -DEFUN(execle, (path), CONST char *path AND CONST char *arg DOTS) +execle (const char *path, const char *arg, ...) { - CONST char *argv[1024], *CONST *envp; - register unsigned int i; + size_t argv_max = 1024; + const char **argv = alloca (argv_max * sizeof (const char *)); + const char *const *envp; + unsigned int i; va_list args; + argv[0] = arg; va_start(args, arg); - argv[0] = arg; i = 1; do { - argv[i] = va_arg(args, CONST char *); - } while (argv[i++] != NULL); + if (i == argv_max) + { + const char **nptr = alloca ((argv_max *= 2) * sizeof (const char *)); + + if ((char *) nptr + argv_max == (char *) argv) + { + /* Stack grows down. */ + argv = (const char **) memcpy (nptr, argv, i); + argv_max += i; + } + else if ((char *) argv + i == (char *) nptr) + /* Stack grows up. */ + argv_max += i; + else + /* We have a hole in the stack. */ + argv = (const char **) memcpy (nptr, argv, i); + } + + argv[i] = va_arg (args, const char *); + } + while (argv[i++] != NULL); - envp = va_arg(args, CONST char *CONST *); + envp = va_arg(args, const char *const *); va_end(args); - return __execve(path, (char *CONST *) argv, (char *CONST *) envp); + return __execve(path, (char *const *) argv, (char *const *) envp); } diff --git a/posix/execlp.c b/posix/execlp.c index f442c05d94..76b878ec6a 100644 --- a/posix/execlp.c +++ b/posix/execlp.c @@ -1,24 +1,25 @@ -/* Copyright (C) 1991, 1993, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1993, 1996, 1997 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 <unistd.h> #include <stdarg.h> #include <stddef.h> +#include <string.h> /* Execute FILE, searching in the `PATH' environment variable if it contains no slashes, with all arguments after FILE until a @@ -26,16 +27,38 @@ Cambridge, MA 02139, USA. */ int execlp (const char *file, const char *arg, ...) { - const char *argv[1024]; + size_t argv_max = 1024; + const char **argv = alloca (argv_max * sizeof (const char *)); unsigned int i; va_list args; + argv[0] = arg; + va_start (args, arg); + i = 1; + do + { + if (i == argv_max) + { + const char **nptr = alloca ((argv_max *= 2) * sizeof (const char *)); - argv[i = 0] = arg; - while (argv[i++] != NULL) - argv[i] = va_arg (args, const char *); + if ((char *) nptr + argv_max == (char *) argv) + { + /* Stack grows down. */ + argv = (const char **) memcpy (nptr, argv, i); + argv_max += i; + } + else if ((char *) argv + i == (char *) nptr) + /* Stack grows up. */ + argv_max += i; + else + /* We have a hole in the stack. */ + argv = (const char **) memcpy (nptr, argv, i); + } + argv[i] = va_arg (args, const char *); + } + while (argv[i++] != NULL); va_end (args); return execvp (file, (char *const *) argv); diff --git a/posix/execv.c b/posix/execv.c index 1749e24631..aba9d20f92 100644 --- a/posix/execv.c +++ b/posix/execv.c @@ -1,31 +1,30 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1992, 1997 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 <unistd.h> #ifndef HAVE_GNU_LD -#define __environ environ +# define __environ environ #endif /* Execute PATH with arguments ARGV and environment from `environ'. */ int -DEFUN(execv, (path, argv), CONST char *path AND char *CONST argv[]) +execv (const char *path, char *const argv[]) { - return __execve(path, argv, __environ); + return __execve (path, argv, __environ); } diff --git a/posix/execvp.c b/posix/execvp.c index 400e082937..c231ec69ca 100644 --- a/posix/execvp.c +++ b/posix/execvp.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1992, 1995, 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. */ +/* Copyright (C) 1991, 1992, 1995, 1996, 1997 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 <unistd.h> #include <stdarg.h> diff --git a/posix/fnmatch.c b/posix/fnmatch.c index edbfb6ae9a..e143743215 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -1,19 +1,20 @@ -/* Copyright (C) 1991, 1992, 1993, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1993, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. -This 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. + This 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. -This 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. + This 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 this 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 this 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. */ #if HAVE_CONFIG_H # include <config.h> @@ -37,10 +38,10 @@ Cambridge, MA 02139, USA. */ 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. */ -#if defined (_LIBC) || !defined (__GNU_LIBRARY__) +#if defined _LIBC || !defined __GNU_LIBRARY__ -# if defined (STDC_HEADERS) || !defined (isascii) +# if defined STDC_HEADERS || !defined isascii # define ISASCII(c) 1 # else # define ISASCII(c) isascii(c) diff --git a/posix/id.c b/posix/id.c index b08d2501fa..6c602b21b4 100644 --- a/posix/id.c +++ b/posix/id.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1995, 1997 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 <unistd.h> #include <stdlib.h> @@ -27,61 +26,65 @@ Cambridge, MA 02139, USA. */ static void -DEFUN(print_grpname, (id, parens), - gid_t id AND int parens) +print_grpname (id, parens) + gid_t id; + int parens; { - CONST struct group *CONST g = getgrgid(id); + const struct group *const g = getgrgid (id); if (g == NULL) { if (parens) return; else { - fprintf(stderr, _("Couldn't find name for group %d\n"), id); - exit(EXIT_FAILURE); + fprintf (stderr, _("Couldn't find name for group %d\n"), id); + exit (EXIT_FAILURE); } } if (parens) - printf("(%s)", g->gr_name); + printf ("(%s)", g->gr_name); else - puts(g->gr_name); + puts (g->gr_name); } static void -DEFUN(print_pwdname, (id, parens), - uid_t id AND int parens) +print_pwdname (id, parens) + uid_t id; + int parens; { - CONST struct passwd *CONST p = getpwuid(id); + const struct passwd *const p = getpwuid (id); if (p == NULL) { if (parens) return; else { - fprintf(stderr, _("Couldn't find name for user %d\n"), (int) id); - exit(EXIT_FAILURE); + fprintf (stderr, _("Couldn't find name for user %d\n"), (int) id); + exit (EXIT_FAILURE); } } if (parens) - printf("(%s)", p->pw_name); + printf ("(%s)", p->pw_name); else - puts(p->pw_name); + puts (p->pw_name); } int -DEFUN(main, (argc, argv), int argc AND char **argv) +main (argc, argv) + int argc; + char **argv; { int print_gid = 1, print_uid = 1; int real = 0, name = 0; int error = 0; - register int c; + int c; - uid_t ruid = getuid(), euid = geteuid(); - gid_t rgid = getgid(), egid = getegid(); + uid_t ruid = getuid (), euid = geteuid (); + gid_t rgid = getgid (), egid = getegid (); - while ((c = getopt(argc, argv, "gurn")) != -1) + while ((c = getopt (argc, argv, "gurn")) != -1) switch (c) { default: @@ -109,65 +112,65 @@ DEFUN(main, (argc, argv), int argc AND char **argv) if (error || argc != optind) { - fputs(_("Usage: id [-gurn]\n"), stderr); - exit(EXIT_FAILURE); + fputs (_("Usage: id [-gurn]\n"), stderr); + exit (EXIT_FAILURE); } if (print_uid && !print_gid) { - CONST uid_t uid = real ? ruid : euid; + const uid_t uid = real ? ruid : euid; if (name) - print_pwdname(uid, 0); + print_pwdname (uid, 0); else - printf("%d\n", (int) uid); + printf ("%d\n", (int) uid); } else if (print_gid && !print_uid) { - CONST gid_t gid = real ? rgid : egid; + const gid_t gid = real ? rgid : egid; if (name) - print_grpname(gid, 0); + print_grpname (gid, 0); else - printf("%d\n", (int) gid); + printf ("%d\n", (int) gid); } else { #if NGROUPS_MAX > 0 gid_t groups[NGROUPS_MAX]; int ngroups; - ngroups = getgroups(NGROUPS_MAX, groups); + ngroups = getgroups (NGROUPS_MAX, groups); #endif - printf("uid=%d", (int) ruid); - print_pwdname(ruid, 1); - printf(" gid=%d", (int) rgid); - print_grpname(rgid, 1); + printf ("uid=%d", (int) ruid); + print_pwdname (ruid, 1); + printf (" gid=%d", (int) rgid); + print_grpname (rgid, 1); if (euid != ruid) { - printf(" euid=%d", (int) euid); - print_pwdname(euid, 1); + printf (" euid=%d", (int) euid); + print_pwdname (euid, 1); } if (egid != rgid) { - printf(" egid=%d", (int) egid); - print_grpname(egid, 1); + printf (" egid=%d", (int) egid); + print_grpname (egid, 1); } #if NGROUPS > 0 if (ngroups > 0) { - register size_t i; - printf(" groups=%d", (int) groups[0]); - print_grpname(groups[0], 1); + size_t i; + printf (" groups=%d", (int) groups[0]); + print_grpname (groups[0], 1); for (i = 1; i < ngroups; ++i) { - printf(", %d", (int) groups[i]); - print_grpname(groups[i], 1); + printf (", %d", (int) groups[i]); + print_grpname (groups[i], 1); } } #endif - putchar('\n'); + putchar ('\n'); } - exit(EXIT_SUCCESS); + exit (EXIT_SUCCESS); } diff --git a/posix/regex.c b/posix/regex.c index 4b640e6079..370a612603 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -3,25 +3,25 @@ (Implements POSIX draft P10003.2/D11.2, except for internationalization features.) - Copyright (C) 1993, 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1995, 1996, 1997 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. + 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 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. */ /* AIX requires this to be the first thing in the file. */ #if defined (_AIX) && !defined (REGEX_MALLOC) diff --git a/posix/setpgrp.c b/posix/setpgrp.c index 56102a3c26..e3451e13e6 100644 --- a/posix/setpgrp.c +++ b/posix/setpgrp.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1996, 1997 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 <unistd.h> diff --git a/posix/unistd.h b/posix/unistd.h index 5c8d1b7f04..57652bfc3c 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -235,6 +235,7 @@ extern unsigned int alarm __P ((unsigned int __seconds)); SIGALRM signal while inside `sleep' call, the handling of the SIGALRM signal afterwards is undefined. There is no return value to indicate error, but if `sleep' returns SECONDS, it probably didn't work. */ +extern unsigned int __sleep __P ((unsigned int __seconds)); extern unsigned int sleep __P ((unsigned int __seconds)); #if defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED) diff --git a/posix/wordexp.c b/posix/wordexp.c index 1922e44642..52869fe1d3 100644 --- a/posix/wordexp.c +++ b/posix/wordexp.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1992, 1997 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 <sys/types.h> #include <wordexp.h> #include <stdio.h> @@ -43,8 +42,10 @@ Cambridge, MA 02139, USA. */ int -DEFUN(wordexp, (string, pwordexp, flags), - CONST char *string AND wordexp_t *pwordexp AND int flags) +wordexp (string, pwordexp, flags) + const char *string; + wordexp_t *pwordexp; + int flags; { int error; pid_t pid; @@ -67,7 +68,7 @@ DEFUN(wordexp, (string, pwordexp, flags), { /* Child. Run the shell. */ - CONST char *argv[5]; + const char *argv[5]; close (d[STDIN_FILENO]); dup2 (d[STDOUT_FILENO], STDOUT_FILENO); @@ -132,7 +133,7 @@ DEFUN(wordexp, (string, pwordexp, flags), wordc = start + wordc + 1; if (flags & WRDE_APPEND) - wordv = (char **) realloc ((PTR) pwordexp->we_wordv, + wordv = (char **) realloc ((void *) pwordexp->we_wordv, wordc * sizeof (char *)); else wordv = (char **) malloc (wordc * sizeof (char *)); |