glibc/posix/wordexp.c
Ulrich Drepper dfd2257ad9 Update.
1997-10-12 05:09  Ulrich Drepper  <drepper@cygnus.com>

	* libio/Makefile (routines): Remove iofprintf.
	* stdio-common/fprintf.c [USE_IN_LIBIO]: Define _IO_fprintf.
	* libio/filedoalloc.c: Use _G_stat64 instead of stat.
	* libio/fileops.c (_IO_file_open): Change to take extra argument
	indicating whether 32 or 64 bit mode is wanted.
	* libio/iofopen.c: Call _IO_file_open with extra argument set to 0.
	* libio/iofopen64.c: Call _IO_file_open with extra argument set to 0.
	* libio/iolibio.h (_IO_freopen, _IO_freopen64): Likewise.
	* libio/iofgetpos.c: Pretty print.
	* libio/iofgetpos64.c: Use _IO_fpos64_t for local variable `pos'.

	* manual/conf.texi: Document all the _SC_ and _CS_ constants.
	* manual/creature.texi: Document _LARGEFILE_SOURCE, _LARGEFILE64_SOURCE
	and _FILE_OFFSET_BITS.
	* manual/llio.texi: Document truncate and ftruncate.
	* manual/stdio.texi: Document positional parameters for printf.

	* math/Makefile (headers): Add tgmath.h.
	(libm-support): Remove s_lrint, s_llrint, s_lround, and s_llround and
	move to ...
	(libm-calls): ... here.  Add scalbln, s_nextafterx and s_fma.
	* math/libm-test.c (lround_test, llround_test): Test for all FP formats
	by using FUNC().
	* math/libm.map: Add fma, fmaf, fmal, nextafterx, nextafterxf,
	nextafterxl, scalbln, scalblnf, scalblnl, lrintf, lrintl, llrintf,
	llrintl, lroundf, lroundl, llroundf, and llroundl.
	* math/math.h: Document new platform specific macros from mathdef.h.
	Remove declaration of lrint, llrint, lround, and llround.
	* math/test-double.c: Define TEST_DOUBLE.
	* math/test-idouble.c: Likewise.
	* math/test-float.c: Define TEST_FLOAT.
	* math/test-ifloat.c: Likewise.
	* math/tgmath.h: New file.
	* math/bits/mathcalls.h: Add nextafterx, scalbln, fma, lrint, llrint,
	lround, and llround.
	Change second argument of scalbn to `int'.
	* sysdeps/libm-ieee754/s_fma.S: New file.
	* sysdeps/libm-ieee754/s_fmaf.S: New file.
	* sysdeps/libm-ieee754/s_fmal.S: New file.
	* sysdeps/libm-i387/s_fma.S: New file.
	* sysdeps/libm-i387/s_fmaf.S: New file.
	* sysdeps/libm-i387/s_fmal.S: New file.
	* sysdeps/libm-i387/s_llrint.S: Change to take double argument.
	* sysdeps/libm-i387/s_lrint.S: Likewise.
	* sysdeps/libm-i387/s_llrintf.S: New file.
	* sysdeps/libm-i387/s_llrintl.S: New file.
	* sysdeps/libm-i387/s_lrintf.S: New file.
	* sysdeps/libm-i387/s_lrintl.S: New file.
	* sysdeps/libm-ieee754/s_llrint.c: Remove version which works on
	80bit double.
	* sysdeps/libm-ieee754/s_lrint.c: Likewise.
	* sysdeps/libm-ieee754/s_llrintf.S: New file.
	* sysdeps/libm-ieee754/s_llrintl.S: New file.
	* sysdeps/libm-ieee754/s_lrintf.S: New file.
	* sysdeps/libm-ieee754/s_lrintl.S: New file.
	* sysdeps/libm-i387/s_scalbln.c: New file.  Empty file.
	* sysdeps/libm-i387/s_scalblnf.c: New file.  Empty file.
	* sysdeps/libm-i387/s_scalblnl.c: New file.  Empty file.
	* sysdeps/libm-i387/s_scalbn.c: Add scalbln as alias.
	* sysdeps/libm-i387/s_scalbnf.c: Add scalblnf as alias.
	* sysdeps/libm-i387/s_scalbnl.c: Add scalblnl as alias.
	* sysdeps/libm-ieee754/s_llround.c: Remove version which works on
	80bit double.
	* sysdeps/libm-ieee754/s_lround.c: Likewise.
	* sysdeps/libm-ieee754/s_llroundf.c: Likewise.
	* sysdeps/libm-ieee754/s_llroundl.c: Likewise.
	* sysdeps/libm-ieee754/s_lroundf.c: Likewise.
	* sysdeps/libm-ieee754/s_lroundl.c: Likewise.
	* sysdeps/libm-ieee754/s_nextafterl.c: Add alias fo nextafterxl.
	* sysdeps/libm-ieee754/s_nextafterx.c: New file.
	* sysdeps/libm-ieee754/s_nextafterxf.c: New file.
	* sysdeps/libm-ieee754/s_nextafterxl.c: New file.
	* sysdeps/libm-ieee754/s_scalbln.c: New file.
	* sysdeps/libm-ieee754/s_scalblnf.c: New file.
	* sysdeps/libm-ieee754/s_scalblnl.c: New file.
	* sysdeps/libm-ieee754/s_scalbn.c: Change to take `int' as second arg.
	* sysdeps/libm-ieee754/s_scalbnf.c: Likewise.
	* sysdeps/libm-ieee754/s_scalbnl.c: Likewise.

	* stdlib/stdlib.h: Protect declarations of __strto*l_internal functions
	by #ifdefs since they are duplicated in inttypes.h.
	* sysdeps/wordsize-32/inttypes.h: Add definition of strtoimax and
	strtoumax plus needed declarations.

	* sysdeps/generic/confname.h (_SC_AIO_LISTIO_MAX): Fix typo.

1997-10-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* locale/programs/locfile.c (locfile_read): Correct while loop.

	* db2/makedb.c (main): Add missing parameter for error output.
	(process_input): Likewise.

	* resolv/gethnamaddr.c (getanswer): Rewrite a bit to avoid warning.

1997-10-12 05:05  Ulrich Drepper  <drepper@cygnus.com>

	* libc-map: Add __bzero, __mempcpy.

1997-10-10 18:51  David S. Miller  <davem@tanya.rutgers.edu>

	* sysdeps/unix/sysv/linux/sparc/bits/ioctls.h: Remove dependencies
	on kernel_termios.h

1997-10-09  10:24  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>

	Add the changes from the Solaris 2.6 header files, use the new public
	defines/functions.
	* nis/nis_addmember.c: Updated.
	* nis/nis_checkpoint.c: Updated.
	* nis/nis_creategroup.c: updated.
	* nis/nis_destroygroup.c: Updated.
	* nis/nis_getservlist.c: Updated.
	* nis/nis_ismember.c: Updated.
	* nis/nis_lookup.c: Updated.
	* nis/nis_modify.c: Updated.
	* nis/nis_ping.c: Updated.
	* nis/nis_print.c: Updated.
	* nis/nis_print_group_entry.c: Updated.
	* nis/nis_remove.c: Updated.
	* nis/nis_removemember.c: Updated.
	* nis/nis_xdr.c: Updated.
	* nis/nss_nisplus/nisplus-alias.c: Updated.
	* nis/nss_nisplus/nisplus-ethers.c: Updated.
	* nis/nss_nisplus/nisplus-hosts.c: Updated.
	* nis/nss_nisplus/nisplus-network.c: Updated.
	* nis/nss_nisplus/nisplus-parser.c: Updated.
	* nis/nss_nisplus/nisplus-proto.c: Updated.
	* nis/nss_nisplus/nisplus-rpc.c: Updated.
	* nis/nss_nisplus/nisplus-service.c: Updated.
	* nis/rpcsvc/nis.h: Updated.
	* nis/rpcsvc/nis.x: Updated.
	* nis/rpcsvc/nis_object.x: Updated.
	* nis/rpcsvc/nis_tags.h: Updated.
	* nis/rpcsvc/nislib.h: Updated.

	* nis/lckcache.c: Removed, since Sun has dropped the directory
	signatures.  The old cache version is now a security risk and not
	longer supported by Sun.
	* nis/nis_cache.c: Likewise.
	* nis/rpcsvc/nis_cache.h: Likewise.
	* nis/rpcsvc/nis_cache.x: Likewise.

	* nis/nis_call.c: Remove calls to the cache functions.

	* nis/libnsl.map: Remove cache and depending functions.
	* nis/nis_intern.h: Likewise.

	* nis/nis_add.c: Remove #include <rpcsvc/nislib.h>.
	* nis/nis_domain_of.c: Likewise.
	* nis/nis_domain_of_r.c: Likewise.
	* nis/nis_error.c: Likewise.
	* nis/nis_file.c: Likewise.
	* nis/nis_local_names.c: Likewise.
	* nis/nis_mkdir.c: Likewise.
	* nis/nis_rmdir.c: Likewise.
	* nis/nis_subr.c: Likewise.
	* nis/nis_verifygroup.c: Likewise.

	* nis/nis_clone.c: Removed, replaced by ...
	* nis/nis_clone_dir.c: New.
	* nis/nis_clone_obj.c: New.
	* nis/nis_clone_res.c: New.
	* nis/nis_table.c: Fixed bugs shown through the new clone functions.

	* nis/nis_defaults.c: Fixed a lot of race conditions.

	* nis/nis_free.c: Rewritten.

	* sunrpc/auth_des.c: Fix use of free'ed pointer.

	* nis/Makefile (libnsl-routines): Remove nis_clone, nis_cache and
	lckcache.  Add nis_clone_dir, nis_clone_obj, and nis_clone_res.

1997-10-09  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* wctype/test_wctype.c (TEST): Add parens to avoid ambiguity.

1997-10-08  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* include/features.h: Don't crash if _XOPEN_SOURCE is defined to
	be empty.

1997-10-09 05:54  Ulrich Drepper  <drepper@cygnus.com>

	* nss/digits_dots.c: Place `result' in resbuf and not in `buffer'.
	* nss/getXXbyYY_r.c: Make sure digits_dots.c sees `resbuf' as
	struct and not a pointer.  Little optimizations.

1997-10-09 05:00  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/stub/getenv.c: Remove unused file.
	* sysdeps/stub/lxstat.c: Likewise.
	* sysdeps/stub/morecore.c: Likewise.
	* sysdeps/stub/putenv.c: Likewise.
	* sysdeps/stub/sbrk.c: Likewise.
	* sysdeps/stub/setenv.c: Likewise.
	* sysdeps/stub/sysd-stdio.c: Likewise.
	* sysdeps/stub/sysdep.h: Likewise.
	Reported by Zack Weinberg <zack@rabi.phys.columbia.edu>.

1997-10-09 04:58  Ulrich Drepper  <drepper@cygnus.com>

	* configure.in: Add __bzero definition to DWARF2 unwind test.
	Reported by David S. Miller <davem@caip.rutgers.edu>.

1997-10-07  Paul Eggert  <eggert@twinsun.com>

	* intl/loadmsgcat.c (_nl_load_domain):
	Fix &&/|| typo when checking file size.
	Check for overflow when stuffing off_t into size_t.

1997-10-07 18:11  Ulrich Drepper  <drepper@cygnus.com>

	* time/africa: Update from tzdata1997i.

1997-10-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* posix/globtest.sh: Add arguments for name of dynamic linker and
	call dynamic linker to execute globtest.

	* posix/Makefile (tests): Supply arguments to globtest.sh.

1997-10-07  Andreas Jaeger  <aj@arthur.rhein-neckar.de>

	* nis/rpcsvc/ypupd.h: Add missing __END_DECLS.

1997-10-03  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* libc.map: Add mempcpy, prctl.

1997-09-30  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/generic/memcmp.c: Avoid warnings.
	* sysdeps/generic/memset.c: Likewise.
	* sysdeps/generic/strchr.c: Likewise.
	* sysdeps/generic/strlen.c: Likewise.

1997-09-29  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* malloc/Makefile ($(objpfx)mtrace): Fix typo.

1997-09-29  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/dl-machine.h (elf_machine_rela): Fix last change.
	The R_68K_GLOB_DAT and R_68K_JMP_SLOT relocations really ignore
	the addend, Richard.
	(elf_machine_fixup_plt): Don't add the addend.
	(elf_machine_plt_value): New function.

	* sysdeps/alpha/dl-machine.h (elf_machine_plt_value): New
	function.
	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_plt_value): New
	function.
	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_plt_value): New
	function.
	* sysdeps/powerpc/dl-machine.h (elf_machine_plt_value): New
	function.
	* sysdeps/i386/dl-machine.h (elf_machine_plt_value): New
	function.

	* elf/dl-runtime.c (fixup, profile_fixup): Don't add in the
	addend, instead let the machine dependent setup decide.

1997-09-20  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* sysdeps/m68k/m68020/bits/string.h: New file.

1997-10-07 04:27  Richard Henderson  <rth@cygnus.com>

	* Makeconfig (+includes): Add -I$(objpfx).

	* stdlib/longlong.h [__sparc__]: Prototype __udiv_qrnnd.

	* sysdeps/alpha/setjmp.S: __setjmp is the same as _setjmp.  Make
	the former a strong symbol and the later a weak alias.
	* sysdeps/sparc/sparc32/setjmp.S: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S: Likewise.

1997-10-06 21:01  David S. Miller  <davem@tanya.rutgers.edu>

	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Make ino_t
	64-bits.
	* sysdeps/unix/sysv/linux/sparc/sparc64/kernel_stat.h: Make st_ino
	member 64-bits as well, to match the kernel.

1997-10-06 19:35  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/sparc/sparc64/sub_n.S: Fix typo.
	Patch by Jakub Jelinek <jj@sunsite.ms.mff.cuni.cz>.

1997-10-06 01:09  Zack Weinberg  <zack@rabi.phys.columbia.edu>

	* time/README: Correct list of files from tzcode package.  Add
	contact information for tzcode/tzdata maintainers.  Correct
	spelling of author's name.  Compact lists.

1997-10-06 01:48  Ulrich Drepper  <drepper@cygnus.com>

	* malloc/malloc.h: Remove hook definition without caller argument.
	* malloc/malloc.c: Likewise.

	* string/tester.c: Correct strsep test.

	* string/bits/string2.h: Define __string2_1bptr_p and use it.
	Patch by David S. Miller <davem@tanya.rutgers.edu>.

	* math/Makefile (routines): Add s_clog10.
	* math/libm-test.c: Add test for clog10.
	* math/libm.map: Add clog10{,f,l}.
	* math/bits/cmathcalls.h [__USE_GNU]: Add clog10.
	* sysdeps/libm-ieee754/s_clog10.c: New file.
	* sysdeps/libm-ieee754/s_clog10f.c: New file.
	* sysdeps/libm-ieee754/s_clog10l.c: New file.
	* manual/math.texi: Describe clog10.

	* config.h.in: Add USE_REGPARMS and define internal_function based on
	this.
	* configure.in: Define USE_REGPARMS for ix86 machines.
	* gmon/gmon.c: Mark write_hist, write_call_graph and write_bb_counts
	as internal functions.
	* inet/getnameinfo.c: Likewise for  nrl_domainname.
	* inet/getnetgrent_r.c: Likewise for __internal_setnetgrent_reuse.
	* inet/rcmd.c: Likewise for __icheckhost.
	* intl/dcgettext.c: Likewise for category_to_name and
	guess_category_value.
	* intl/localealias.c: Likewise for read_alias_file.
	* io/fts.c: Likewise for fts_alloc, fts_build, fts_lfree,
	fts_maxarglen, fts_padjust, fts_palloc, fts_sort, and fts_stat.
	* libio/genops.c: Likewise for save_for_backup.
	* malloc/malloc.c (chunk_free, chunk_alloc, chunk_realloc, chunk_align,
	main_trim, heap_trim): Likewise.
	* malloc/mtrace.c (tr_where): Likewise.
	* misc/fstab.c (mnt2fs): Likewise.
	* misc/getttyent.c (skip, value): Likewise.
	* misc/syslog.c (openlog_internal): Likewise.
	* misc/tsearch.c (trecurse, tdestroy_internal): Likewise.
	* nss/nsswitch.c (nss_lookup_function, nss_parse_file, nss_getline,
	nss_parse_service_list, nss_new_service): Likewise.
	* posix/wordexp.c (parse_dollars, parse_backtick, eval_expr): Likewise.
	* resolv/inet_ntop.c (inet_ntop4, inet_ntop6): Likewise.
	* resolv/inet_pton.c (inet_pton4, inet_pton6): Likewise.
	* resolv/res_init.c (res_setoptions): Likewise.
	* stdio-common/printf_fp.c (group_number): Likewise.
	* stdio-common/vfprintf.c (buffered_vfprintf, group_number): Likewise.
	* stdlib/fmtmsg.c (internal_addseverity): Likewise.
	* sunrpc/auth_des.c (synchronize): Likewise.
	* sunrpc/auth_unix.c (marshal_new_auth): Likewise.
	* sunrpc/clnt_perr.c (auth_errmsg): Likewise.
	* sunrpc/key_call.c (key_call): Likewise.
	* sunprc/pmap_rmt.c (getbroadcastnets): Likewise.
	* sunrpc/svc_tcp.c (makefd_xprt): Likewise.
	* sunrpc/svcauth_des.c (cache_init, cache_spot, cache_ref, invalidate):
	Likewise.
	* sunrpc/xdr_rec.c (fix_buf_size, skip_input_bytes, flush_out,
	set_input_fragment, get_input_bytes): Likewise.
	* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path,
	phys_pages_info): Likewise.
	* sysdeps/unix/sysv/linux/if_index.c (opensock): Likewise.
	* sysdeps/unix/sysv/linux/poll.c (__emulate_poll): Likewise.
	* sysdeps/unix/sysv/linux/readv.c (__atomic_readv_replacement):
	Likewise.
	* sysdeps/unix/sysv/linux/readv.c (__atomic_writev_replacement):
	Likewise.
	* time/strptime.c (strptime_internal): Likewise.
	* time/tzfile.c (find_transition, compute_tzname_max): Likewise.
	* time/tzset.c (compute_change, tz_compute, tzset_internal): Likewise.

	* libc.map: Remove _libio_using_thunks, add _fp_hw and _dl_addr.

	* ctype/ctype.h: Pretty print.
	* grp/grp.h: Likewise.
	* include/libc-symbols.h: Likewise.
	* include/limits.h: Likewise.
	* include/values.h: Likewise.
	* io/fcntl.h: Likewise.
	* io/sys/stat.h: Likewise.
	* libio/stdio.h: Likewise.
	* malloc/malloc.h: Likewise.
	* misc/err.h: Likewise.
	* misc/regexp.h: Likewise.
	* misc/sys/cdefs.h: Likewise.
	* misc/sys/file.h: Likewise.
	* posix/sys/utsname.h: Likewise.
	* posix/sys/wait.h: Likewise.
	* pwd/pwd.h: Likewise.
	* resolv/netdb.h: Likewise.
	* signal/signal.h: Likewise.
	* stdlib/stdlib.h: Likewise.
	* string/endian.h: Likewise.
	* string/memory.h: Likewise.
	* sysdeps/mach/hurd/bits/fcntl.h: Likewise.
	* sysdeps/mach/hurd/sys/param.h: Likewise.
	* sysdeps/unix/sysv/linux/sys/param.h: Likewise.
	* termios/termios.h: Likewise.
	* wcsmbs/wchar.h: Likewise.
	* wctype/wctype.h: Likewise.

	* sysdeps/unix/bsd/bsd4.4/wait3.c: Use __WAIT_STATUS in definition.

	Implement Large File Support API.
	* include/features.h: Add suuport for _LARGEFILE_SOURCE,
	_LARGEFILE64_SOURCE, and _FILE_OFFSET_BITS.
	* libc.map: Add new functions for LFS.
	* dirent/Makefile (routines): Add readdir64 and readdir64_r.
	* dirent/dirent.h: Update readdir prototype for LFS and add new
	prototypes for above functions.
	* io/Makefile (routines): Add xstat64, fxstat64, lxstat64,
	statfs64, fstatfs64, lstat64, open64, lseek64, creat64, and ftw64.
	* io/creat64.c: New file.
	* io/fstat64.c: New file.
	* io/lstat64.c: New file.
	* io/stat64.c: New file.
	* io/ftw64.c: New file.
	* io/ftw.c: Rewrite to allow easy definition of ftw64.
	* io/ftw.h: Add LFS interface.
	* io/fcntl.h: Likewise.
	* io/sys/stat.h: Likewise.
	* io/sys/statfs.h: Likewise.
	* libio/Makefile (routines): Add iofgetpos64, iofopen64, iofsetpos64,
	freopen64, fseeko64, and ftello64.
	* libcio/fseeko64.c: New file.
	* libio/ftello64.c: New file.
	* libio/iofgetpos64.c: New file.
	* libio/iofopen64.c: New file.
	* libio/iofsetpos64.c: New file.
	* libio/fileops.c (_IO_file_fopen): Change to use _IO_off64_t.
	(_IO_file_attach): Likewise.
	(_IO_do_write): Likewise.
	(_IO_file_sync): Likewise.
	(_IO_file_seek): Likewise.
	(_IO_file_seekoff): Likewise.  Use _G_stat64.
	(_IO_file_fopen64): New function.
	(_IO_file_jumps): Initialize showmanyc and imbue.
	* libio/genops.c (_IO_default_seekpos): Change to use _IO_fpos64_t.
	(_IO_default_seekoff): Likewise.
	(_IO_default_seek): Likewise.
	(_IO_default_showmanyc, _IO_default_imbue): New functions.
	* libio/iofopncook.c (_IO_cookie_seek): Change to use _IO_off64_t.
	* libio/iolibio.h: Add prototypes for LFS functions.
	* libio/ioseekoff.c: Change to use _IO_fpos64_t.
	* libio/ioseekpos.c: Likewise.
	* libio/libio.h: Define _IO_fpos64_t and _IO_off64_t.
	(_IO_FILE): Move _offset field to end and change type to _IO_off64_t.
	(_IO_seekoff, _IO_seekpos): Change prototype.
	* libio/libioP.h (_IO_seekoff_t, _IO_seekpos_t, _IO_seek_t): Change
	to use _IO_off64_t.
	Change prototypes for function from the *ops.c files.
	* libio/stdio.h: Add LFS interface definition.
	* libio/strops.c (_IO_str_seekoff): Change to use _IO_fpos64_t.
	* posix/Makefile (routines): Add pread64 and pwrite64.
	* posix/confstr.c: Handle _CS_LFS* requests.
	* posix/getconf.c: Handle LFS* requests.
	* sysdeps/generic/confname.h: Add _CS_LFS* constants.
	* posix/unistd.h: Document _LFS64_LARGEFILE and _LFS64_STDIO.
	Define off_t and off64_t appropriately.  Change prototypes of
	LFS functions.
	* posix/sys/types.h: Add LFS types.
	* resources/Makefile (routines): Add getrlimit64 and setlimit64.
	* resource/sys/resource.h: Change prototypes of LFS functions.
	* stdio-common/Makefile (routines): Add tmpfile64.
	* stdio-common/tmpfile64.c: New file.
	* sysdeps/generic/_G_config.h: Define _G_fpos64_t and _G_off64_t.
	Define _G_OPEN64, _G_LSEEK64, _G_FSTAT64.
	* sysdeps/unix/sysv/linux/_G_config.h: Likewise.
	* sysdeps/generic/bits/resource.h: Add LFS definitions.
	* sysdeps/unix/bsd/sun/sunos4/bits/resource.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/resource.h: Likewise.
	* sysdeps/generic/statfs.h: Use __fsblkcnt_t for some of the fields.
	* sysdeps/unix/sysv/linux/bits/statfs.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/statfs.h: Likewise.
	* sysdeps/generic/types.h: Define LFS types.
	* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h: Likewise.
	* sysdeps/generic/sys/mman.h: Add LFS definitions.
	* sysdeps/unix/sysv/linux/sys/mman.h: Likewise.
	* sysdeps/generic/mach/hurd/bits/fcntl.h: Add flock LFS extensions.
	* sysdeps/unix/bsd/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/fcntl.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise.
	* sysdeps/generic/mach/hurd/bits/stat.h: Add stat LFS extensions.
	* sysdeps/unix/bsd/bits/stat.h: Likewise.
	* sysdeps/unix/bsd/osf/alpha/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/alpha/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/sysv4/i386/bits/stat.h: Likewise.
	* sysdeps/unix/sysv/sysv4/solaris2/bits/stat.h: Likewise.
	* sysdeps/posix/open64.c: New file.
	* sysdeps/stub/fstatfs64.c: New file.
	* sysdeps/stub/fxstat64.c: New file.
	* sysdeps/stub/getrlimit64.c: New file.
	* sysdeps/stub/lseek64.c: New file.
	* sysdeps/stub/lxstat64.c: New file.
	* sysdeps/stub/open64.c: New file.
	* sysdeps/stub/pread64.c: New file.
	* sysdeps/stub/pwrite64.c: New file.
	* sysdeps/stub/readdir64.c: New file.
	* sysdeps/stub/readdir64_r.c: New file.
	* sysdeps/stub/setrlimit64.c: New file.
	* sysdeps/stub/statfs64.c: New file.
	* sysdeps/stub/xstat64.c: New file.
	* sysdeps/unix/sysv/linux/llseek.c: Define as __llseek and make
	llseek and lseek64 weak aliases.
	* sysdeps/unix/sysv/linux/lseek64.c: New file.  Empty.
	* sysdeps/unix/sysv/linux/alpha/bits/dirent.h: New file.
	* sysdeps/unix/sysv/linux/bits/dirent.h: Add LFS definitions.

	* sysdeps/posix/tempname.c: Add extra argument to trigger use of
	open64.
	* sysdeps/stub/tempname.c: Likewise.
	* stdio-common/tempnam.c: Call __stdio_gen_tempname with extra
	argument.
	* stdio-common/tmpfile.c: Likewise.
	* stdio-common/tmpnam.c: Likewise.
	* stdio-common/tmpnam_r.c: Likewise.

	* libio/libioP.h: Add definition ofr showmanyc and imbue callbacks.
	* libio/fileops.c (_IO_file_jumps): Initialize showmanyc and imbue.
	* libio/iofopncook.c (_IO_cookie_jumps): Likewise.
	* libio/iopopen.c (_IO_proc_jumps): Likewise.
	* libio/memstream.c (_IO_mem_jumps): Likewise.
	* libio/obprintf.c (_IO_obstack_jumps): Likewise.
	* libio/vsnprintf.c (_IO_strn_jumps): Likewise.
	* libio/strops.c (_IO_str_jumps): Likewise.

	* manual/arith.texi: Add a few words why cabs should be used.
	* manual/llio.texi: Describe sync, fsync, fdatasync.
	Tell about cleanup handlers & fcntl,lseek,write,read,close,open.
	* manual/process.texi: Tell about cleanup handlers & system,waitpid,
	wait.
	* manual/signal.texi: Likewise for pause.
	* manual/terminal.texi: Likewise for tcdrain.
	* manual/time.texi: Document nanosleep.

	* posix/exevp.c: Don't use nested function.

	* stdlib/ucontext.h: New file.
	* sysdeps/i386/sys/ucontext.h: New file.  SysV/i386 API definitions.

	* sunrpc/xcrypt.c (hexval): Make a macro for efficiency.

	* sysdeps/i386/setjmp.h: Make `here` label local.

	* sysdeps/i386/elf/start.S: Define _fp_hw "variable".

	* sysdeps/stub/fstatfs.c: Correct warning.
	* sysdeps/stub/fxstat.c: Likewise.
	* sysdeps/stub/lxstat.c: Likewise.

	* sysdeps/unix/sysv/i386/i686/time.S: New file.

1997-10-03 20:56  Jason Merrill  <jason@yorick.cygnus.com>

	* malloc/obstack.h (obstack_empty_p): New macro.

1997-10-04 17:41  Philip Blundell  <Philip.Blundell@pobox.com>

	* inet/getnameinfo.c (getnameinfo): Remove spurious `#if INET6'.

1997-09-30  Zack Weinberg <zack@rabi.phys.columbia.edu>

	* maint.texi: Add copyright terms for libdb (Sleepycat, Harvard).
	Document new --with-binutils switch; delete reference to
	--with-gnu-as, --with-gnu-ld, --with-gnu-binutils.
	Add to description of --without-fp: a kernel FPU emulator
	is adequate (from FAQ)
	* INSTALL: Regenerated.

1997-09-30 17:29  Richard Henderson  <rth@cygnus.com>

	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Move
	_dl_hwcap declaration to ...
	(elf_machine_fixup_plt): ... here.
1997-10-12 04:05:44 +00:00

1612 lines
32 KiB
C

/* POSIX.2 wordexp implementation.
Copyright (C) 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Tim Waugh <tim@cyberelk.demon.co.uk>.
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 <wordexp.h>
#include <signal.h>
#include <stdlib.h>
#include <pwd.h>
#include <sys/types.h>
#include <string.h>
#include <glob.h>
#include <ctype.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <paths.h>
#include <errno.h>
#include <sys/param.h>
#include <stdio.h>
#include <assert.h>
/*
* This is a recursive-descent-style word expansion routine.
*/
/* Some forward declarations */
static int parse_dollars (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags,
wordexp_t *pwordexp)
internal_function;
static int parse_backtick (char **word, size_t *word_length,
size_t *max_length, const char *words,
size_t *offset, int flags, wordexp_t *pwordexp)
internal_function;
static int eval_expr (char *expr, int *result) internal_function;
/* The w_*() functions manipulate word lists. */
#define W_CHUNK (100)
static inline char *
w_addchar (char *buffer, size_t *actlen, size_t *maxlen, char ch)
/* (lengths exclude trailing zero) */
{
/* Add a character to the buffer, allocating room for it if needed.
*/
if (*actlen == *maxlen)
{
char *old_buffer = buffer;
assert (buffer == NULL || *maxlen != 0);
*maxlen += W_CHUNK;
buffer = realloc (buffer, 1 + *maxlen);
if (buffer == NULL)
free (old_buffer);
}
if (buffer != NULL)
{
buffer[*actlen] = ch;
buffer[++(*actlen)] = '\0';
}
return buffer;
}
static char *
w_addstr (char *buffer, size_t *actlen, size_t *maxlen, const char *str)
/* (lengths exclude trailing zero) */
{
/* Add a string to the buffer, allocating room for it if needed.
*/
size_t len;
assert (str != NULL); /* w_addstr only called from this file */
len = strlen (str);
if (*actlen + len > *maxlen)
{
char *old_buffer = buffer;
assert (buffer == NULL || *maxlen != 0);
*maxlen += MAX (2 * len, W_CHUNK);
buffer = realloc (old_buffer, 1 + *maxlen);
if (buffer == NULL)
free (old_buffer);
}
if (buffer != NULL)
{
memcpy (&buffer[*actlen], str, len);
*actlen += len;
buffer[*actlen] = '\0';
}
return buffer;
}
static int
w_addword (wordexp_t *pwordexp, char *word)
{
/* Add a word to the wordlist */
size_t num_p;
num_p = 2 + pwordexp->we_wordc + pwordexp->we_offs;
pwordexp->we_wordv = realloc (pwordexp->we_wordv, sizeof (char *) * num_p);
if (pwordexp->we_wordv != NULL)
{
pwordexp->we_wordv[pwordexp->we_wordc++] = word;
pwordexp->we_wordv[pwordexp->we_wordc] = NULL;
return 0;
}
return WRDE_NOSPACE;
}
/* The parse_*() functions should leave *offset being the offset in 'words'
* to the last character processed.
*/
static int
internal_function
parse_backslash (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset)
{
/* We are poised _at_ a backslash, not in quotes */
switch (words[1 + *offset])
{
case 0:
/* Backslash is last character of input words */
return WRDE_SYNTAX;
case '\n':
(*offset)++;
break;
default:
*word = w_addchar (*word, word_length, max_length, words[1 + *offset]);
if (*word == NULL)
return WRDE_NOSPACE;
(*offset)++;
break;
}
return 0;
}
static int
internal_function
parse_qtd_backslash (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset)
{
/* We are poised _at_ a backslash, inside quotes */
switch (words[1 + *offset])
{
case 0:
/* Backslash is last character of input words */
return WRDE_SYNTAX;
case '\n':
++(*offset);
break;
case '$':
case '`':
case '"':
case '\\':
*word = w_addchar (*word, word_length, max_length, words[1 + *offset]);
if (*word == NULL)
return WRDE_NOSPACE;
++(*offset);
break;
default:
*word = w_addchar (*word, word_length, max_length, words[*offset]);
if (*word != NULL)
*word = w_addchar (*word, word_length, max_length, words[1 + *offset]);
if (*word == NULL)
return WRDE_NOSPACE;
++(*offset);
break;
}
return 0;
}
static int
internal_function
parse_tilde (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, size_t wordc)
{
/* We are poised _at_ a tilde */
size_t i;
if (*word_length != 0)
{
if (!((*word)[*word_length - 1] == '=' && wordc == 0))
{
if (!((*word)[*word_length - 1] == ':' &&
strchr (*word, '=') && wordc == 0))
{
*word = w_addchar (*word, word_length, max_length, '~');
return *word ? 0 : WRDE_NOSPACE;
}
}
}
for (i = 1 + *offset; words[i]; i++)
{
if (words[i] == ':' || words[i] == '/' || words[i] == ' ' ||
words[i] == '\t' || words[i] == 0 )
break;
if (words[i] == '\\')
{
*word = w_addchar (*word, word_length, max_length, '~');
return *word ? 0 : WRDE_NOSPACE;
}
}
if (i == 1 + *offset)
{
/* Tilde appears on its own */
uid_t uid;
struct passwd pwd, *tpwd;
int buflen = 1000;
char* buffer = __alloca (buflen);
int result;
uid = getuid ();
while ((result = __getpwuid_r (uid, &pwd, buffer, buflen, &tpwd)) != 0
&& errno == ERANGE)
{
buflen += 1000;
buffer = __alloca (buflen);
}
if (result == 0 && pwd.pw_dir != NULL)
{
*word = w_addstr (*word, word_length, max_length, pwd.pw_dir);
if (*word == NULL)
return WRDE_NOSPACE;
}
else
{
*word = w_addchar (*word, word_length, max_length, '~');
if (*word == NULL)
return WRDE_NOSPACE;
}
}
else
{
/* Look up user name in database to get home directory */
char *user = __strndup (&words[1 + *offset], i - *offset);
struct passwd pwd, *tpwd;
int buflen = 1000;
char* buffer = __alloca (buflen);
int result;
while ((result = __getpwnam_r (user, &pwd, buffer, buflen, &tpwd)) != 0
&& errno == ERANGE)
{
buflen += 1000;
buffer = __alloca (buflen);
}
if (result == 0 && pwd.pw_dir)
*word = w_addstr (*word, word_length, max_length, pwd.pw_dir);
else
{
/* (invalid login name) */
*word = w_addchar (*word, word_length, max_length, '~');
if (*word != NULL)
*word = w_addstr (*word, word_length, max_length, user);
}
*offset = i - 1;
}
return *word ? 0 : WRDE_NOSPACE;
}
static int
internal_function
parse_glob (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags,
wordexp_t *pwordexp, char *ifs)
{
/* We are poised just after a '*' or a '{'. */
int error;
glob_t globbuf;
int match;
char *matching_word;
for (; words[*offset]; (*offset)++)
switch (words[*offset])
{
case ' ':
case '\t':
break;
case '$':
error = parse_dollars (word, word_length, max_length, words, offset,
flags, pwordexp);
if (error)
return error;
continue;
default:
if (ifs == NULL || strchr (ifs, words[*offset]) == NULL)
{
*word = w_addchar (*word, word_length, max_length, words[*offset]);
if (*word == NULL)
return WRDE_NOSPACE;
continue;
}
break;
}
error = glob (*word, GLOB_NOCHECK, NULL, &globbuf);
if (error != 0)
{
/* We can only run into memory problems. */
assert (error == GLOB_NOSPACE);
return WRDE_NOSPACE;
}
if (ifs && !*ifs)
{
/* No field splitting allowed */
*word_length = strlen (globbuf.gl_pathv[0]);
*word = realloc (*word, 1 + *word_length);
if (*word == NULL)
goto no_space;
strcpy (*word, globbuf.gl_pathv[0]);
for (match = 1; match < globbuf.gl_pathc && *word != NULL; ++match)
{
*word = w_addchar (*word, word_length, max_length, ' ');
if (*word != NULL)
*word = w_addstr (*word, word_length, max_length,
globbuf.gl_pathv[match]);
}
/* Re-parse white space on return */
globfree (&globbuf);
--(*offset);
return *word ? 0 : WRDE_NOSPACE;
}
/* here ifs != "" */
free (*word);
*word = NULL;
*word_length = 0;
matching_word = malloc (1 + strlen (globbuf.gl_pathv[0]));
if (matching_word == NULL)
goto no_space;
strcpy (matching_word, globbuf.gl_pathv[0]);
if (w_addword (pwordexp, matching_word) == WRDE_NOSPACE)
goto no_space;
for (match = 1; match < globbuf.gl_pathc; ++match)
{
matching_word = __strdup (globbuf.gl_pathv[match]);
if (matching_word == NULL)
goto no_space;
if (w_addword (pwordexp, matching_word) == WRDE_NOSPACE)
goto no_space;
}
globfree (&globbuf);
/* Re-parse white space on return */
--(*offset);
return 0;
no_space:
globfree (&globbuf);
return WRDE_NOSPACE;
}
static int
parse_squote (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset)
{
/* We are poised just after a single quote */
for (; words[*offset]; ++(*offset))
{
if (words[*offset] != '\'')
{
*word = w_addchar (*word, word_length, max_length, words[*offset]);
if (*word == NULL)
return WRDE_NOSPACE;
}
else return 0;
}
/* Unterminated string */
return WRDE_SYNTAX;
}
/* Functions to evaluate an arithmetic expression */
static int
internal_function
eval_expr_val (char **expr, int *result)
{
int sgn = +1;
char *digit;
/* Skip white space */
for (digit = *expr; digit && *digit && isspace (*digit); ++digit);
switch (*digit)
{
case '(':
/* Scan for closing paren */
for (++digit; **expr && **expr != ')'; ++(*expr));
/* Is there one? */
if (!**expr)
return WRDE_SYNTAX;
*(*expr)++ = 0;
if (eval_expr (digit, result))
return WRDE_SYNTAX;
return 0;
case '+': /* Positive value */
++digit;
break;
case '-': /* Negative value */
++digit;
sgn = -1;
break;
default:
if (!isdigit (*digit))
return WRDE_SYNTAX;
}
*result = 0;
for (; *digit && isdigit (*digit); ++digit)
*result = (*result * 10) + (*digit - '0');
*expr = digit;
*result *= sgn;
return 0;
}
static int
internal_function
eval_expr_multdiv (char **expr, int *result)
{
int arg;
/* Read a Value */
if (eval_expr_val (expr, result))
return WRDE_SYNTAX;
while (**expr)
{
/* Skip white space */
for (; *expr && **expr && isspace (**expr); ++(*expr));
if (**expr == '*')
{
(*expr)++;
if ((eval_expr_val (expr, &arg)) != 0)
return WRDE_SYNTAX;
*result *= arg;
}
else if (**expr == '/')
{
(*expr)++;
if ((eval_expr_val (expr, &arg)) != 0)
return WRDE_SYNTAX;
*result /= arg;
}
else break;
}
return 0;
}
static int
internal_function
eval_expr (char *expr, int *result)
{
int arg;
/* Read a Multdiv */
if ((eval_expr_multdiv (&expr, result)) != 0)
return WRDE_SYNTAX;
while (*expr)
{
/* Skip white space */
for (; expr && *expr && isspace (*expr); ++expr);
if (*expr == '+')
{
expr++;
if ((eval_expr_multdiv (&expr, &arg)) != 0)
return WRDE_SYNTAX;
*result += arg;
}
else if (*expr == '-')
{
expr++;
if ((eval_expr_multdiv (&expr, &arg)) != 0)
return WRDE_SYNTAX;
*result -= arg;
}
else break;
}
return 0;
}
static int
internal_function
parse_arith (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags, int bracket)
{
/* We are poised just after "$((" or "$[" */
int error;
int paren_depth = 1;
size_t expr_length = 0;
size_t expr_maxlen = 0;
char *expr = NULL;
for (; words[*offset]; ++(*offset))
{
switch (words[*offset])
{
case '$':
error = parse_dollars (&expr, &expr_length, &expr_maxlen,
words, offset, flags, NULL);
/* The NULL here is to tell parse_dollars not to
* split the fields.
*/
if (error)
{
free (expr);
return error;
}
break;
case '`':
(*offset)++;
error = parse_backtick (&expr, &expr_length, &expr_maxlen,
words, offset, flags, NULL);
/* The NULL here is to tell parse_backtick not to
* split the fields.
*/
if (error)
{
free (expr);
return error;
}
break;
case '\\':
error = parse_qtd_backslash (&expr, &expr_length, &expr_maxlen,
words, offset);
if (error)
{
free (expr);
return error;
}
/* I think that a backslash within an
* arithmetic expansion is bound to
* cause an error sooner or later anyway though.
*/
break;
case ')':
if (--paren_depth == 0)
{
char *result;
int numresult = 0;
if (bracket || words[1 + *offset] != ')')
return WRDE_SYNTAX;
++(*offset);
/* Go - evaluate. */
if (*expr &&
eval_expr (expr, &numresult) != 0)
return WRDE_SYNTAX;
result = __alloca (100);
__snprintf (result, 100, "%d", numresult);
*word = w_addstr (*word, word_length, max_length, result);
free (expr);
return *word ? 0 : WRDE_NOSPACE;
}
expr = w_addchar (expr, &expr_length, &expr_maxlen, words[*offset]);
if (expr == NULL)
return WRDE_NOSPACE;
break;
case ']':
if (bracket && paren_depth == 1)
{
char *result;
int numresult = 0;
/* Go - evaluate. */
if (*expr && eval_expr (expr, &numresult) != 0)
return WRDE_SYNTAX;
result = __alloca (100);
__snprintf (result, 100, "%d", numresult);
*word = w_addstr (*word, word_length, max_length, result);
free (expr);
return *word ? 0 : WRDE_NOSPACE;
}
free (expr);
return WRDE_SYNTAX;
case '\n':
case ';':
case '{':
case '}':
free (expr);
return WRDE_BADCHAR;
case '(':
++paren_depth;
default:
expr = w_addchar (expr, &expr_length, &expr_maxlen, words[*offset]);
if (expr == NULL)
return WRDE_NOSPACE;
}
}
/* Premature end */
free (expr);
return WRDE_SYNTAX;
}
/* Function to execute a command and retrieve the results */
/* pwordexp contains NULL if field-splitting is forbidden */
static int
internal_function
exec_comm (char *comm, char **word, size_t *word_length, size_t *max_length,
int flags, wordexp_t *pwordexp)
{
int fildes[2];
int bufsize = 128;
int buflen;
int state = 0;
int i;
char *buffer;
pid_t pid;
/* 'state' is:
* 0 until first non-(whitespace-ifs)
* 1 after a non-ifs
* 2 after non-(whitespace-ifs)
*/
/* Don't fork() unless necessary */
if (!comm || !*comm)
return 0;
if (pipe (fildes))
/* Bad */
return WRDE_NOSPACE;
if ((pid = fork ()) < 0)
{
/* Bad */
return WRDE_NOSPACE;
}
if (pid == 0)
{
/* Child */
/* Redirect input and output */
dup2 (fildes[1], 1);
/* Close stderr if we have to */
if ((flags & WRDE_SHOWERR) == 0)
close (2);
execl (_PATH_BSHELL, _PATH_BSHELL, "-c", comm, NULL);
/* Bad. What now? */
exit (1);
}
/* Parent */
close (fildes[1]);
buffer = __alloca (bufsize);
if (!pwordexp)
{ /* Quoted - no field splitting */
while (1)
{
if ((buflen = read (fildes[0], buffer, bufsize)) < 1)
{
if (waitpid (pid, NULL, WNOHANG) == 0)
continue;
if ((buflen = read (fildes[0], buffer, bufsize)) < 1)
break;
}
for (i = 0; i < buflen; ++i)
{
*word = w_addchar (*word, word_length, max_length, buffer[i]);
if (*word == NULL)
{
close (fildes[0]);
return WRDE_NOSPACE;
}
}
}
close (fildes[0]);
return 0;
}
/* Not quoted - split fields.
* NB. This isn't done properly yet.
*/
while (1)
{
if ((buflen = read (fildes[0], buffer, bufsize)) < 1)
{
if (waitpid (pid, NULL, WNOHANG) == 0)
continue;
if ((read (fildes[0], buffer, bufsize)) < 1)
break;
}
for (i = 0; i < buflen; ++i)
{
/* What if these aren't field separators? FIX */
if (buffer[i] == ' ' || buffer[i] == '\t' || buffer[i] == '\n')
{
if (state != 0)
state = 2;
continue;
}
if (state == 2)
{
/* End of word */
if (w_addword (pwordexp, *word) == WRDE_NOSPACE)
{
close (fildes[0]);
return WRDE_NOSPACE;
}
*word = NULL;
*word_length = 0;
}
state = 1;
*word = w_addchar (*word, word_length, max_length, buffer[i]);
if (*word == NULL)
{
close (fildes[0]);
return WRDE_NOSPACE;
}
}
}
close (fildes[0]);
return 0;
}
static int
parse_comm (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags, wordexp_t *pwordexp)
{
/* We are poised just after "$(" */
int paren_depth = 1;
int error;
size_t comm_length = 0;
size_t comm_maxlen = 0;
char *comm = NULL;
for (; words[*offset]; ++(*offset))
{
switch (words[*offset])
{
case ')':
if (--paren_depth == 0)
{
/* Go -- give script to the shell */
error = exec_comm (comm, word, word_length, max_length, flags,
pwordexp);
free (comm);
return error;
}
/* This is just part of the script */
comm = w_addchar (comm, &comm_length, &comm_maxlen, words[*offset]);
if (comm == NULL)
return WRDE_NOSPACE;
break;
case '(':
paren_depth++;
default:
comm = w_addchar (comm, &comm_length, &comm_maxlen, words[*offset]);
if (comm == NULL)
return WRDE_NOSPACE;
break;
}
}
/* Premature end */
free (comm);
return WRDE_SYNTAX;
}
static int
internal_function
parse_param (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags, wordexp_t *pwordexp)
{
/* We are poised just after "$" */
size_t start = *offset;
size_t env_length = 0;
size_t env_maxlen = 0;
size_t pat_length = 0;
size_t pat_maxlen = 0;
char *env = NULL;
char *pattern = NULL;
char *value;
char action = 0;
int prefix = 0;
int suffix = 0;
int colon_seen = 0;
int depth = 0;
int error;
for (; words[*offset]; ++(*offset))
{
switch (words[*offset])
{
case '{':
if (action || prefix || suffix)
{
++depth;
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
goto no_space;
break;
}
if (*offset == start)
break;
/* Otherwise evaluate */
/* (and re-parse this character) */
--(*offset);
goto envsubst;
case '}':
if (words[start] != '{')
{
--(*offset);
}
if (action || prefix || suffix)
{
if (--depth)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
goto no_space;
break;
}
}
/* Evaluate */
goto envsubst;
case '#':
case '%':
if (words[start] == '{')
{
/* At the start? (ie. 'string length') */
if (*offset == start + 1)
break;
/* Separating variable name from prefix pattern? */
if (words[*offset] == '#')
{
if (prefix < 2 && !suffix)
{
++prefix;
break;
}
}
else
{
if (suffix < 2 && !prefix)
{
++suffix;
break;
}
}
/* Must be part of prefix/suffix pattern. */
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
goto no_space;
break;
}
/* Otherwise evaluate */
/* (and re-parse this character) */
--(*offset);
goto envsubst;
case ':':
if (!*env)
{
free (env);
free (pattern);
return WRDE_SYNTAX;
}
if (action || prefix || suffix)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
goto no_space;
break;
}
if ((words[1 + *offset] == '-') || (words[1 + *offset] == '=') ||
(words[1 + *offset] == '?') || (words[1 + *offset] == '+'))
{
colon_seen = 1;
break;
}
free (env);
free (pattern);
return WRDE_SYNTAX;
case '-':
case '=':
case '?':
case '+':
if (!*env)
{
free (env);
free (pattern);
return WRDE_SYNTAX;
}
if (action || prefix || suffix)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
{
free (env);
return WRDE_NOSPACE;
}
break;
}
action = words[*offset];
break;
case '\\':
if (action || prefix || suffix)
{
error = parse_qtd_backslash (word, word_length, max_length,
words, offset);
if (error == 0)
break;
}
else
{
error = WRDE_SYNTAX;
}
free (env);
free (pattern);
return error;
default:
if (action || prefix || suffix)
{
pattern = w_addchar (pattern, &pat_length, &pat_maxlen,
words[*offset]);
if (pattern == NULL)
goto no_space;
break;
}
if ((words[start] == '{') || isalpha (words[*offset]))
{
env = w_addchar (env, &env_length, &env_maxlen, words[*offset]);
if (env == NULL)
goto no_space;
break;
}
--(*offset);
goto envsubst;
}
}
/* End of input string */
--(*offset);
envsubst:
if (words[start] == '{' && words[*offset] != '}')
{
free (env);
free (pattern);
return WRDE_SYNTAX;
}
if (!env || !*env)
{
*offset = start - 1;
*word = w_addchar (*word, word_length, max_length, '$');
free (env);
free (pattern);
return *word ? 0 : WRDE_NOSPACE;
}
value = getenv (env);
if (action || prefix || suffix)
{
switch (action)
{
case 0:
/* For the time being, pattern is ignored */
printf ("Pattern: %s\nPrefix: %d\nSuffix: %d\n", pattern, prefix, suffix);
break;
case '?':
if (value && *value)
break;
if (!colon_seen && value)
{
/* Substitute NULL */
free (env);
free (pattern);
return 0;
}
/* Error - exit */
fprintf (stderr, "%s: ", env);
if (*pattern)
{
/* Expand 'pattern' and write it to stderr */
wordexp_t we;
error = wordexp (pattern, &we, flags);
if (error == 0)
{
int i;
for (i = 0; i < we.we_wordc; ++i)
{
fprintf (stderr, "%s%s", i ? " " : "", we.we_wordv[i]);
}
fprintf (stderr, "\n");
error = WRDE_BADVAL;
}
wordfree (&we);
free (env);
free (pattern);
return error;
}
fprintf (stderr, "parameter null or not set\n");
free (env);
free (pattern);
return WRDE_BADVAL;
default:
printf ("warning: parameter substitution does not yet support \"%s%c\"\n", colon_seen?":":"", action);
}
}
free (env);
free (pattern);
if (value == NULL)
{
/* Variable not defined */
if (flags & WRDE_UNDEF)
return WRDE_SYNTAX;
return 0;
}
if (pwordexp == NULL)
/* Quoted - no field split */
*word = w_addstr (*word, word_length, max_length, value);
else
/* Should field-split here - FIX */
*word = w_addstr (*word, word_length, max_length, value);
return *word ? 0 : WRDE_NOSPACE;
no_space:
if (env)
free (env);
if (pattern)
free (pattern);
return WRDE_NOSPACE;
}
static int
internal_function
parse_dollars (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags,
wordexp_t *pwordexp)
{
/* We are poised _at_ "$" */
switch (words[1 + *offset])
{
case '"':
case '\'':
case 0:
*word = w_addchar (*word, word_length, max_length, '$');
return *word ? 0 : WRDE_NOSPACE;
case '(':
if (words[2 + *offset] == '(')
{
(*offset) += 3;
/* Call parse_arith -- 0 is for "no brackets" */
return parse_arith (word, word_length, max_length, words, offset,
flags, 0);
}
if (flags & WRDE_NOCMD)
return WRDE_CMDSUB;
(*offset) += 2;
return parse_comm (word, word_length, max_length, words, offset, flags,
pwordexp);
case '[':
(*offset) += 2;
/* Call parse_arith -- 1 is for "brackets" */
return parse_arith (word, word_length, max_length, words, offset, flags,
1);
case '{':
default:
++(*offset); /* parse_param needs to know if "{" is there */
return parse_param (word, word_length, max_length, words, offset, flags,
pwordexp);
}
}
static int
parse_backtick (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags,
wordexp_t *pwordexp)
{
/* We are poised just after "`" */
int error;
size_t comm_length = 0;
size_t comm_maxlen = 0;
char *comm = NULL;
int squoting = 0;
for (; words[*offset]; ++(*offset))
{
switch (words[*offset])
{
case '`':
/* Go -- give the script to the shell */
error = exec_comm (comm, word, word_length, max_length, flags,
pwordexp);
free (comm);
return error;
case '\\':
if (squoting)
{
error = parse_qtd_backslash (&comm, &comm_length, &comm_maxlen,
words, offset);
if (error)
{
free (comm);
return error;
}
break;
}
++(*offset);
error = parse_backslash (&comm, &comm_length, &comm_maxlen, words,
offset);
if (error)
{
free (comm);
return error;
}
break;
case '\'':
squoting = 1 - squoting;
default:
comm = w_addchar (comm, &comm_length, &comm_maxlen, words[*offset]);
if (comm == NULL)
return WRDE_NOSPACE;
}
}
/* Premature end */
free (comm);
return WRDE_SYNTAX;
}
static int
internal_function
parse_dquote (char **word, size_t *word_length, size_t *max_length,
const char *words, size_t *offset, int flags)
{
/* We are poised just after a double-quote */
int error;
for (; words[*offset]; ++(*offset))
{
switch (words[*offset])
{
case '"':
return 0;
case '$':
error = parse_dollars (word, word_length, max_length, words, offset,
flags, NULL);
/* The NULL here is to tell parse_dollars not to
* split the fields.
*/
if (error)
return error;
break;
case '`':
if (flags & WRDE_NOCMD)
return WRDE_CMDSUB;
++(*offset);
error = parse_backtick (word, word_length, max_length, words,
offset, flags, NULL);
/* The NULL here is to tell parse_backtick not to
* split the fields.
*/
if (error)
return error;
break;
case '\\':
error = parse_qtd_backslash (word, word_length, max_length, words,
offset);
if (error)
return error;
break;
default:
*word = w_addchar (*word, word_length, max_length, words[*offset]);
if (*word == NULL)
return WRDE_NOSPACE;
}
}
/* Unterminated string */
return WRDE_SYNTAX;
}
/*
* wordfree() is to be called after pwordexp is finished with.
*/
void
wordfree (wordexp_t *pwordexp)
{
/* wordexp can set pwordexp to NULL */
if (pwordexp && pwordexp->we_wordv)
{
char **wordv = pwordexp->we_wordv;
for (wordv += pwordexp->we_offs; *wordv; ++wordv)
free (*wordv);
free (pwordexp->we_wordv);
pwordexp->we_wordv = NULL;
}
}
/*
* wordexp()
*/
int
wordexp (const char *words, wordexp_t *pwordexp, int flags)
{
size_t wordv_offset;
size_t words_offset;
size_t word_length = 0;
size_t max_length = 0;
char *word = NULL;
int error;
char *ifs;
char ifs_white[4];
char **old_wordv = pwordexp->we_wordv;
size_t old_wordc = pwordexp->we_wordc;
if (flags & WRDE_REUSE)
/* Minimal implementation of WRDE_REUSE for now */
wordfree (pwordexp);
if (flags & WRDE_DOOFFS)
{
pwordexp->we_wordv = calloc (1 + pwordexp->we_offs, sizeof (char *));
if (pwordexp->we_wordv == NULL)
return WRDE_NOSPACE;
}
else
{
pwordexp->we_wordv = calloc (1, sizeof (char *));
if (pwordexp->we_wordv == NULL)
return WRDE_NOSPACE;
pwordexp->we_offs = 0;
}
if ((flags & WRDE_APPEND) == 0)
pwordexp->we_wordc = 0;
wordv_offset = pwordexp->we_offs + pwordexp->we_wordc;
/* Find out what the field separators are.
* There are two types: whitespace and non-whitespace.
*/
ifs = getenv ("IFS");
if (!ifs)
ifs = strcpy (ifs_white, " \t\n");
else
{
char *ifsch = ifs;
char *whch = ifs_white;
while (*ifsch != '\0')
if ((*ifsch == ' ') || (*ifsch == '\t') || (*ifsch == '\n'))
{
/* White space IFS. See first whether it is already in our
collection. */
char *runp = ifs_white;
while (runp < whch && *runp != '\0' && *runp != *ifsch)
++runp;
if (runp == whch)
*whch++ = *ifsch;
}
*whch = '\0';
}
for (words_offset = 0 ; words[words_offset] ; ++words_offset)
switch (words[words_offset])
{
case '\n':
case '|':
case '&':
case ';':
case '<':
case '>':
case '(':
case ')':
case '}':
/* Fail */
wordfree (pwordexp);
pwordexp->we_wordc = 0;
pwordexp->we_wordv = old_wordv;
return WRDE_BADCHAR;
case '\\':
error = parse_backslash (&word, &word_length, &max_length, words,
&words_offset);
if (error)
goto do_error;
break;
case '$':
error = parse_dollars (&word, &word_length, &max_length, words,
&words_offset, flags, pwordexp);
if (error)
goto do_error;
break;
case '`':
if (flags & WRDE_NOCMD)
return WRDE_CMDSUB;
++words_offset;
error = parse_backtick (&word, &word_length, &max_length, words,
&words_offset, flags, pwordexp);
if (error)
goto do_error;
break;
case '"':
++words_offset;
error = parse_dquote (&word, &word_length, &max_length, words,
&words_offset, flags);
if (error)
goto do_error;
break;
case '\'':
++words_offset;
error = parse_squote (&word, &word_length, &max_length, words,
&words_offset);
if (error)
goto do_error;
break;
case '~':
error = parse_tilde (&word, &word_length, &max_length, words,
&words_offset, pwordexp->we_wordc);
if (error)
goto do_error;
break;
case '*':
case '{':
error = parse_glob (&word, &word_length, &max_length, words,
&words_offset, flags, pwordexp, ifs);
if (error)
goto do_error;
break;
default:
/* Is it a field separator? */
if (strchr (ifs, words[words_offset]) == NULL)
{
/* "Ordinary" character -- add it to word */
word = w_addchar (word, &word_length, &max_length,
words[words_offset]);
if (word == NULL)
{
error = WRDE_NOSPACE;
goto do_error;
}
break;
}
/* Field separator */
if (strchr (ifs_white, words[words_offset]))
{
/* It's a whitespace IFS char. Ignore it at the beginning
of a line and ignore multiple instances. */
if (!word || !*word)
break;
if (w_addword (pwordexp, word) == WRDE_NOSPACE)
{
error = WRDE_NOSPACE;
goto do_error;
}
word = NULL;
word_length = 0;
break;
}
/* It's a non-whitespace IFS char */
/* Multiple non-whitespace IFS chars are treated as one;
* IS THIS CORRECT?
*/
if (word != NULL)
{
if (w_addword (pwordexp, word) == WRDE_NOSPACE)
{
error = WRDE_NOSPACE;
goto do_error;
}
}
word = NULL;
word_length = 0;
max_length = 0;
}
/* End of string */
/* There was a field separator at the end */
if (word == NULL)
return 0;
/* There was no field separator at the end */
return w_addword (pwordexp, word);
do_error:
/* Error:
free memory used, set we_wordc and wd_wordv back to what they were.
*/
if (word != NULL)
free (word);
wordfree (pwordexp);
pwordexp->we_wordv = old_wordv;
pwordexp->we_wordc = old_wordc;
return error;
}