diff options
| author | Roger A. Faulkner <Roger.Faulkner@Oracle.COM> | 2010-04-03 09:48:44 -0700 |
|---|---|---|
| committer | Roger A. Faulkner <Roger.Faulkner@Oracle.COM> | 2010-04-03 09:48:44 -0700 |
| commit | 3e14f97f673e8a630f076077de35afdd43dc1587 (patch) | |
| tree | 9828b6b676f58d7b27dd28e00202d3f3461a5cd8 | |
| parent | 4f60987df4dcaa54a88b596f861fbf4f3382c65e (diff) | |
| download | illumos-joyent-3e14f97f673e8a630f076077de35afdd43dc1587.tar.gz | |
6939349 RFE: Update ksh93 to ast-ksh.2010-03-09
6877392 ksh93 regresses 'uniq -c' performance
6887363 Korn shell 93 sometimes mishandles return value of its child process
6900314 (while true ; do true|true ; done) hang in ioctl() with SIGTTOU
6904557 wc no longer counts number of bytes correctly
6904575 cut -d with multibyte character no longer works
6904597 paste -d no longer works with multibyte characters
6904780 /usr/bin/cksum changed output in snv_128
6904870 uniq -s does not skip multibyte characters correctly
6904878 join -t no longer works with multibyte char separator
6907460 EXIT trap handlers are sometimes executed twice
6909579 libast getopt solaris compatibility broken
6920072 ksh93 tail -f, with unconditional .25s sleep and line parsing, about 37x slower than cat
6932124 mktemp in ksh93 is broken
Contributed by Olga Kryzhanovska <olga.kryzhanovska@gmail.com>
1788 files changed, 7693 insertions, 3941 deletions
diff --git a/usr/src/Makefile.ast b/usr/src/Makefile.ast index fe45dd7574..7b1f5aadbc 100644 --- a/usr/src/Makefile.ast +++ b/usr/src/Makefile.ast @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # Override this top level flag so the compiler builds in its native @@ -66,7 +65,7 @@ LIBSHELLCPPFLAGS = \ -DERROR_CONTEXT_T=Error_context_t \ '-DUSAGE_LICENSE=\ "[-author?David Korn <dgk@research.att.com>]"\ - "[-copyright?Copyright (c) 1982-2009 AT&T Intellectual Property]"\ + "[-copyright?Copyright (c) 1982-2010 AT&T Intellectual Property]"\ "[-license?http://www.opensource.org/licenses/cpl1.0.txt]"\ "[--catalog?libshell]"' diff --git a/usr/src/cmd/ksh/Makefile.testshell b/usr/src/cmd/ksh/Makefile.testshell index ef520d4d04..7c1c6d0492 100644 --- a/usr/src/cmd/ksh/Makefile.testshell +++ b/usr/src/cmd/ksh/Makefile.testshell @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -44,6 +43,14 @@ # This may be simply a different sort order or a bug in the test suite. # Currently under investigation. # +# - "glob.sh" may currently fail in some locales (e.g. en_US.UTF-8) with: +# -- snip -- +# glob.sh[157] glob -- expected '<d> <dd> <de> <Beware>', got '<Beware> <d> <dd> <de>' +# glob.sh[277] glob -- expected '<abc> <abe> <bdir> <ca> <de> <man> <Beware>', got '<abc> <abe> <bdir> <Beware> <ca> <de> <man>' +# -- snip -- +# This may be simply a different sort order or a bug in the test suite. +# Currently under investigation. +# # - These tests need a working system clock, otherwise they'll bite you. # # - The current list of locales was mainly composed to cover various encodings @@ -84,7 +91,8 @@ ON_KSH_TEST_LOCALES = \ # $ export ON_KSH_TEST_LIST=<value> # before $ make install # ON_KSH_TEST_LIST = $(TESTSRC)/*.sh -# Flag to control whether we should make test failures non-fatal +# Boolean (true/false) flag to control whether we should make test +# failures non-fatal ON_KSH_TEST_IGNORE_TESTFAILURE=false # We must wait for other things in this subdir to finish before running @@ -124,6 +132,7 @@ testshell: $(PROG) fi ; \ (for test_item in $(ON_KSH_TEST_LIST) ; do \ [[ "$${test_item}" == "$(TESTSRC)/builtins.sh" || \ + "$${test_item}" == "$(TESTSRC)/glob.sh" || \ "$${test_item}" == "$(TESTSRC)/options.sh" ]] || \ $(ON_KSH_TEST_IGNORE_TESTFAILURE) && \ set +o errexit ; \ @@ -149,7 +158,7 @@ testshell: $(PROG) SHELL="$${SHELL}" \ LANG="$${test_lang}" \ LC_ALL="$${test_lang}" \ - VMDEBUG=a \ + VMALLOC_OPTIONS=abort \ SHCOMP="$(ROOTBIN)/shcomp" \ "$${test_item}" \ ) 2>&1 | while read ; do \ diff --git a/usr/src/lib/libast/Makefile.com b/usr/src/lib/libast/Makefile.com index f6d8b384f0..a4e30d6989 100644 --- a/usr/src/lib/libast/Makefile.com +++ b/usr/src/lib/libast/Makefile.com @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # SHELL=/usr/bin/ksh93 @@ -116,6 +115,7 @@ OBJECTS += \ common/comp/setpgid.o \ common/comp/setsid.o \ common/comp/sigunblock.o \ + common/comp/sigflag.o \ common/comp/spawnveg.o \ common/comp/statvfs.o \ common/comp/strcasecmp.o \ @@ -194,8 +194,6 @@ OBJECTS += \ common/misc/getcwd.o \ common/misc/getenv.o \ common/misc/glob.o \ - common/misc/liberror.o \ - common/misc/libevent.o \ common/misc/magic.o \ common/misc/mime.o \ common/misc/mimetype.o \ @@ -715,7 +713,7 @@ CPPFLAGS = \ '-DCONF_LIBSUFFIX=".so"' \ '-DCONF_LIBPREFIX="lib"' \ -DERROR_CATALOG=\""libast"\" \ - -D__OBSOLETE__=20090101 \ + -D__OBSOLETE__=20100101 \ -D_BLD_ast \ -D_PACKAGE_ast \ -D_BLD_DLL @@ -729,6 +727,7 @@ pics/$(MACH)/src/lib/libast/conftab.o \ pics/$(MACH64)/src/lib/libast/conftab.o := CERRWARN += -erroff=E_INIT_DOES_NOT_FIT pics/common/comp/setlocale.o := CERRWARN += -erroff=E_INTEGER_OVERFLOW_DETECTED pics/common/comp/setlocale.o := CERRWARN += -erroff=E_INIT_DOES_NOT_FIT +pics/common/comp/setlocale.o := CERRWARN += -erroff=E_INIT_SIGN_EXTEND pics/common/hash/hashlook.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG pics/common/hash/memhash.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG pics/common/hash/memsum.o := CERRWARN += -erroff=E_CONST_PROMOTED_UNSIGNED_LONG diff --git a/usr/src/lib/libast/amd64/include/ast/align.h b/usr/src/lib/libast/amd64/include/ast/align.h index 861c524bc6..949cc99b7a 100644 --- a/usr/src/lib/libast/amd64/include/ast/align.h +++ b/usr/src/lib/libast/amd64/include/ast/align.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast.h b/usr/src/lib/libast/amd64/include/ast/ast.h index f1dff0cf6a..5c0d5dcd30 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast.h +++ b/usr/src/lib/libast/amd64/include/ast/ast.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/ast_botch.h b/usr/src/lib/libast/amd64/include/ast/ast_botch.h index 74b2a69444..a03d7853d6 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_botch.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_botch.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_ccode.h b/usr/src/lib/libast/amd64/include/ast/ast_ccode.h index c4efd15d09..95dff2c590 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_ccode.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_ccode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_common.h b/usr/src/lib/libast/amd64/include/ast/ast_common.h index 7c6fae758e..55f0a40c73 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_common.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_common.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_dir.h b/usr/src/lib/libast/amd64/include/ast/ast_dir.h index 8d801aa72c..c873ed3253 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_dir.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_dir.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/ast_dirent.h b/usr/src/lib/libast/amd64/include/ast/ast_dirent.h index f59c1166c8..bd67b35177 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_dirent.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_fcntl.h b/usr/src/lib/libast/amd64/include/ast/ast_fcntl.h index 8dc210d0d8..3eeb1c5002 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_fcntl.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_fcntl.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_float.h b/usr/src/lib/libast/amd64/include/ast/ast_float.h index c2cec55b38..341a22cb09 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_float.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_float.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_fs.h b/usr/src/lib/libast/amd64/include/ast/ast_fs.h index a3560a8bd5..d217c488c4 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_fs.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_fs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -96,15 +96,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_getopt.h b/usr/src/lib/libast/amd64/include/ast/ast_getopt.h index 060c18a246..c86d826a72 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_getopt.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_getopt.h @@ -19,11 +19,7 @@ extern __MANGLE__ int optind; extern __MANGLE__ int optopt; extern __MANGLE__ char* optarg; -#ifndef NULL /* in case <stdlib.h> or <stdio.h> got here first */ - extern __MANGLE__ int getopt __PROTO__((int, char* const*, const char*)); extern __MANGLE__ int getsubopt __PROTO__((char**, char* const*, char**)); #endif - -#endif diff --git a/usr/src/lib/libast/amd64/include/ast/ast_iconv.h b/usr/src/lib/libast/amd64/include/ast/ast_iconv.h index 166e6c1a31..145235024c 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_iconv.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_lib.h b/usr/src/lib/libast/amd64/include/ast/ast_lib.h index 20a0b52e90..2373fccd39 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_lib.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_lib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -134,6 +134,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -165,7 +168,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_limits.h b/usr/src/lib/libast/amd64/include/ast/ast_limits.h index 9044a8ef53..0cb6224a85 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_limits.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_limits.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_map.h b/usr/src/lib/libast/amd64/include/ast/ast_map.h index e11a11d8ee..530740b442 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_map.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_map.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_mmap.h b/usr/src/lib/libast/amd64/include/ast/ast_mmap.h index effaf235c7..6c80867204 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_mmap.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_mmap.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_mode.h b/usr/src/lib/libast/amd64/include/ast/ast_mode.h index 83f82dfe55..8feea4a027 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_mode.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_mode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_namval.h b/usr/src/lib/libast/amd64/include/ast/ast_namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_namval.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/ast_ndbm.h b/usr/src/lib/libast/amd64/include/ast/ast_ndbm.h index c654de1510..4e4e1648c4 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_ndbm.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_ndbm.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_nl_types.h b/usr/src/lib/libast/amd64/include/ast/ast_nl_types.h index 410351d006..8fcc5b887a 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_nl_types.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_param.h b/usr/src/lib/libast/amd64/include/ast/ast_param.h index 0cdbd19167..f462205952 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_param.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_param.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_standards.h b/usr/src/lib/libast/amd64/include/ast/ast_standards.h index 81160cc84a..16a8b849f3 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_standards.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_standards.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_std.h b/usr/src/lib/libast/amd64/include/ast/ast_std.h index e734c74dbd..f98d1861b9 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_std.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_std.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -166,6 +166,8 @@ extern __MANGLE__ char* strerror __PROTO__((int)); #define AST_LC_COUNT 14 #define AST_LC_LANG 255 +#define AST_LC_internal 1 +#define AST_LC_setenv (1L<<27) #define AST_LC_find (1L<<28) #define AST_LC_debug (1L<<29) #define AST_LC_setlocale (1L<<30) @@ -258,8 +260,9 @@ typedef struct uint32_t env_serial; uint32_t mb_sync; + uint32_t version; - char pad[940]; + char pad[936]; } _Ast_info_t; @@ -346,7 +349,7 @@ extern __MANGLE__ int _ast_getpgrp __PROTO__((void)); /* * and finally, standard interfaces hijacked by ast - * _ATS_STD_I delays headers that require <ast_map.h> + * _AST_STD_I delays headers that require <ast_map.h> */ #include <ast_map.h> diff --git a/usr/src/lib/libast/amd64/include/ast/ast_stdio.h b/usr/src/lib/libast/amd64/include/ast/ast_stdio.h index 2971022d8c..f437852a77 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_stdio.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_sys.h b/usr/src/lib/libast/amd64/include/ast/ast_sys.h index 8feac1da4e..07bdf9e214 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_sys.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_sys.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_time.h b/usr/src/lib/libast/amd64/include/ast/ast_time.h index 23787cc996..57162a8148 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_time.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_time.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_tty.h b/usr/src/lib/libast/amd64/include/ast/ast_tty.h index 6379a35c08..87b4daafa2 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_tty.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_tty.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_version.h b/usr/src/lib/libast/amd64/include/ast/ast_version.h index af5756d02b..b3ba546e3a 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_version.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_version.h @@ -7,4 +7,4 @@ #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif -#define _AST_VERSION 20090202L +#define _AST_VERSION 20100102L diff --git a/usr/src/lib/libast/amd64/include/ast/ast_vfork.h b/usr/src/lib/libast/amd64/include/ast/ast_vfork.h index c36ec0285b..4a00223b7c 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_vfork.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_vfork.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -85,4 +85,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/amd64/include/ast/ast_wait.h b/usr/src/lib/libast/amd64/include/ast/ast_wait.h index 64eb5bd71d..2b5130388e 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_wait.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_wait.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/ast_wchar.h b/usr/src/lib/libast/amd64/include/ast/ast_wchar.h index 92db98875e..c51ac5461f 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_wchar.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/ast_windows.h b/usr/src/lib/libast/amd64/include/ast/ast_windows.h index e02d2aaeb9..65590c17b4 100644 --- a/usr/src/lib/libast/amd64/include/ast/ast_windows.h +++ b/usr/src/lib/libast/amd64/include/ast/ast_windows.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/bytesex.h b/usr/src/lib/libast/amd64/include/ast/bytesex.h index e105fc5f58..1f78d13287 100644 --- a/usr/src/lib/libast/amd64/include/ast/bytesex.h +++ b/usr/src/lib/libast/amd64/include/ast/bytesex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/ccode.h b/usr/src/lib/libast/amd64/include/ast/ccode.h index a7a43aecbe..ae50c63b16 100644 --- a/usr/src/lib/libast/amd64/include/ast/ccode.h +++ b/usr/src/lib/libast/amd64/include/ast/ccode.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -43,7 +43,7 @@ #define _CHARCODE_H 1 -#include <ast.h> +#include <ast_common.h> #include <ast_ccode.h> typedef struct Ccmap_s diff --git a/usr/src/lib/libast/amd64/include/ast/cdt.h b/usr/src/lib/libast/amd64/include/ast/cdt.h index f2f0389296..1044207b76 100644 --- a/usr/src/lib/libast/amd64/include/ast/cdt.h +++ b/usr/src/lib/libast/amd64/include/ast/cdt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/debug.h b/usr/src/lib/libast/amd64/include/ast/debug.h index 8f0ec6a257..6dfee2254a 100644 --- a/usr/src/lib/libast/amd64/include/ast/debug.h +++ b/usr/src/lib/libast/amd64/include/ast/debug.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/dirent.h b/usr/src/lib/libast/amd64/include/ast/dirent.h index ea81d037a5..05e76cadae 100644 --- a/usr/src/lib/libast/amd64/include/ast/dirent.h +++ b/usr/src/lib/libast/amd64/include/ast/dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/dt.h b/usr/src/lib/libast/amd64/include/ast/dt.h index 6fcc20c42e..b6b356aee7 100644 --- a/usr/src/lib/libast/amd64/include/ast/dt.h +++ b/usr/src/lib/libast/amd64/include/ast/dt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/endian.h b/usr/src/lib/libast/amd64/include/ast/endian.h index 6ad7ddcaad..1c992dd490 100644 --- a/usr/src/lib/libast/amd64/include/ast/endian.h +++ b/usr/src/lib/libast/amd64/include/ast/endian.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/error.h b/usr/src/lib/libast/amd64/include/ast/error.h index 10d919a93a..c0e21dadd7 100644 --- a/usr/src/lib/libast/amd64/include/ast/error.h +++ b/usr/src/lib/libast/amd64/include/ast/error.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -64,7 +64,7 @@ #ifndef ERROR_translate #define ERROR_translating() (error_info.translate&&(ast.locale.set&(1<<AST_LC_MESSAGES))) -#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)l,(const char*)i,(const char*)d,(const char*)m):(m)) +#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)(l),(const char*)(i),(const char*)(d),(const char*)(m)):(char*)(m)) #endif #define ERROR_INFO 0 /* info message -- no err_id */ diff --git a/usr/src/lib/libast/amd64/include/ast/find.h b/usr/src/lib/libast/amd64/include/ast/find.h index 9ed4227d03..374858aced 100644 --- a/usr/src/lib/libast/amd64/include/ast/find.h +++ b/usr/src/lib/libast/amd64/include/ast/find.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/fnmatch.h b/usr/src/lib/libast/amd64/include/ast/fnmatch.h index ba357d9585..764009c3b7 100644 --- a/usr/src/lib/libast/amd64/include/ast/fnmatch.h +++ b/usr/src/lib/libast/amd64/include/ast/fnmatch.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/fnv.h b/usr/src/lib/libast/amd64/include/ast/fnv.h index f4caaee97f..2312a20118 100644 --- a/usr/src/lib/libast/amd64/include/ast/fnv.h +++ b/usr/src/lib/libast/amd64/include/ast/fnv.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/fs3d.h b/usr/src/lib/libast/amd64/include/ast/fs3d.h index 50795c98b0..bae8dde927 100644 --- a/usr/src/lib/libast/amd64/include/ast/fs3d.h +++ b/usr/src/lib/libast/amd64/include/ast/fs3d.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/fts.h b/usr/src/lib/libast/amd64/include/ast/fts.h index 09420af481..1bf72a114d 100644 --- a/usr/src/lib/libast/amd64/include/ast/fts.h +++ b/usr/src/lib/libast/amd64/include/ast/fts.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -41,7 +41,9 @@ #define _FTS_H -#include <ls.h> +#include <ast_std.h> +#include <ast_fs.h> +#include <ast_mode.h> /* * fts_open flags diff --git a/usr/src/lib/libast/amd64/include/ast/ftw.h b/usr/src/lib/libast/amd64/include/ast/ftw.h index 49040cf863..68feb09bb3 100644 --- a/usr/src/lib/libast/amd64/include/ast/ftw.h +++ b/usr/src/lib/libast/amd64/include/ast/ftw.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/ftwalk.h b/usr/src/lib/libast/amd64/include/ast/ftwalk.h index 29e1693959..673b1c2824 100644 --- a/usr/src/lib/libast/amd64/include/ast/ftwalk.h +++ b/usr/src/lib/libast/amd64/include/ast/ftwalk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/getopt.h b/usr/src/lib/libast/amd64/include/ast/getopt.h index 4ad28bbb01..c0679a7e53 100644 --- a/usr/src/lib/libast/amd64/include/ast/getopt.h +++ b/usr/src/lib/libast/amd64/include/ast/getopt.h @@ -1,17 +1,42 @@ /* : : generated by proto : : */ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1985-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* Phong Vo <kpv@research.att.com> * +* * +***********************************************************************/ + +/* + * gnu getopt interface + */ +#ifndef _GETOPT_H #if !defined(__PROTO__) #include <prototyped.h> #endif #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif + #ifdef _AST_STD_I #define _GETOPT_H -1 -#endif - -#ifndef _GETOPT_H +#else #define _GETOPT_H 1 #include <ast_getopt.h> @@ -32,3 +57,4 @@ extern __MANGLE__ int getopt_long __PROTO__((int, char* const*, const char*, con extern __MANGLE__ int getopt_long_only __PROTO__((int, char* const*, const char*, const struct option*, int*)); #endif +#endif diff --git a/usr/src/lib/libast/amd64/include/ast/glob.h b/usr/src/lib/libast/amd64/include/ast/glob.h index 93e202a5f9..e2708229c7 100644 --- a/usr/src/lib/libast/amd64/include/ast/glob.h +++ b/usr/src/lib/libast/amd64/include/ast/glob.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/hash.h b/usr/src/lib/libast/amd64/include/ast/hash.h index a524737ccc..0023ea06f5 100644 --- a/usr/src/lib/libast/amd64/include/ast/hash.h +++ b/usr/src/lib/libast/amd64/include/ast/hash.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/hashkey.h b/usr/src/lib/libast/amd64/include/ast/hashkey.h index 525434e369..84be9113a1 100644 --- a/usr/src/lib/libast/amd64/include/ast/hashkey.h +++ b/usr/src/lib/libast/amd64/include/ast/hashkey.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/hashpart.h b/usr/src/lib/libast/amd64/include/ast/hashpart.h index cfe3666777..5d33aac61d 100644 --- a/usr/src/lib/libast/amd64/include/ast/hashpart.h +++ b/usr/src/lib/libast/amd64/include/ast/hashpart.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/iconv.h b/usr/src/lib/libast/amd64/include/ast/iconv.h index 5b02759721..e65540c075 100644 --- a/usr/src/lib/libast/amd64/include/ast/iconv.h +++ b/usr/src/lib/libast/amd64/include/ast/iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/lc.h b/usr/src/lib/libast/amd64/include/ast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/amd64/include/ast/lc.h +++ b/usr/src/lib/libast/amd64/include/ast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/amd64/include/ast/ls.h b/usr/src/lib/libast/amd64/include/ast/ls.h index 70a8dc88ba..a8a5fcb0e0 100644 --- a/usr/src/lib/libast/amd64/include/ast/ls.h +++ b/usr/src/lib/libast/amd64/include/ast/ls.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/magic.h b/usr/src/lib/libast/amd64/include/ast/magic.h index 53d632c721..8683016e80 100644 --- a/usr/src/lib/libast/amd64/include/ast/magic.h +++ b/usr/src/lib/libast/amd64/include/ast/magic.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/magicid.h b/usr/src/lib/libast/amd64/include/ast/magicid.h index e31c80f288..1dca0c1e42 100644 --- a/usr/src/lib/libast/amd64/include/ast/magicid.h +++ b/usr/src/lib/libast/amd64/include/ast/magicid.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/mc.h b/usr/src/lib/libast/amd64/include/ast/mc.h index 75b4308360..b84df7239e 100644 --- a/usr/src/lib/libast/amd64/include/ast/mc.h +++ b/usr/src/lib/libast/amd64/include/ast/mc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/mime.h b/usr/src/lib/libast/amd64/include/ast/mime.h index 6d662d29e5..5943b58eaa 100644 --- a/usr/src/lib/libast/amd64/include/ast/mime.h +++ b/usr/src/lib/libast/amd64/include/ast/mime.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/mnt.h b/usr/src/lib/libast/amd64/include/ast/mnt.h index 62815d19e7..8bf8c12814 100644 --- a/usr/src/lib/libast/amd64/include/ast/mnt.h +++ b/usr/src/lib/libast/amd64/include/ast/mnt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/modecanon.h b/usr/src/lib/libast/amd64/include/ast/modecanon.h index 3357d3ec75..3fa425af8f 100644 --- a/usr/src/lib/libast/amd64/include/ast/modecanon.h +++ b/usr/src/lib/libast/amd64/include/ast/modecanon.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/modex.h b/usr/src/lib/libast/amd64/include/ast/modex.h index 1f00578a00..4b73e19ffe 100644 --- a/usr/src/lib/libast/amd64/include/ast/modex.h +++ b/usr/src/lib/libast/amd64/include/ast/modex.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/namval.h b/usr/src/lib/libast/amd64/include/ast/namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/amd64/include/ast/namval.h +++ b/usr/src/lib/libast/amd64/include/ast/namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/nl_types.h b/usr/src/lib/libast/amd64/include/ast/nl_types.h index e71605ff40..581cc13a81 100644 --- a/usr/src/lib/libast/amd64/include/ast/nl_types.h +++ b/usr/src/lib/libast/amd64/include/ast/nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/option.h b/usr/src/lib/libast/amd64/include/ast/option.h index 39207fcc4c..5439707f8e 100644 --- a/usr/src/lib/libast/amd64/include/ast/option.h +++ b/usr/src/lib/libast/amd64/include/ast/option.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/preroot.h b/usr/src/lib/libast/amd64/include/ast/preroot.h index d7517e51f0..a10163329c 100644 --- a/usr/src/lib/libast/amd64/include/ast/preroot.h +++ b/usr/src/lib/libast/amd64/include/ast/preroot.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/include/ast/proc.h b/usr/src/lib/libast/amd64/include/ast/proc.h index 219f0d5884..4161e1a385 100644 --- a/usr/src/lib/libast/amd64/include/ast/proc.h +++ b/usr/src/lib/libast/amd64/include/ast/proc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/re_comp.h b/usr/src/lib/libast/amd64/include/ast/re_comp.h index e8d425d1c0..ec1d512e40 100644 --- a/usr/src/lib/libast/amd64/include/ast/re_comp.h +++ b/usr/src/lib/libast/amd64/include/ast/re_comp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/recfmt.h b/usr/src/lib/libast/amd64/include/ast/recfmt.h index acdb18df36..fcd56de020 100644 --- a/usr/src/lib/libast/amd64/include/ast/recfmt.h +++ b/usr/src/lib/libast/amd64/include/ast/recfmt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/regex.h b/usr/src/lib/libast/amd64/include/ast/regex.h index 1fcd12d298..9b7299c814 100644 --- a/usr/src/lib/libast/amd64/include/ast/regex.h +++ b/usr/src/lib/libast/amd64/include/ast/regex.h @@ -47,10 +47,11 @@ #define REG_MULTIREF 0x00100000 /* multiple digit backrefs */ #define REG_MUSTDELIM 0x08000000 /* all delimiters required */ #define REG_DELIMITED 0x10000000 /* pattern[0] is delimiter */ -#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ +#define REG_CLASS_ESCAPE 0x80000000 /* \ escapes in [...] */ #define REG_SHELL_DOT 0x00200000 /* explicit leading . match */ #define REG_SHELL_ESCAPED 0x00400000 /* \ not special */ +#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ #define REG_SHELL_PATH 0x00800000 /* explicit / match */ #define REG_REGEXP 0x40000000 /* <regexp.h> compatibility */ @@ -98,7 +99,7 @@ #define REG_BADBR 10 /* invalid {...} digits */ #define REG_ERANGE 11 /* invalid [...] range endpoint */ #define REG_ESPACE 12 /* out of space */ -#define REG_BADRPT 13 /* unary op not preceeded by re */ +#define REG_BADRPT 13 /* unary op not preceded by re */ #define REG_ENULL 14 /* empty subexpr in pattern */ #define REG_ECOUNT 15 /* re component count overflow */ #define REG_BADESC 16 /* invalid \char escape */ @@ -111,7 +112,7 @@ struct regex_s; typedef struct regex_s regex_t; struct regdisc_s; typedef struct regdisc_s regdisc_t; typedef int (*regclass_t) __PROTO__((int)); -typedef int32_t regflags_t; +typedef uint32_t regflags_t; typedef int regoff_t; typedef int (*regerror_t) __PROTO__((const regex_t*, regdisc_t*, int, ...)); typedef __V_* (*regcomp_t) __PROTO__((const regex_t*, const char*, size_t, regdisc_t*)); diff --git a/usr/src/lib/libast/amd64/include/ast/regexp.h b/usr/src/lib/libast/amd64/include/ast/regexp.h index 89e0d3a875..ea2df629b5 100644 --- a/usr/src/lib/libast/amd64/include/ast/regexp.h +++ b/usr/src/lib/libast/amd64/include/ast/regexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/sfdisc.h b/usr/src/lib/libast/amd64/include/ast/sfdisc.h index ce1ed6e052..bc6e00b335 100644 --- a/usr/src/lib/libast/amd64/include/ast/sfdisc.h +++ b/usr/src/lib/libast/amd64/include/ast/sfdisc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/sfio.h b/usr/src/lib/libast/amd64/include/ast/sfio.h index 3506f5c955..da6ebfd9f2 100644 --- a/usr/src/lib/libast/amd64/include/ast/sfio.h +++ b/usr/src/lib/libast/amd64/include/ast/sfio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/sfio_s.h b/usr/src/lib/libast/amd64/include/ast/sfio_s.h index 46b2348b9c..7f7483cc79 100644 --- a/usr/src/lib/libast/amd64/include/ast/sfio_s.h +++ b/usr/src/lib/libast/amd64/include/ast/sfio_s.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/sfio_t.h b/usr/src/lib/libast/amd64/include/ast/sfio_t.h index 5c819865c8..4240316aef 100644 --- a/usr/src/lib/libast/amd64/include/ast/sfio_t.h +++ b/usr/src/lib/libast/amd64/include/ast/sfio_t.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/shcmd.h b/usr/src/lib/libast/amd64/include/ast/shcmd.h index f59834ad80..2b7a3ce486 100644 --- a/usr/src/lib/libast/amd64/include/ast/shcmd.h +++ b/usr/src/lib/libast/amd64/include/ast/shcmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/sig.h b/usr/src/lib/libast/amd64/include/ast/sig.h index ec9e3d888b..ba9a0d2615 100644 --- a/usr/src/lib/libast/amd64/include/ast/sig.h +++ b/usr/src/lib/libast/amd64/include/ast/sig.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -139,11 +139,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/amd64/include/ast/stack.h b/usr/src/lib/libast/amd64/include/ast/stack.h index 64bda47ad0..8a7f954797 100644 --- a/usr/src/lib/libast/amd64/include/ast/stack.h +++ b/usr/src/lib/libast/amd64/include/ast/stack.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/stak.h b/usr/src/lib/libast/amd64/include/ast/stak.h index 3e867b0b7d..4396bdf02b 100644 --- a/usr/src/lib/libast/amd64/include/ast/stak.h +++ b/usr/src/lib/libast/amd64/include/ast/stak.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/stdio.h b/usr/src/lib/libast/amd64/include/ast/stdio.h index 2053ba8b27..0d9876a250 100644 --- a/usr/src/lib/libast/amd64/include/ast/stdio.h +++ b/usr/src/lib/libast/amd64/include/ast/stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/stk.h b/usr/src/lib/libast/amd64/include/ast/stk.h index ae2684f36d..7a226b0e98 100644 --- a/usr/src/lib/libast/amd64/include/ast/stk.h +++ b/usr/src/lib/libast/amd64/include/ast/stk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/swap.h b/usr/src/lib/libast/amd64/include/ast/swap.h index 96c2f79d74..d214ece1e6 100644 --- a/usr/src/lib/libast/amd64/include/ast/swap.h +++ b/usr/src/lib/libast/amd64/include/ast/swap.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/tar.h b/usr/src/lib/libast/amd64/include/ast/tar.h index 04f5586481..8e8af49bb2 100644 --- a/usr/src/lib/libast/amd64/include/ast/tar.h +++ b/usr/src/lib/libast/amd64/include/ast/tar.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/times.h b/usr/src/lib/libast/amd64/include/ast/times.h index db0725a35c..1dbd3ee60a 100644 --- a/usr/src/lib/libast/amd64/include/ast/times.h +++ b/usr/src/lib/libast/amd64/include/ast/times.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/tm.h b/usr/src/lib/libast/amd64/include/ast/tm.h index 154615088f..d8eb357c20 100644 --- a/usr/src/lib/libast/amd64/include/ast/tm.h +++ b/usr/src/lib/libast/amd64/include/ast/tm.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/tmx.h b/usr/src/lib/libast/amd64/include/ast/tmx.h index 3405302465..cc2a9c517d 100644 --- a/usr/src/lib/libast/amd64/include/ast/tmx.h +++ b/usr/src/lib/libast/amd64/include/ast/tmx.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/tok.h b/usr/src/lib/libast/amd64/include/ast/tok.h index 8850458e9a..5e07aa302d 100644 --- a/usr/src/lib/libast/amd64/include/ast/tok.h +++ b/usr/src/lib/libast/amd64/include/ast/tok.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/tv.h b/usr/src/lib/libast/amd64/include/ast/tv.h index a404b0e098..0f17d679df 100644 --- a/usr/src/lib/libast/amd64/include/ast/tv.h +++ b/usr/src/lib/libast/amd64/include/ast/tv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/include/ast/usage.h b/usr/src/lib/libast/amd64/include/ast/usage.h index e2bea60f9c..19d2b0fc14 100644 --- a/usr/src/lib/libast/amd64/include/ast/usage.h +++ b/usr/src/lib/libast/amd64/include/ast/usage.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/vdb.h b/usr/src/lib/libast/amd64/include/ast/vdb.h index f800446d5f..a44d0c6132 100644 --- a/usr/src/lib/libast/amd64/include/ast/vdb.h +++ b/usr/src/lib/libast/amd64/include/ast/vdb.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/vecargs.h b/usr/src/lib/libast/amd64/include/ast/vecargs.h index 8b567d5d5d..900e13d8b0 100644 --- a/usr/src/lib/libast/amd64/include/ast/vecargs.h +++ b/usr/src/lib/libast/amd64/include/ast/vecargs.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/vmalloc.h b/usr/src/lib/libast/amd64/include/ast/vmalloc.h index 0115078cf5..f13cc58879 100644 --- a/usr/src/lib/libast/amd64/include/ast/vmalloc.h +++ b/usr/src/lib/libast/amd64/include/ast/vmalloc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ -#define VMALLOC_VERSION 20070911L +#define VMALLOC_VERSION 20100101L #if _PACKAGE_ast #include <ast_std.h> @@ -39,6 +39,7 @@ typedef struct _vmalloc_s Vmalloc_t; typedef struct _vmstat_s Vmstat_t; typedef struct _vmdisc_s Vmdisc_t; typedef struct _vmethod_s Vmethod_t; +typedef struct _vmdata_s Vmdata_t; typedef Void_t* (*Vmemory_f)_ARG_((Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*)); typedef int (*Vmexcept_f)_ARG_((Vmalloc_t*, int, Void_t*, Vmdisc_t*)); @@ -75,6 +76,9 @@ struct _vmalloc_s char* file; /* file name */ int line; /* line number */ Void_t* func; /* calling function */ + Vmdisc_t* disc; /* discipline to get space */ + Vmdata_t* data; /* the real region data */ + Vmalloc_t* next; /* linked list of regions */ #ifdef _VM_PRIVATE_ _VM_PRIVATE_ #endif @@ -172,7 +176,8 @@ extern int vmtrbusy _ARG_((Vmalloc_t*)); extern int vmstat _ARG_((Vmalloc_t*, Vmstat_t*)); extern int vmwalk _ARG_((Vmalloc_t*, - int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*))); + int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*,Void_t*), + Void_t*)); extern char* vmstrdup _ARG_((Vmalloc_t*, const char*)); #if !defined(_BLD_vmalloc) && !defined(_AST_STD_H) && \ @@ -311,5 +316,6 @@ _END_EXTERNS_ (VM_RSMOVE) ) #define vmnewof(v,p,t,n,x) (t*)vmresize((v), (p), sizeof(t)*(n)+(x), \ (VM_RSMOVE|VM_RSCOPY|VM_RSZERO) ) +#define vmdata(vm) ((Void_t*)(_VM_(vm)->data)) #endif /* _VMALLOC_H */ diff --git a/usr/src/lib/libast/amd64/include/ast/wait.h b/usr/src/lib/libast/amd64/include/ast/wait.h index bb690a2ee4..c4e3b8f2a0 100644 --- a/usr/src/lib/libast/amd64/include/ast/wait.h +++ b/usr/src/lib/libast/amd64/include/ast/wait.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/wchar.h b/usr/src/lib/libast/amd64/include/ast/wchar.h index 5bd6aa3ba8..43c5ef1e98 100644 --- a/usr/src/lib/libast/amd64/include/ast/wchar.h +++ b/usr/src/lib/libast/amd64/include/ast/wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/include/ast/wordexp.h b/usr/src/lib/libast/amd64/include/ast/wordexp.h index 0ae7e93e99..af3169962b 100644 --- a/usr/src/lib/libast/amd64/include/ast/wordexp.h +++ b/usr/src/lib/libast/amd64/include/ast/wordexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/align b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/align index 5ea6665c79..26afb86c76 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/align +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/align @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/botch b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/botch index 992ace7c30..ab5db43c79 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/botch +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/botch @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ccode b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ccode index 7e14f8c11a..1b67f360b9 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ccode +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ccode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/common b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/common index 3c85374ef7..5b62b7e272 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/common +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/common @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/dirent b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/dirent index 35bd2afa77..f814e1efb0 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/dirent +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/dirent @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/eaccess b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/eaccess index 50889144e2..f9185636df 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/eaccess +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/eaccess @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/eaccess by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/eaccess by iffe version 2009-12-04 : : */ #ifndef _def_eaccess_ast #define _def_eaccess_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/errno b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/errno index f0e9bc686d..6c7f795320 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/errno +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/errno @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/errno by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/errno by iffe version 2009-12-04 : : */ #ifndef _def_errno_ast #define _def_errno_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fcntl b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fcntl index f408632bee..c6220d53e6 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fcntl +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fcntl @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/float b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/float index 48579d1014..fcf9f4aa09 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/float +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/float @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fs b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fs index a070d05fb5..e8372a1398 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fs +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/fs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/hack b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/hack index 031e5df790..ac6889f55d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/hack +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/hack @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/hack by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/hack by iffe version 2009-12-04 : : */ #ifndef _def_hack_ast #define _def_hack_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/iconv b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/iconv index f37272845d..720f456be1 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/iconv +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/iconv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/isoc99 b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/isoc99 index f79ef28b8d..77ddccf315 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/isoc99 +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/isoc99 @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/isoc99 by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/isoc99 by iffe version 2009-12-04 : : */ #ifndef _def_isoc99_ast #define _def_isoc99_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/lib b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/lib index 4b3537681b..b0a14c5fc8 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/lib +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/lib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -113,6 +113,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -144,7 +147,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/libpath b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/libpath index a60075ae26..d9730df658 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/libpath +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/libpath @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/libpath.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/libpath.sh by iffe version 2009-12-04 : : */ #ifndef _def_libpath_ast #define _def_libpath_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/limits b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/limits index 3300a2b775..933d0a00a6 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/limits +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/limits @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/map b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/map index 8fe86746f5..8653690789 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/map +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/map @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mmap b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mmap index 94d2cd12cb..aea2a35cbb 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mmap +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mmap @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mode b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mode index 28734c2aaf..83e70f608e 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mode +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/mode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ndbm b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ndbm index 07b285acf6..656547d2d4 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ndbm +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/ndbm @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/nl_types b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/nl_types index 33d2f55fee..9c39d0de67 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/nl_types +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/nl_types @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/omitted b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/omitted index 8ead8fe2a6..fc57c94ce0 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/omitted +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/omitted @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/omitted by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/omitted by iffe version 2009-12-04 : : */ #ifndef _def_omitted_ast #define _def_omitted_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/options b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/options new file mode 100644 index 0000000000..07c7cc95f7 --- /dev/null +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/options @@ -0,0 +1,5 @@ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/options by iffe version 2009-12-04 : : */ +#ifndef _def_options_ast +#define _def_options_ast 1 +#define _sys_types 1 /* #include <sys/types.h> ok */ +#endif diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/param b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/param index e91254cadb..9d45e3e464 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/param +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/param @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/preroot b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/preroot index 983d369adc..fcb123549d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/preroot +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/preroot @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/prog b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/prog index 25aa268560..f2a63509b2 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/prog +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/prog @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/prog by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/prog by iffe version 2009-12-04 : : */ #ifndef _def_prog_ast #define _def_prog_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfinit b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfinit index eca0a933d7..08c21a8791 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfinit +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfinit @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sfinit.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sfinit.c by iffe version 2009-12-04 : : */ #ifndef _def_sfinit_ast #define _def_sfinit_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfio b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfio index 3e693bb3f3..68427158e0 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfio +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sfio @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sfio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sfio by iffe version 2009-12-04 : : */ #ifndef _def_sfio_ast #define _def_sfio_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sig b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sig index 2d4c6c26c3..aa519b2221 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sig +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sig @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/siglist b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/siglist index 046c7ab2a0..38bbd52e74 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/siglist +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/siglist @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/siglist by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/siglist by iffe version 2009-12-04 : : */ #ifndef _def_siglist_ast #define _def_siglist_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/signal b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/signal index d79150dcde..297d7aee2a 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/signal +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/signal @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/signal.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/signal.c by iffe version 2009-12-04 : : */ #ifndef _def_signal_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/standards b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/standards index f1fbfb659c..100a7e8818 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/standards +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/standards @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/stdio b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/stdio index 8ff24dd46b..727b7add5f 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/stdio +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/stdio @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sys b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sys index 1f676698fa..6d724f0a54 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sys +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/sys @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/time b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/time index 88d522baf2..46eef2afce 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/time +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/time @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmlib b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmlib index 4685dffe2d..309331f1a7 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmlib +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmlib @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tmlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tmlib by iffe version 2009-12-04 : : */ #ifndef _def_tmlib_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmx b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmx index 2dbb660bcf..01af898e97 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmx +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tmx @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tty b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tty index 27fcb9c802..c4ec9d9e0d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tty +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tty @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tv b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tv index c17c0dcc6e..d51d0f4b18 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tv +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tvlib b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tvlib index 284a91af4a..6ce0c248b6 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tvlib +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/tvlib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tvlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tvlib by iffe version 2009-12-04 : : */ #ifndef _def_tvlib_ast #define _def_tvlib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -11,6 +11,7 @@ #define _lib_nanosleep 1 /* nanosleep() in default lib(s) */ #define _lib_usleep 1 /* usleep() in default lib(s) */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ +#define _lib_utimensat 1 /* complete utimensat implementation */ #define _sys_time 1 /* #include <sys/time.h> ok */ #define _lib_clock_gettime 1 /* execute{\ passed */ #define tmgettimeofday(p) gettimeofday(p,(struct timezone*)0) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/uwin b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/uwin index 4b86aeef0f..4364a133ab 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/uwin +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/uwin @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/uwin by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/uwin by iffe version 2009-12-04 : : */ #ifndef _def_uwin_ast #define _def_uwin_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vfork b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vfork index 23e55cefce..aa9cea31e5 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vfork +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vfork @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -64,4 +64,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vmalloc b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vmalloc index 8b9de93b49..8a6dee86da 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vmalloc +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/vmalloc @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/vmalloc by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/vmalloc by iffe version 2009-12-04 : : */ #ifndef _def_vmalloc_ast #define _def_vmalloc_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wait b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wait index fbf6b53c86..6cd28b8bbf 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wait +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wait @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wchar b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wchar index ea2d2f24eb..388a042950 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wchar +++ b/usr/src/lib/libast/amd64/src/lib/libast/FEATURE/wchar @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/align.h b/usr/src/lib/libast/amd64/src/lib/libast/align.h index 5ea6665c79..26afb86c76 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/align.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/align.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_botch.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_botch.h index 992ace7c30..ab5db43c79 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_botch.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_botch.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_ccode.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_ccode.h index 7e14f8c11a..1b67f360b9 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_ccode.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_ccode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_common.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_common.h index ca12d1646b..4c6698427f 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_common.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_common.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_dirent.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_dirent.h index 35bd2afa77..f814e1efb0 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_dirent.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_dirent.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_fcntl.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_fcntl.h index f408632bee..c6220d53e6 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_fcntl.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_fcntl.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_float.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_float.h index 48579d1014..fcf9f4aa09 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_float.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_float.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_fs.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_fs.h index a070d05fb5..e8372a1398 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_fs.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_fs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_iconv.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_iconv.h index f37272845d..720f456be1 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_iconv.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_iconv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_lib.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_lib.h index 4b3537681b..b0a14c5fc8 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_lib.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_lib.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -113,6 +113,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -144,7 +147,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_limits.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_limits.h index 3300a2b775..933d0a00a6 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_limits.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_limits.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_map.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_map.h index 8fe86746f5..8653690789 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_map.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_map.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_mmap.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_mmap.h index 94d2cd12cb..aea2a35cbb 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_mmap.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_mmap.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_mode.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_mode.h index 28734c2aaf..83e70f608e 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_mode.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_mode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_namval.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_namval.h index f8f65ab2cb..49e777be1d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_namval.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_namval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_ndbm.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_ndbm.h index 07b285acf6..656547d2d4 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_ndbm.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_ndbm.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_nl_types.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_nl_types.h index 33d2f55fee..9c39d0de67 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_nl_types.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_nl_types.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_param.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_param.h index e91254cadb..9d45e3e464 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_param.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_param.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_standards.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_standards.h index f1fbfb659c..100a7e8818 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_standards.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_standards.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_stdio.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_stdio.h index 8ff24dd46b..727b7add5f 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_stdio.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_stdio.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_sys.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_sys.h index 1f676698fa..6d724f0a54 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_sys.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_sys.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_time.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_time.h index 88d522baf2..46eef2afce 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_time.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_time.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_tty.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_tty.h index 27fcb9c802..c4ec9d9e0d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_tty.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_tty.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_vfork.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_vfork.h index 23e55cefce..aa9cea31e5 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_vfork.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_vfork.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -64,4 +64,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_wait.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_wait.h index fbf6b53c86..6cd28b8bbf 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_wait.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_wait.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/ast_wchar.h b/usr/src/lib/libast/amd64/src/lib/libast/ast_wchar.h index ea2d2f24eb..388a042950 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/ast_wchar.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/ast_wchar.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/conftab.c b/usr/src/lib/libast/amd64/src/lib/libast/conftab.c index 670808017a..47babdb776 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/conftab.c +++ b/usr/src/lib/libast/amd64/src/lib/libast/conftab.c @@ -10,7 +10,7 @@ #include "FEATURE/param" #include "conftab.h" -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/comp/conf.tab : : */ /* * prefix strings -- the first few are indexed by Conf_t.standard diff --git a/usr/src/lib/libast/amd64/src/lib/libast/conftab.h b/usr/src/lib/libast/amd64/src/lib/libast/conftab.h index dd061b6083..843f12c9fd 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/conftab.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/conftab.h @@ -6,7 +6,7 @@ #endif #include <sys/systeminfo.h> -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/comp/conf.tab : : */ #if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus) #define const diff --git a/usr/src/lib/libast/amd64/src/lib/libast/lc.h b/usr/src/lib/libast/amd64/src/lib/libast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/lc.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/preroot.h b/usr/src/lib/libast/amd64/src/lib/libast/preroot.h index 983d369adc..fcb123549d 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/preroot.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/preroot.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/amd64/src/lib/libast/sig.h b/usr/src/lib/libast/amd64/src/lib/libast/sig.h index 2d4c6c26c3..aa519b2221 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/sig.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/sig.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/amd64/src/lib/libast/tmx.h b/usr/src/lib/libast/amd64/src/lib/libast/tmx.h index 2dbb660bcf..01af898e97 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/tmx.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/tmx.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/amd64/src/lib/libast/tv.h b/usr/src/lib/libast/amd64/src/lib/libast/tv.h index c17c0dcc6e..d51d0f4b18 100644 --- a/usr/src/lib/libast/amd64/src/lib/libast/tv.h +++ b/usr/src/lib/libast/amd64/src/lib/libast/tv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/common/RELEASE b/usr/src/lib/libast/common/RELEASE index 67be1c3484..9c3b6de78d 100644 --- a/usr/src/lib/libast/common/RELEASE +++ b/usr/src/lib/libast/common/RELEASE @@ -1,3 +1,45 @@ +10-03-08 features/tvlib: fix utimensat probe to include all macros/structs +10-03-07 features/lib: change stream_peek to test pipes only +10-03-07 string/strelapsed.c: fix next char return overrun +10-03-06 tm/tvtouch.c: use runtime fallback if utimensat() fails with ENOSYS +10-03-05 path/pathtemp.c: add pfx /seed for regression testing +10-03-04 vmalloc/vmwalk.c: add user supplied handle arg +10-03-04 path/pathtemp.c: properly handle mktemp()-style *+(X) templates +10-03-03 include/ast_getopt.h: remove NULL guard - _AST_GETOPT_H now handles it +10-02-24 comp/getopt.h: fix ast_std.h interactions +10-02-24 vmalloc/malloc.c: empty { VMALLOC_OPTION VMDEBUG ... } => no debug! +10-02-02 string/base64.c: fix corner case output buffer overflow +10-02-02 features/fs: sys/mnttab.h requires stdio.h on some systems!! +10-02-01 misc/optget.c: uppercase --html heading -- doh +10-01-29 misc/optget.c: [+NAME?...] overrides error_info.id for >= STYLE_man +10-01-25 vmalloc/vmprivate.c: fix seg ptr initialization bug (24 years old!!) +10-01-20 misc/optget.c: handle nested {...} rendering +10-01-20 misc/state.c: add ast.version for runtime api version +10-01-20 port/astconf.c: "_AST_VERSION" now returns ast.version +10-01-20 include/ast_std.h: add ast.version for runtime api version +10-01-19 astlicense.c: add epl +10-01-01 vmalloc: VMALLOC_OPTIONS env var for all runtime options +10-01-01 include: change some <ast.h> refs to less intrusive <ast_*.h> +10-01-01 setlocale.c,translate.c,fmterror.c: AST_LC_internal retains prev state +10-01-01 comp/setlocale.c: AST_LC_setenv defers to LC_ALL (for sh) +10-01-01 ast_std.h: add { AST_LC_internal AST_LC_setenv } +09-12-24 comp/setlocale.c: fix setlocale(LC_ALL,"") when already initialized +09-12-17 misc/optget.c: handle mixed solaris usage="x:f:(in)yo:(out)" +09-12-11 regex/regcomp.c: posix semantics for [z-a] +09-12-11 regex/regcomp.c: fix BRE/ERE ^^ logic +09-12-11 regex/regcomp.c: fix regcomb() for REG_LEFT|REG_RIGHT +09-12-11 regex/regcomp.c: bm complete=0 if REX_END +09-12-11 comp/sigflag.c: add with npt check in features/sig.sh +09-12-11 tm/tminit.c: fix _tzset_environ logic +09-12-09 tm/tmlocale.c: include "ast_nl_types.h" to pull nl_langinfo in! +09-12-04 features/options: add "opt map-libc" check +09-12-03 tm/tmxdate.c: fix 'next month final day' for dec -> jan +09-11-21 misc/magic.tab: add gimp XCF +09-11-20 vmalloc/vmtrace.c: add pid to assertion disgnostics +09-11-11 regex.h,regcomp.c: add REG_CLASS_ESCAPE, \ inside [...] literal by default +09-11-03 regex/regcache.c: change to variable length pattern strings +09-10-28 include/error.h: fix ERROR_translate() arg parens +09-10-26 port/lcgen.c,comp/setlocale.c: handle LANG init after LC_* already defined 09-10-05 _sfopen.c: add but ignore 'F' flags for stdio compatibility 09-09-28 fts.h,ftwalk.h,fts.c: promote { namelen pathlen level } to (s)size_t 09-09-28 locales: add AST_LC_LANG for $LANG @@ -69,7 +111,7 @@ 08-08-19 strn?tol?d: handle long double with smaller exponent range than double 08-08-18 sfio/sfcvt.c: eliminate excessive multiplies and integral overprecision 08-08-11 tm/tmxfmt.c: handle %10N and %010N -08-08-06 include/shcmd.h: add 'int invariant;' for builtin invarinat arg count +08-08-06 include/shcmd.h: add 'int invariant;' for builtin invariant arg count 08-08-05 features/ndbm: favor sleepycat ndbm compatibility 08-07-21 include/glob.h,misc/glob.c: GLOB_STARSTAR only forces lstat on chdir 08-07-17 sfio: sync with kpv diff --git a/usr/src/lib/libast/common/cdt/dtclose.c b/usr/src/lib/libast/common/cdt/dtclose.c index e5cc3fbfcd..c5d9a448e6 100644 --- a/usr/src/lib/libast/common/cdt/dtclose.c +++ b/usr/src/lib/libast/common/cdt/dtclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtdisc.c b/usr/src/lib/libast/common/cdt/dtdisc.c index 453977bf10..656cc056ac 100644 --- a/usr/src/lib/libast/common/cdt/dtdisc.c +++ b/usr/src/lib/libast/common/cdt/dtdisc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtextract.c b/usr/src/lib/libast/common/cdt/dtextract.c index 2176713289..f6ba23ead2 100644 --- a/usr/src/lib/libast/common/cdt/dtextract.c +++ b/usr/src/lib/libast/common/cdt/dtextract.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtflatten.c b/usr/src/lib/libast/common/cdt/dtflatten.c index cac5308713..68aa5cdc36 100644 --- a/usr/src/lib/libast/common/cdt/dtflatten.c +++ b/usr/src/lib/libast/common/cdt/dtflatten.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dthash.c b/usr/src/lib/libast/common/cdt/dthash.c index f5f2cdcaf2..36797d1a06 100644 --- a/usr/src/lib/libast/common/cdt/dthash.c +++ b/usr/src/lib/libast/common/cdt/dthash.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dthdr.h b/usr/src/lib/libast/common/cdt/dthdr.h index acb9d64c2f..74d417107c 100644 --- a/usr/src/lib/libast/common/cdt/dthdr.h +++ b/usr/src/lib/libast/common/cdt/dthdr.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtlist.c b/usr/src/lib/libast/common/cdt/dtlist.c index 3d37f7bfbb..3d2c9eb22b 100644 --- a/usr/src/lib/libast/common/cdt/dtlist.c +++ b/usr/src/lib/libast/common/cdt/dtlist.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtmethod.c b/usr/src/lib/libast/common/cdt/dtmethod.c index 594831bcaf..52fb2ef9fd 100644 --- a/usr/src/lib/libast/common/cdt/dtmethod.c +++ b/usr/src/lib/libast/common/cdt/dtmethod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtnew.c b/usr/src/lib/libast/common/cdt/dtnew.c index 312631050c..aa26182048 100644 --- a/usr/src/lib/libast/common/cdt/dtnew.c +++ b/usr/src/lib/libast/common/cdt/dtnew.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtopen.c b/usr/src/lib/libast/common/cdt/dtopen.c index 62d16d40a1..47a05d77ba 100644 --- a/usr/src/lib/libast/common/cdt/dtopen.c +++ b/usr/src/lib/libast/common/cdt/dtopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtrenew.c b/usr/src/lib/libast/common/cdt/dtrenew.c index 521688bcf1..9f88b1981f 100644 --- a/usr/src/lib/libast/common/cdt/dtrenew.c +++ b/usr/src/lib/libast/common/cdt/dtrenew.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtrestore.c b/usr/src/lib/libast/common/cdt/dtrestore.c index 610382b4a5..088c453176 100644 --- a/usr/src/lib/libast/common/cdt/dtrestore.c +++ b/usr/src/lib/libast/common/cdt/dtrestore.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtsize.c b/usr/src/lib/libast/common/cdt/dtsize.c index 21b4d74bd7..791ccb4eff 100644 --- a/usr/src/lib/libast/common/cdt/dtsize.c +++ b/usr/src/lib/libast/common/cdt/dtsize.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtstat.c b/usr/src/lib/libast/common/cdt/dtstat.c index eda7509b85..964573f03d 100644 --- a/usr/src/lib/libast/common/cdt/dtstat.c +++ b/usr/src/lib/libast/common/cdt/dtstat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtstrhash.c b/usr/src/lib/libast/common/cdt/dtstrhash.c index 60701f8d72..437c9f9d92 100644 --- a/usr/src/lib/libast/common/cdt/dtstrhash.c +++ b/usr/src/lib/libast/common/cdt/dtstrhash.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dttree.c b/usr/src/lib/libast/common/cdt/dttree.c index 0c7ca3f793..953904ecff 100644 --- a/usr/src/lib/libast/common/cdt/dttree.c +++ b/usr/src/lib/libast/common/cdt/dttree.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dttreeset.c b/usr/src/lib/libast/common/cdt/dttreeset.c index 0975f92ce8..80d2f40945 100644 --- a/usr/src/lib/libast/common/cdt/dttreeset.c +++ b/usr/src/lib/libast/common/cdt/dttreeset.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtview.c b/usr/src/lib/libast/common/cdt/dtview.c index d7f77e32c1..d3aad4cc7c 100644 --- a/usr/src/lib/libast/common/cdt/dtview.c +++ b/usr/src/lib/libast/common/cdt/dtview.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/cdt/dtwalk.c b/usr/src/lib/libast/common/cdt/dtwalk.c index 4c456ff227..12710eee46 100644 --- a/usr/src/lib/libast/common/cdt/dtwalk.c +++ b/usr/src/lib/libast/common/cdt/dtwalk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/atexit.c b/usr/src/lib/libast/common/comp/atexit.c index ba814e84f9..541ef0aac1 100644 --- a/usr/src/lib/libast/common/comp/atexit.c +++ b/usr/src/lib/libast/common/comp/atexit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/basename.c b/usr/src/lib/libast/common/comp/basename.c index 7b5c87273a..6cbc0532f1 100644 --- a/usr/src/lib/libast/common/comp/basename.c +++ b/usr/src/lib/libast/common/comp/basename.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/catopen.c b/usr/src/lib/libast/common/comp/catopen.c index 5039f1280b..0a17cc9d8a 100644 --- a/usr/src/lib/libast/common/comp/catopen.c +++ b/usr/src/lib/libast/common/comp/catopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/closelog.c b/usr/src/lib/libast/common/comp/closelog.c index 8d1c0ee3f4..2ee0b47366 100644 --- a/usr/src/lib/libast/common/comp/closelog.c +++ b/usr/src/lib/libast/common/comp/closelog.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/conf.sh b/usr/src/lib/libast/common/comp/conf.sh index 0e5dcca89d..efe6288145 100644 --- a/usr/src/lib/libast/common/comp/conf.sh +++ b/usr/src/lib/libast/common/comp/conf.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1985-2009 AT&T Intellectual Property # +# Copyright (c) 1985-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libast/common/comp/creat64.c b/usr/src/lib/libast/common/comp/creat64.c index 2217f2886c..18d5d06f7c 100644 --- a/usr/src/lib/libast/common/comp/creat64.c +++ b/usr/src/lib/libast/common/comp/creat64.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/dirname.c b/usr/src/lib/libast/common/comp/dirname.c index 95248e13a7..b744f7b790 100644 --- a/usr/src/lib/libast/common/comp/dirname.c +++ b/usr/src/lib/libast/common/comp/dirname.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/dup2.c b/usr/src/lib/libast/common/comp/dup2.c index 2a7f9ce740..7a3e2049b9 100644 --- a/usr/src/lib/libast/common/comp/dup2.c +++ b/usr/src/lib/libast/common/comp/dup2.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/eaccess.c b/usr/src/lib/libast/common/comp/eaccess.c index f69376b019..ac5ae5dcfb 100644 --- a/usr/src/lib/libast/common/comp/eaccess.c +++ b/usr/src/lib/libast/common/comp/eaccess.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/errno.c b/usr/src/lib/libast/common/comp/errno.c index db8a97d4df..2e1f052d98 100644 --- a/usr/src/lib/libast/common/comp/errno.c +++ b/usr/src/lib/libast/common/comp/errno.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/execlp.c b/usr/src/lib/libast/common/comp/execlp.c index 85f6c7a5d5..8c090cd38a 100644 --- a/usr/src/lib/libast/common/comp/execlp.c +++ b/usr/src/lib/libast/common/comp/execlp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/execve.c b/usr/src/lib/libast/common/comp/execve.c index 58bb970771..f1716f8540 100644 --- a/usr/src/lib/libast/common/comp/execve.c +++ b/usr/src/lib/libast/common/comp/execve.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/execvp.c b/usr/src/lib/libast/common/comp/execvp.c index e60c9b3b97..8346b939a7 100644 --- a/usr/src/lib/libast/common/comp/execvp.c +++ b/usr/src/lib/libast/common/comp/execvp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/execvpe.c b/usr/src/lib/libast/common/comp/execvpe.c index 9ac075dc47..9aee9cb9b9 100644 --- a/usr/src/lib/libast/common/comp/execvpe.c +++ b/usr/src/lib/libast/common/comp/execvpe.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/fcntl.c b/usr/src/lib/libast/common/comp/fcntl.c index 88a63babaa..5573da3fe9 100644 --- a/usr/src/lib/libast/common/comp/fcntl.c +++ b/usr/src/lib/libast/common/comp/fcntl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/fmtmsglib.c b/usr/src/lib/libast/common/comp/fmtmsglib.c index 04ef94674c..695651f5e9 100644 --- a/usr/src/lib/libast/common/comp/fmtmsglib.c +++ b/usr/src/lib/libast/common/comp/fmtmsglib.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/fnmatch.c b/usr/src/lib/libast/common/comp/fnmatch.c index e893616943..8bd86be864 100644 --- a/usr/src/lib/libast/common/comp/fnmatch.c +++ b/usr/src/lib/libast/common/comp/fnmatch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/fnmatch.h b/usr/src/lib/libast/common/comp/fnmatch.h index 6b60659ce9..0a6161c496 100644 --- a/usr/src/lib/libast/common/comp/fnmatch.h +++ b/usr/src/lib/libast/common/comp/fnmatch.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/frexp.c b/usr/src/lib/libast/common/comp/frexp.c index 7408dfed1f..400a4d371a 100644 --- a/usr/src/lib/libast/common/comp/frexp.c +++ b/usr/src/lib/libast/common/comp/frexp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/frexpl.c b/usr/src/lib/libast/common/comp/frexpl.c index 3f9adbfd91..3a35cf045e 100644 --- a/usr/src/lib/libast/common/comp/frexpl.c +++ b/usr/src/lib/libast/common/comp/frexpl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/fsync.c b/usr/src/lib/libast/common/comp/fsync.c index 0f8abef90f..628c3641e3 100644 --- a/usr/src/lib/libast/common/comp/fsync.c +++ b/usr/src/lib/libast/common/comp/fsync.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/ftw.c b/usr/src/lib/libast/common/comp/ftw.c index 7ce30162ca..c89bb683a1 100644 --- a/usr/src/lib/libast/common/comp/ftw.c +++ b/usr/src/lib/libast/common/comp/ftw.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/ftw.h b/usr/src/lib/libast/common/comp/ftw.h index 080fa8ddb4..f9bf435262 100644 --- a/usr/src/lib/libast/common/comp/ftw.h +++ b/usr/src/lib/libast/common/comp/ftw.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getdate.c b/usr/src/lib/libast/common/comp/getdate.c index 1e6f0f6f09..b1c2120364 100644 --- a/usr/src/lib/libast/common/comp/getdate.c +++ b/usr/src/lib/libast/common/comp/getdate.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getgroups.c b/usr/src/lib/libast/common/comp/getgroups.c index 014221e348..33712c5fc8 100644 --- a/usr/src/lib/libast/common/comp/getgroups.c +++ b/usr/src/lib/libast/common/comp/getgroups.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getlogin.c b/usr/src/lib/libast/common/comp/getlogin.c index 20322d55c8..ae6db0f5b8 100644 --- a/usr/src/lib/libast/common/comp/getlogin.c +++ b/usr/src/lib/libast/common/comp/getlogin.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getopt.c b/usr/src/lib/libast/common/comp/getopt.c index d70413f799..44fe1156fc 100644 --- a/usr/src/lib/libast/common/comp/getopt.c +++ b/usr/src/lib/libast/common/comp/getopt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getopt.h b/usr/src/lib/libast/common/comp/getopt.h index 9b50e5feef..ee266593a0 100644 --- a/usr/src/lib/libast/common/comp/getopt.h +++ b/usr/src/lib/libast/common/comp/getopt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -24,11 +24,10 @@ * gnu getopt interface */ +#ifndef _GETOPT_H #ifdef _AST_STD_I #define _GETOPT_H -1 -#endif - -#ifndef _GETOPT_H +#else #define _GETOPT_H 1 #include <ast_getopt.h> @@ -49,3 +48,4 @@ extern int getopt_long(int, char* const*, const char*, const struct option*, int extern int getopt_long_only(int, char* const*, const char*, const struct option*, int*); #endif +#endif diff --git a/usr/src/lib/libast/common/comp/getoptl.c b/usr/src/lib/libast/common/comp/getoptl.c index 8c94e7aebb..a6302da21c 100644 --- a/usr/src/lib/libast/common/comp/getoptl.c +++ b/usr/src/lib/libast/common/comp/getoptl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getpgrp.c b/usr/src/lib/libast/common/comp/getpgrp.c index 39d9cb4137..c4d8493d57 100644 --- a/usr/src/lib/libast/common/comp/getpgrp.c +++ b/usr/src/lib/libast/common/comp/getpgrp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getsubopt.c b/usr/src/lib/libast/common/comp/getsubopt.c index 4aa6697871..e0817d91ba 100644 --- a/usr/src/lib/libast/common/comp/getsubopt.c +++ b/usr/src/lib/libast/common/comp/getsubopt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/getwd.c b/usr/src/lib/libast/common/comp/getwd.c index ce7a56137e..56b04953b4 100644 --- a/usr/src/lib/libast/common/comp/getwd.c +++ b/usr/src/lib/libast/common/comp/getwd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/gross.c b/usr/src/lib/libast/common/comp/gross.c index 259e37c853..551eb08f21 100644 --- a/usr/src/lib/libast/common/comp/gross.c +++ b/usr/src/lib/libast/common/comp/gross.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/hsearch.c b/usr/src/lib/libast/common/comp/hsearch.c index 8f8b06d22a..f0037d0684 100644 --- a/usr/src/lib/libast/common/comp/hsearch.c +++ b/usr/src/lib/libast/common/comp/hsearch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/iconv.c b/usr/src/lib/libast/common/comp/iconv.c index 5772f78780..3f4c7d5855 100644 --- a/usr/src/lib/libast/common/comp/iconv.c +++ b/usr/src/lib/libast/common/comp/iconv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/killpg.c b/usr/src/lib/libast/common/comp/killpg.c index 84e27d96d5..39ed90d8b8 100644 --- a/usr/src/lib/libast/common/comp/killpg.c +++ b/usr/src/lib/libast/common/comp/killpg.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/libgen.h b/usr/src/lib/libast/common/comp/libgen.h index fb3025171a..e7adb22807 100644 --- a/usr/src/lib/libast/common/comp/libgen.h +++ b/usr/src/lib/libast/common/comp/libgen.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/link.c b/usr/src/lib/libast/common/comp/link.c index 5593a43e2e..524172d58e 100644 --- a/usr/src/lib/libast/common/comp/link.c +++ b/usr/src/lib/libast/common/comp/link.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/localeconv.c b/usr/src/lib/libast/common/comp/localeconv.c index bfb878a52c..698294b759 100644 --- a/usr/src/lib/libast/common/comp/localeconv.c +++ b/usr/src/lib/libast/common/comp/localeconv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/lstat.c b/usr/src/lib/libast/common/comp/lstat.c index b67356d3b3..d86790a7e3 100644 --- a/usr/src/lib/libast/common/comp/lstat.c +++ b/usr/src/lib/libast/common/comp/lstat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memccpy.c b/usr/src/lib/libast/common/comp/memccpy.c index 2928e0c475..4b54ff9b7d 100644 --- a/usr/src/lib/libast/common/comp/memccpy.c +++ b/usr/src/lib/libast/common/comp/memccpy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memchr.c b/usr/src/lib/libast/common/comp/memchr.c index 9a1525eca3..96b2eaab15 100644 --- a/usr/src/lib/libast/common/comp/memchr.c +++ b/usr/src/lib/libast/common/comp/memchr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memcmp.c b/usr/src/lib/libast/common/comp/memcmp.c index 33700fe54c..990dbd4f08 100644 --- a/usr/src/lib/libast/common/comp/memcmp.c +++ b/usr/src/lib/libast/common/comp/memcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memcpy.c b/usr/src/lib/libast/common/comp/memcpy.c index 6a6c4f0e82..984e88a7d6 100644 --- a/usr/src/lib/libast/common/comp/memcpy.c +++ b/usr/src/lib/libast/common/comp/memcpy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memmove.c b/usr/src/lib/libast/common/comp/memmove.c index 73eebc360b..ddb108f544 100644 --- a/usr/src/lib/libast/common/comp/memmove.c +++ b/usr/src/lib/libast/common/comp/memmove.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/memset.c b/usr/src/lib/libast/common/comp/memset.c index 88605d6c8f..5736ce917c 100644 --- a/usr/src/lib/libast/common/comp/memset.c +++ b/usr/src/lib/libast/common/comp/memset.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mkdir.c b/usr/src/lib/libast/common/comp/mkdir.c index 6ad37d915b..66a3c5489c 100644 --- a/usr/src/lib/libast/common/comp/mkdir.c +++ b/usr/src/lib/libast/common/comp/mkdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mkfifo.c b/usr/src/lib/libast/common/comp/mkfifo.c index df8e4ec06c..9f35156247 100644 --- a/usr/src/lib/libast/common/comp/mkfifo.c +++ b/usr/src/lib/libast/common/comp/mkfifo.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mknod.c b/usr/src/lib/libast/common/comp/mknod.c index 8d8ec6efbf..c1003c348d 100644 --- a/usr/src/lib/libast/common/comp/mknod.c +++ b/usr/src/lib/libast/common/comp/mknod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mktemp.c b/usr/src/lib/libast/common/comp/mktemp.c index fc79301f11..b1851ddf86 100644 --- a/usr/src/lib/libast/common/comp/mktemp.c +++ b/usr/src/lib/libast/common/comp/mktemp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mktime.c b/usr/src/lib/libast/common/comp/mktime.c index 691184645e..79864ff3cb 100644 --- a/usr/src/lib/libast/common/comp/mktime.c +++ b/usr/src/lib/libast/common/comp/mktime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/mount.c b/usr/src/lib/libast/common/comp/mount.c index c444aebea6..6efdad927f 100644 --- a/usr/src/lib/libast/common/comp/mount.c +++ b/usr/src/lib/libast/common/comp/mount.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/nftw.c b/usr/src/lib/libast/common/comp/nftw.c index 6372869a9c..21684f23f3 100644 --- a/usr/src/lib/libast/common/comp/nftw.c +++ b/usr/src/lib/libast/common/comp/nftw.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/open.c b/usr/src/lib/libast/common/comp/open.c index 06b2874e92..bd9d4ee482 100644 --- a/usr/src/lib/libast/common/comp/open.c +++ b/usr/src/lib/libast/common/comp/open.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/openlog.c b/usr/src/lib/libast/common/comp/openlog.c index 17b1a8fa4a..a4c902a168 100644 --- a/usr/src/lib/libast/common/comp/openlog.c +++ b/usr/src/lib/libast/common/comp/openlog.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/putenv.c b/usr/src/lib/libast/common/comp/putenv.c index a94dc44457..235991e3c1 100644 --- a/usr/src/lib/libast/common/comp/putenv.c +++ b/usr/src/lib/libast/common/comp/putenv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/re_comp.c b/usr/src/lib/libast/common/comp/re_comp.c index 9892cfcf2c..73161646da 100644 --- a/usr/src/lib/libast/common/comp/re_comp.c +++ b/usr/src/lib/libast/common/comp/re_comp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/re_comp.h b/usr/src/lib/libast/common/comp/re_comp.h index d4eaa98e3c..a464778002 100644 --- a/usr/src/lib/libast/common/comp/re_comp.h +++ b/usr/src/lib/libast/common/comp/re_comp.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/readlink.c b/usr/src/lib/libast/common/comp/readlink.c index e0a6ac3664..284d3c9c6d 100644 --- a/usr/src/lib/libast/common/comp/readlink.c +++ b/usr/src/lib/libast/common/comp/readlink.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/realpath.c b/usr/src/lib/libast/common/comp/realpath.c index 4b01835f25..a62577dfb7 100644 --- a/usr/src/lib/libast/common/comp/realpath.c +++ b/usr/src/lib/libast/common/comp/realpath.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/regcmp.c b/usr/src/lib/libast/common/comp/regcmp.c index 81c7c730f1..c1a34aa616 100644 --- a/usr/src/lib/libast/common/comp/regcmp.c +++ b/usr/src/lib/libast/common/comp/regcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/regexp.c b/usr/src/lib/libast/common/comp/regexp.c index 37eb3dd107..f28aeb58ab 100644 --- a/usr/src/lib/libast/common/comp/regexp.c +++ b/usr/src/lib/libast/common/comp/regexp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/regexp.h b/usr/src/lib/libast/common/comp/regexp.h index 1dd06ac12a..c467310b9c 100644 --- a/usr/src/lib/libast/common/comp/regexp.h +++ b/usr/src/lib/libast/common/comp/regexp.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/remove.c b/usr/src/lib/libast/common/comp/remove.c index b920ed1b90..b9a1589308 100644 --- a/usr/src/lib/libast/common/comp/remove.c +++ b/usr/src/lib/libast/common/comp/remove.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/rename.c b/usr/src/lib/libast/common/comp/rename.c index 4089d04aab..c46c2389d5 100644 --- a/usr/src/lib/libast/common/comp/rename.c +++ b/usr/src/lib/libast/common/comp/rename.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/resolvepath.c b/usr/src/lib/libast/common/comp/resolvepath.c index 3641e85466..0c5d9eb3a2 100644 --- a/usr/src/lib/libast/common/comp/resolvepath.c +++ b/usr/src/lib/libast/common/comp/resolvepath.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/rmdir.c b/usr/src/lib/libast/common/comp/rmdir.c index 8db360d758..bf32bdcdb5 100644 --- a/usr/src/lib/libast/common/comp/rmdir.c +++ b/usr/src/lib/libast/common/comp/rmdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/setenv.c b/usr/src/lib/libast/common/comp/setenv.c index 15a012dfb1..a703eb4f13 100644 --- a/usr/src/lib/libast/common/comp/setenv.c +++ b/usr/src/lib/libast/common/comp/setenv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/setlocale.c b/usr/src/lib/libast/common/comp/setlocale.c index 86759ee222..3d13013da2 100644 --- a/usr/src/lib/libast/common/comp/setlocale.c +++ b/usr/src/lib/libast/common/comp/setlocale.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -814,18 +814,25 @@ default_setlocale(int category, const char* locale) */ static char* -single(int category, Lc_t* lc) +single(int category, Lc_t* lc, unsigned int flags) { const char* sys; int i; - if (!lc && !(lc = lc_all) && !(lc = lc_categories[category].prev) && !(lc = lang)) + if (flags & (LC_setenv|LC_setlocale)) + { + if (!(ast.locale.set & AST_LC_internal)) + lc_categories[category].prev = lc; + if ((flags & LC_setenv) && lc_all && locales[category]) + return (char*)locales[category]->name; + } + if (!lc && (!(lc_categories[category].flags & LC_setlocale) || !(lc = lc_categories[category].prev)) && !(lc = lc_all) && !(lc = lc_categories[category].prev) && !(lc = lang)) lc = lcmake(NiL); + sys = 0; if (locales[category] != lc) { if (lc_categories[category].external == -lc_categories[category].internal) { - sys = 0; for (i = 1; i < AST_LC_COUNT; i++) if (locales[i] == lc) { @@ -839,8 +846,6 @@ single(int category, Lc_t* lc) (streq(lc->name, lc->code) || !(sys = setlocale(lc_categories[category].external, lc->code))) && !streq(lc->code, lc->language->code)) sys = setlocale(lc_categories[category].external, lc->language->code); - if (ast.locale.set & (AST_LC_debug|AST_LC_setlocale)) - sfprintf(sfstderr, "locale set %17s %-24s %-24s\n", lc_categories[category].name, lc->name, sys); if (!sys) { /* @@ -872,6 +877,15 @@ single(int category, Lc_t* lc) else ast.locale.set |= (1<<category); } + else if (lc_categories[category].flags ^ flags) + { + lc_categories[category].flags &= ~(LC_setenv|LC_setlocale); + lc_categories[category].flags |= flags; + } + else + return (char*)lc->name; + if ((ast.locale.set & (AST_LC_debug|AST_LC_setlocale)) && !(ast.locale.set & AST_LC_internal)) + sfprintf(sfstderr, "locale set %17s %16s %16s %16s %s%s\n", lc_categories[category].name, lc->name, sys, lc_categories[category].prev ? lc_categories[category].prev->name : NiL, (lc_categories[category].flags & LC_setlocale) ? "[setlocale]" : "", (lc_categories[category].flags & LC_setenv) ? "[setenv]" : ""); return (char*)lc->name; } @@ -919,7 +933,7 @@ composite(register const char* s, int initialize) if (!*s) { for (i = 0; i < k; i++) - single(stk[i], NiL); + single(stk[i], NiL, 0); return -1; } w = ++s; @@ -943,15 +957,15 @@ composite(register const char* s, int initialize) for (i = 0; i < j; i++) if (!initialize) { - if (!single(cat[i], p)) + if (!single(cat[i], p, 0)) { for (i = 0; i < k; i++) - single(stk[i], NiL); + single(stk[i], NiL, 0); return -1; } stk[k++] = cat[i]; } - else if (!lc_categories[cat[i]].prev) + else if (!lc_categories[cat[i]].prev && !(ast.locale.set & AST_LC_internal)) lc_categories[cat[i]].prev = p; } while (s[0] == '/' && s[1] && n < (AST_LC_COUNT - 1)) @@ -970,14 +984,14 @@ composite(register const char* s, int initialize) } if (!initialize) { - if (!single(n, p)) + if (!single(n, p, 0)) { for (i = 1; i < n; i++) - single(i, NiL); + single(i, NiL, 0); return -1; } } - else if (!lc_categories[n].prev) + else if (!lc_categories[n].prev && !(ast.locale.set & AST_LC_internal)) lc_categories[n].prev = p; } return n; @@ -988,9 +1002,10 @@ composite(register const char* s, int initialize) * * locale: * 0 query - * "" initialize from environment - * "-" unset - * * set + * "" initialize from environment (if LC_ALL) + * "" AST_LC_setenv: value unset (defer to LANG) + * "*" AST_LC_setenv: value set (defer to LC_ALL) + * * set (override LC_ALL) */ char* @@ -1000,13 +1015,13 @@ _ast_setlocale(int category, const char* locale) register int i; register int j; int k; - char* a; + int f; Lc_t* p; int cat[AST_LC_COUNT]; static Sfio_t* sp; static int initialized; - static char local[] = "local"; + static const char local[] = "local"; if ((category = lcindex(category, 0)) < 0) return 0; @@ -1056,59 +1071,79 @@ _ast_setlocale(int category, const char* locale) stropt(getenv("LC_OPTIONS"), options, sizeof(*options), setopt, NiL); initialized = 0; } - if (*locale) - p = streq(locale, "-") ? (Lc_t*)0 : lcmake(locale); - else if (!initialized) + if ((ast.locale.set & (AST_LC_debug|AST_LC_setlocale)) && !(ast.locale.set & AST_LC_internal)) + sfprintf(sfstderr, "locale user %17s %16s %s%s\n", category == AST_LC_LANG ? "LANG" : lc_categories[category].name, locale && !*locale ? "''" : locale, initialized ? "" : "[initial]", (ast.locale.set & AST_LC_setenv) ? "[setenv]" : ""); + if (ast.locale.set & AST_LC_setenv) + { + f = LC_setenv; + p = *locale ? lcmake(locale) : (Lc_t*)0; + } + else if (*locale) + { + f = LC_setlocale; + p = lcmake(locale); + } + else if (category == AST_LC_ALL) { - char* u; - char tmp[256]; + if (!initialized) + { + char* u; + char tmp[256]; - /* - * initialize from the environment - * precedence determined by X/Open - */ + /* + * initialize from the environment + * precedence determined by X/Open + */ - u = 0; - if ((s = getenv("LANG")) && *s) - { - if (streq(s, local) && (u || (u = native_locale(locale, tmp, sizeof(tmp))))) - s = u; - lang = lcmake(s); - } - else - lang = 0; - if ((s = getenv("LC_ALL")) && *s) - { - if (streq(s, local) && (u || (u = native_locale(locale, tmp, sizeof(tmp))))) - s = u; - lc_all = lcmake(s); - } - else - lc_all = 0; - for (i = 1; i < AST_LC_COUNT; i++) - if ((s = getenv(lc_categories[i].name)) && *s) + u = 0; + if ((s = getenv("LANG")) && *s) { if (streq(s, local) && (u || (u = native_locale(locale, tmp, sizeof(tmp))))) s = u; - lc_categories[i].prev = lcmake(s); + lang = lcmake(s); } else - lc_categories[i].prev = 0; - for (i = 1; i < AST_LC_COUNT; i++) - if (!single(i, lc_all ? lc_all : lc_categories[i].prev)) + lang = 0; + if ((s = getenv("LC_ALL")) && *s) { - while (i--) - single(i, NiL); - return 0; + if (streq(s, local) && (u || (u = native_locale(locale, tmp, sizeof(tmp))))) + s = u; + lc_all = lcmake(s); } - if (ast.locale.set & AST_LC_debug) + else + lc_all = 0; + for (i = 1; i < AST_LC_COUNT; i++) + if (lc_categories[i].flags & LC_setlocale) + /* explicitly set by setlocale() */; + else if ((s = getenv(lc_categories[i].name)) && *s) + { + if (streq(s, local) && (u || (u = native_locale(locale, tmp, sizeof(tmp))))) + s = u; + lc_categories[i].prev = lcmake(s); + } + else + lc_categories[i].prev = 0; for (i = 1; i < AST_LC_COUNT; i++) - sfprintf(sfstderr, "locale env %17s %16s %16s\n", lc_categories[i].name, locales[i]->name, lc_categories[i].prev ? lc_categories[i].prev->name : (char*)0); - initialized = 1; + if (!single(i, lc_all && !(lc_categories[i].flags & LC_setlocale) ? lc_all : lc_categories[i].prev, 0)) + { + while (i--) + single(i, NiL, 0); + return 0; + } + if (ast.locale.set & AST_LC_debug) + for (i = 1; i < AST_LC_COUNT; i++) + sfprintf(sfstderr, "locale env %17s %16s %16s %16s\n", lc_categories[i].name, locales[i]->name, "", lc_categories[i].prev ? lc_categories[i].prev->name : (char*)0); + initialized = 1; + } goto compose; } else if (category == AST_LC_LANG || !(p = lc_categories[category].prev)) + { + f = 0; p = lcmake("C"); + } + else + f = 0; if (category == AST_LC_LANG) { if (lang != p) @@ -1116,26 +1151,32 @@ _ast_setlocale(int category, const char* locale) lang = p; if (!lc_all) for (i = 1; i < AST_LC_COUNT; i++) - if (!single(i, lc_categories[i].prev)) + if (!single(i, lc_categories[i].prev, 0)) { while (i--) - single(i, NiL); + single(i, NiL, 0); return 0; } } } else if (category != AST_LC_ALL) - return single(category, p); - else if ((i = composite(locale, 0)) < 0) + { + if (f || !lc_all) + return single(category, p, f); + if (p && !(ast.locale.set & AST_LC_internal)) + lc_categories[category].prev = p; + return (char*)locales[category]->name; + } + else if (composite(locale, 0) < 0) return 0; else if (lc_all != p) { lc_all = p; for (i = 1; i < AST_LC_COUNT; i++) - if (!single(i, lc_all ? lc_all : lc_categories[i].prev)) + if (!single(i, lc_all && !(lc_categories[i].flags & LC_setlocale) ? lc_all : lc_categories[i].prev, 0)) { while (i--) - single(i, NiL); + single(i, NiL, 0); return 0; } } diff --git a/usr/src/lib/libast/common/comp/setlogmask.c b/usr/src/lib/libast/common/comp/setlogmask.c index 3e14c6c131..e1c7d8ecd8 100644 --- a/usr/src/lib/libast/common/comp/setlogmask.c +++ b/usr/src/lib/libast/common/comp/setlogmask.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/setpgid.c b/usr/src/lib/libast/common/comp/setpgid.c index b758a3f0aa..eafc872e26 100644 --- a/usr/src/lib/libast/common/comp/setpgid.c +++ b/usr/src/lib/libast/common/comp/setpgid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/setsid.c b/usr/src/lib/libast/common/comp/setsid.c index 77acd0cac7..acb70123ef 100644 --- a/usr/src/lib/libast/common/comp/setsid.c +++ b/usr/src/lib/libast/common/comp/setsid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/libevent.c b/usr/src/lib/libast/common/comp/sigflag.c index 8330580413..d1c4af627b 100644 --- a/usr/src/lib/libast/common/misc/libevent.c +++ b/usr/src/lib/libast/common/comp/sigflag.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -20,22 +20,33 @@ * * ***********************************************************************/ #pragma prototyped -/* - * Glenn Fowler - * AT&T Research - * - * OBSOLETE: use errormsg() - */ -#include <error.h> +#include <ast.h> + +#if _lib_sigflag + +NoN(sigflag) + +#else + +#include <sig.h> int -libevent(void* handle, void* discipline, int level, ...) +sigflag(int sig, int flags, int set) { - va_list ap; +#if _lib_sigaction + struct sigaction sa; - va_start(ap, level); - errorv((level & ERROR_LIBRARY) ? *((char**)handle) : (char*)0, level, ap); - va_end(ap); - return 0; + if (sigaction(sig, NiL, &sa)) + return -1; + if (set) + sa.sa_flags |= flags; + else + sa.sa_flags &= ~flags; + return sigaction(sig, &sa, NiL); +#else + return -1; +#endif } + +#endif diff --git a/usr/src/lib/libast/common/comp/sigunblock.c b/usr/src/lib/libast/common/comp/sigunblock.c index 161a6c8366..3eb9a28a9b 100644 --- a/usr/src/lib/libast/common/comp/sigunblock.c +++ b/usr/src/lib/libast/common/comp/sigunblock.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/spawnveg.c b/usr/src/lib/libast/common/comp/spawnveg.c index 092fc56a72..e61e20be62 100644 --- a/usr/src/lib/libast/common/comp/spawnveg.c +++ b/usr/src/lib/libast/common/comp/spawnveg.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/statvfs.c b/usr/src/lib/libast/common/comp/statvfs.c index 2da0f59778..219ad9a4c2 100644 --- a/usr/src/lib/libast/common/comp/statvfs.c +++ b/usr/src/lib/libast/common/comp/statvfs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strcasecmp.c b/usr/src/lib/libast/common/comp/strcasecmp.c index c387e1442b..22d54c27db 100644 --- a/usr/src/lib/libast/common/comp/strcasecmp.c +++ b/usr/src/lib/libast/common/comp/strcasecmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strchr.c b/usr/src/lib/libast/common/comp/strchr.c index c0188a13ca..20943fcdae 100644 --- a/usr/src/lib/libast/common/comp/strchr.c +++ b/usr/src/lib/libast/common/comp/strchr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strftime.c b/usr/src/lib/libast/common/comp/strftime.c index cb6c720210..b954e17345 100644 --- a/usr/src/lib/libast/common/comp/strftime.c +++ b/usr/src/lib/libast/common/comp/strftime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strncasecmp.c b/usr/src/lib/libast/common/comp/strncasecmp.c index ca3c484bbc..0ad34b32d1 100644 --- a/usr/src/lib/libast/common/comp/strncasecmp.c +++ b/usr/src/lib/libast/common/comp/strncasecmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strptime.c b/usr/src/lib/libast/common/comp/strptime.c index 38eb16da15..eac8f6f2ee 100644 --- a/usr/src/lib/libast/common/comp/strptime.c +++ b/usr/src/lib/libast/common/comp/strptime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strrchr.c b/usr/src/lib/libast/common/comp/strrchr.c index 03bfbcd05c..c05dded920 100644 --- a/usr/src/lib/libast/common/comp/strrchr.c +++ b/usr/src/lib/libast/common/comp/strrchr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strstr.c b/usr/src/lib/libast/common/comp/strstr.c index 255c5a3710..03b6b64894 100644 --- a/usr/src/lib/libast/common/comp/strstr.c +++ b/usr/src/lib/libast/common/comp/strstr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtod.c b/usr/src/lib/libast/common/comp/strtod.c index e33d8a5a55..7b66e134e7 100644 --- a/usr/src/lib/libast/common/comp/strtod.c +++ b/usr/src/lib/libast/common/comp/strtod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtol.c b/usr/src/lib/libast/common/comp/strtol.c index dfcf217710..ae883742c4 100644 --- a/usr/src/lib/libast/common/comp/strtol.c +++ b/usr/src/lib/libast/common/comp/strtol.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtold.c b/usr/src/lib/libast/common/comp/strtold.c index c4d86bd995..2e6a4783f6 100644 --- a/usr/src/lib/libast/common/comp/strtold.c +++ b/usr/src/lib/libast/common/comp/strtold.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtoll.c b/usr/src/lib/libast/common/comp/strtoll.c index 141b80bad2..4755b97ec2 100644 --- a/usr/src/lib/libast/common/comp/strtoll.c +++ b/usr/src/lib/libast/common/comp/strtoll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtoul.c b/usr/src/lib/libast/common/comp/strtoul.c index 4fa25c081b..3744872d49 100644 --- a/usr/src/lib/libast/common/comp/strtoul.c +++ b/usr/src/lib/libast/common/comp/strtoul.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/strtoull.c b/usr/src/lib/libast/common/comp/strtoull.c index a1f7d5c142..d857c4ceda 100644 --- a/usr/src/lib/libast/common/comp/strtoull.c +++ b/usr/src/lib/libast/common/comp/strtoull.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/swab.c b/usr/src/lib/libast/common/comp/swab.c index 6418fef6b5..5af0bde82c 100644 --- a/usr/src/lib/libast/common/comp/swab.c +++ b/usr/src/lib/libast/common/comp/swab.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/symlink.c b/usr/src/lib/libast/common/comp/symlink.c index fc0850e548..b0263ed927 100644 --- a/usr/src/lib/libast/common/comp/symlink.c +++ b/usr/src/lib/libast/common/comp/symlink.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/syslog.c b/usr/src/lib/libast/common/comp/syslog.c index bf62295474..f9d9942808 100644 --- a/usr/src/lib/libast/common/comp/syslog.c +++ b/usr/src/lib/libast/common/comp/syslog.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/system.c b/usr/src/lib/libast/common/comp/system.c index 91722fb77b..a654b9641d 100644 --- a/usr/src/lib/libast/common/comp/system.c +++ b/usr/src/lib/libast/common/comp/system.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/tempnam.c b/usr/src/lib/libast/common/comp/tempnam.c index 7b11525ea9..e2d447e9a6 100644 --- a/usr/src/lib/libast/common/comp/tempnam.c +++ b/usr/src/lib/libast/common/comp/tempnam.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/tmpnam.c b/usr/src/lib/libast/common/comp/tmpnam.c index 21190586e3..a3a9470dd1 100644 --- a/usr/src/lib/libast/common/comp/tmpnam.c +++ b/usr/src/lib/libast/common/comp/tmpnam.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/transition.c b/usr/src/lib/libast/common/comp/transition.c index 2656846315..e3692d9fa6 100644 --- a/usr/src/lib/libast/common/comp/transition.c +++ b/usr/src/lib/libast/common/comp/transition.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/tsearch.c b/usr/src/lib/libast/common/comp/tsearch.c index a47a14d9a7..8e49ff14c5 100644 --- a/usr/src/lib/libast/common/comp/tsearch.c +++ b/usr/src/lib/libast/common/comp/tsearch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/unlink.c b/usr/src/lib/libast/common/comp/unlink.c index ccf1bff60f..5a7718c032 100644 --- a/usr/src/lib/libast/common/comp/unlink.c +++ b/usr/src/lib/libast/common/comp/unlink.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/unsetenv.c b/usr/src/lib/libast/common/comp/unsetenv.c index 1280abf5b6..4787ef0db8 100644 --- a/usr/src/lib/libast/common/comp/unsetenv.c +++ b/usr/src/lib/libast/common/comp/unsetenv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/vfork.c b/usr/src/lib/libast/common/comp/vfork.c index cb6ce68021..de4680aea6 100644 --- a/usr/src/lib/libast/common/comp/vfork.c +++ b/usr/src/lib/libast/common/comp/vfork.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/waitpid.c b/usr/src/lib/libast/common/comp/waitpid.c index 25c72ebed9..1b09472709 100644 --- a/usr/src/lib/libast/common/comp/waitpid.c +++ b/usr/src/lib/libast/common/comp/waitpid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/wc.c b/usr/src/lib/libast/common/comp/wc.c index 2b53f5de23..2175f2caea 100644 --- a/usr/src/lib/libast/common/comp/wc.c +++ b/usr/src/lib/libast/common/comp/wc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/wordexp.c b/usr/src/lib/libast/common/comp/wordexp.c index 2adf720207..5becd0d9fd 100644 --- a/usr/src/lib/libast/common/comp/wordexp.c +++ b/usr/src/lib/libast/common/comp/wordexp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/comp/wordexp.h b/usr/src/lib/libast/common/comp/wordexp.h index e63b85a60a..81414115d4 100644 --- a/usr/src/lib/libast/common/comp/wordexp.h +++ b/usr/src/lib/libast/common/comp/wordexp.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/dirlib.h b/usr/src/lib/libast/common/dir/dirlib.h index 21ebe2b21e..d6d9aa708e 100644 --- a/usr/src/lib/libast/common/dir/dirlib.h +++ b/usr/src/lib/libast/common/dir/dirlib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/getdents.c b/usr/src/lib/libast/common/dir/getdents.c index e17ceb4a50..1cb90fbc34 100644 --- a/usr/src/lib/libast/common/dir/getdents.c +++ b/usr/src/lib/libast/common/dir/getdents.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/opendir.c b/usr/src/lib/libast/common/dir/opendir.c index e8d37f8a98..08bbe06407 100644 --- a/usr/src/lib/libast/common/dir/opendir.c +++ b/usr/src/lib/libast/common/dir/opendir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/readdir.c b/usr/src/lib/libast/common/dir/readdir.c index 6c8f81c471..efb531efb7 100644 --- a/usr/src/lib/libast/common/dir/readdir.c +++ b/usr/src/lib/libast/common/dir/readdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/rewinddir.c b/usr/src/lib/libast/common/dir/rewinddir.c index 2bf0515e2a..b875ae2bec 100644 --- a/usr/src/lib/libast/common/dir/rewinddir.c +++ b/usr/src/lib/libast/common/dir/rewinddir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/seekdir.c b/usr/src/lib/libast/common/dir/seekdir.c index 9aa81635b4..6f4cc63956 100644 --- a/usr/src/lib/libast/common/dir/seekdir.c +++ b/usr/src/lib/libast/common/dir/seekdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/dir/telldir.c b/usr/src/lib/libast/common/dir/telldir.c index 1fd9036996..de2651b825 100644 --- a/usr/src/lib/libast/common/dir/telldir.c +++ b/usr/src/lib/libast/common/dir/telldir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/memfatal.c b/usr/src/lib/libast/common/disc/memfatal.c index 94aec989f7..9f2538265b 100644 --- a/usr/src/lib/libast/common/disc/memfatal.c +++ b/usr/src/lib/libast/common/disc/memfatal.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcdio.c b/usr/src/lib/libast/common/disc/sfdcdio.c index 142a66f917..c887f69925 100644 --- a/usr/src/lib/libast/common/disc/sfdcdio.c +++ b/usr/src/lib/libast/common/disc/sfdcdio.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcdos.c b/usr/src/lib/libast/common/disc/sfdcdos.c index 3587bbae89..ec0bb10bf3 100644 --- a/usr/src/lib/libast/common/disc/sfdcdos.c +++ b/usr/src/lib/libast/common/disc/sfdcdos.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcfilter.c b/usr/src/lib/libast/common/disc/sfdcfilter.c index a850d0c7cf..c4f4e3f53a 100644 --- a/usr/src/lib/libast/common/disc/sfdcfilter.c +++ b/usr/src/lib/libast/common/disc/sfdcfilter.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdchdr.h b/usr/src/lib/libast/common/disc/sfdchdr.h index 1cfa62a27e..8acbefe8e2 100644 --- a/usr/src/lib/libast/common/disc/sfdchdr.h +++ b/usr/src/lib/libast/common/disc/sfdchdr.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcmore.c b/usr/src/lib/libast/common/disc/sfdcmore.c index 0857011bc0..96dc09b133 100644 --- a/usr/src/lib/libast/common/disc/sfdcmore.c +++ b/usr/src/lib/libast/common/disc/sfdcmore.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcprefix.c b/usr/src/lib/libast/common/disc/sfdcprefix.c index db6ecbf9bc..136e2c51ae 100644 --- a/usr/src/lib/libast/common/disc/sfdcprefix.c +++ b/usr/src/lib/libast/common/disc/sfdcprefix.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcseekable.c b/usr/src/lib/libast/common/disc/sfdcseekable.c index 57214ea2f7..9c9c6489c6 100644 --- a/usr/src/lib/libast/common/disc/sfdcseekable.c +++ b/usr/src/lib/libast/common/disc/sfdcseekable.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcslow.c b/usr/src/lib/libast/common/disc/sfdcslow.c index ec50275eff..fe2bd5e677 100644 --- a/usr/src/lib/libast/common/disc/sfdcslow.c +++ b/usr/src/lib/libast/common/disc/sfdcslow.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcsubstr.c b/usr/src/lib/libast/common/disc/sfdcsubstr.c index 3e393c47b8..0477ddd37e 100644 --- a/usr/src/lib/libast/common/disc/sfdcsubstr.c +++ b/usr/src/lib/libast/common/disc/sfdcsubstr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdctee.c b/usr/src/lib/libast/common/disc/sfdctee.c index 53940f8346..448de40cee 100644 --- a/usr/src/lib/libast/common/disc/sfdctee.c +++ b/usr/src/lib/libast/common/disc/sfdctee.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfdcunion.c b/usr/src/lib/libast/common/disc/sfdcunion.c index 95fdbea623..310e38ecde 100644 --- a/usr/src/lib/libast/common/disc/sfdcunion.c +++ b/usr/src/lib/libast/common/disc/sfdcunion.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfkeyprintf.c b/usr/src/lib/libast/common/disc/sfkeyprintf.c index 12aec244ea..2db8988b0d 100644 --- a/usr/src/lib/libast/common/disc/sfkeyprintf.c +++ b/usr/src/lib/libast/common/disc/sfkeyprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/disc/sfstrtmp.c b/usr/src/lib/libast/common/disc/sfstrtmp.c index 965a8470ec..0bfd0c2384 100644 --- a/usr/src/lib/libast/common/disc/sfstrtmp.c +++ b/usr/src/lib/libast/common/disc/sfstrtmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/align.c b/usr/src/lib/libast/common/features/align.c index 800052a5de..77adf4baac 100644 --- a/usr/src/lib/libast/common/features/align.c +++ b/usr/src/lib/libast/common/features/align.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/botch.c b/usr/src/lib/libast/common/features/botch.c index c45f5806f4..2832100292 100644 --- a/usr/src/lib/libast/common/features/botch.c +++ b/usr/src/lib/libast/common/features/botch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/fcntl.c b/usr/src/lib/libast/common/features/fcntl.c index e761889788..e70685836f 100644 --- a/usr/src/lib/libast/common/features/fcntl.c +++ b/usr/src/lib/libast/common/features/fcntl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/fs b/usr/src/lib/libast/common/features/fs index b3d741e574..4cc558e6a2 100644 --- a/usr/src/lib/libast/common/features/fs +++ b/usr/src/lib/libast/common/features/fs @@ -129,9 +129,13 @@ macro{ ! }end +hdr mntent,mnttab stdio.h +sys mntent,mnttab stdio.h +sys fs_types,mount,statfs,statvfs,vfs,vmount + mem mnttab.mt_dev,mnttab.mt_filsys,mnttab.mt_fstyp sys/types.h mnttab.h mem mntent.mnt_opts,w_mntent.mnt_opts,mnttab.mnt_opts sys/types.h stdio.h mntent.h sys/mntent.h -mem mntent.mnt_opts,mnttab.mnt_opts sys/types.h mnttab.h sys/mnttab.h +mem mntent.mnt_opts,mnttab.mnt_opts stdio.h sys/types.h mnttab.h sys/mnttab.h mem stat.st_blocks,stat.st_blksize,stat.st_rdev sys/types.h sys/stat.h mem statfs.f_files,statfs.f_bavail sys/types.h - sys/statfs.h - sys/vfs.h - sys/param.h sys/mount.h mem statvfs.f_basetype,statvfs.f_frsize sys/types.h sys/statvfs.h @@ -140,11 +144,9 @@ ary f_reserved7 sys/types.h sys/statvfs.h note{ statvfs.f_reserved7 can double f int f(vp)struct statvfs* vp;{return vp->f_reserved7[0] = 1;} }end -hdr mntent,mnttab lib getmntent,getmntinfo,mntctl,mntopen,mntread,mntclose,setmntent lib w_getmntent lib statfs,statvfs -sys fs_types,mntent,mnttab,mount,statfs,statvfs,vfs,vmount lib statfs4 sys/types.h - sys/statfs.h - sys/vfs.h - sys/mount.h compile{ int f() diff --git a/usr/src/lib/libast/common/features/iconv b/usr/src/lib/libast/common/features/iconv index 656a16f0ed..9f5f4c8962 100644 --- a/usr/src/lib/libast/common/features/iconv +++ b/usr/src/lib/libast/common/features/iconv @@ -1,6 +1,6 @@ set prototyped hdr iconv -lib iconv_open,iconv_close,iconv -liconv +lib iconv_open,iconv_close,iconv iconv.h -liconv nxt iconv tst output{ diff --git a/usr/src/lib/libast/common/features/lib b/usr/src/lib/libast/common/features/lib index d2a41d7b61..aeaf9b786b 100644 --- a/usr/src/lib/libast/common/features/lib +++ b/usr/src/lib/libast/common/features/lib @@ -41,6 +41,7 @@ lib lseek64,lstat64 -D_LARGEFILE64_SOURCE lib open64,readdir64,stat64,statvfs64,truncate64 -D_LARGEFILE64_SOURCE lib,npt strtod,strtold,strtol,strtoll,strtoul,strtoull stdlib.h +lib,npt sigflag signal.h mem direct.d_reclen sys/types.h sys/dir.h mem dirent.d_fileno,dirent.d_ino,dirent.d_namlen,dirent.d_off,dirent.d_reclen,dirent.d_type sys/types.h dirent.h @@ -318,18 +319,23 @@ tst lib_spawn_mode unistd.h stdlib.h note{ first spawn arg is mode and it works } }end -tst stream_peek note{ ioctl(I_PEEK) works }end link{ +tst stream_peek note{ ioctl(I_PEEK) works }end execute{ #include <sys/types.h> + #include <unistd.h> #include <stropts.h> int main() - { struct strpeek pbuf; - pbuf.flags = 0; - pbuf.ctlbuf.maxlen = pbuf.databuf.maxlen = - pbuf.ctlbuf.len = pbuf.databuf.len = 0; - pbuf.ctlbuf.buf = pbuf.databuf.buf = 0; - ioctl(0,I_PEEK,&pbuf); - return 0; + { struct strpeek peek; + int fds[2]; + char ctlbuf[32]; + char databuf[32]; + peek.flags = 0; + peek.ctlbuf.maxlen = peek.ctlbuf.len = sizeof(ctlbuf); + peek.ctlbuf.buf = ctlbuf; + peek.databuf.maxlen = peek.databuf.len = sizeof(databuf); + peek.databuf.buf = databuf; + pipe(fds); + return ioctl(fds[0],I_PEEK,&peek) < 0; } }end diff --git a/usr/src/lib/libast/common/features/libpath.sh b/usr/src/lib/libast/common/features/libpath.sh index fa9ca95daa..a722ea86a4 100644 --- a/usr/src/lib/libast/common/features/libpath.sh +++ b/usr/src/lib/libast/common/features/libpath.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1985-2009 AT&T Intellectual Property # +# Copyright (c) 1985-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libast/common/features/limits.c b/usr/src/lib/libast/common/features/limits.c index 51965f6fac..2dee5ea32b 100644 --- a/usr/src/lib/libast/common/features/limits.c +++ b/usr/src/lib/libast/common/features/limits.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/map.c b/usr/src/lib/libast/common/features/map.c index 373706f048..d7fcdd2a43 100644 --- a/usr/src/lib/libast/common/features/map.c +++ b/usr/src/lib/libast/common/features/map.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -30,7 +30,13 @@ #include "FEATURE/lib" #include "FEATURE/mmap" +#include "FEATURE/options" #include "FEATURE/vmalloc" +#include "FEATURE/eaccess" + +#if _opt_map_libc && !defined(_map_libc) +#define _map_libc 1 +#endif int main() @@ -64,8 +70,10 @@ main() printf("#define basename _ast_basename\n"); printf("#undef dirname\n"); printf("#define dirname _ast_dirname\n"); +#if !_lib_eaccess printf("#undef eaccess\n"); printf("#define eaccess _ast_eaccess\n"); +#endif #if !_lib_execvpe printf("#undef execvpe\n"); printf("#define execvpe _ast_execvpe\n"); diff --git a/usr/src/lib/libast/common/features/mode.c b/usr/src/lib/libast/common/features/mode.c index ea82970e78..fb6ef86e0a 100644 --- a/usr/src/lib/libast/common/features/mode.c +++ b/usr/src/lib/libast/common/features/mode.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/options b/usr/src/lib/libast/common/features/options new file mode 100644 index 0000000000..500bd63ae6 --- /dev/null +++ b/usr/src/lib/libast/common/features/options @@ -0,0 +1 @@ +opt map-libc diff --git a/usr/src/lib/libast/common/features/param.sh b/usr/src/lib/libast/common/features/param.sh index b58ebfc9ac..4842ffe497 100644 --- a/usr/src/lib/libast/common/features/param.sh +++ b/usr/src/lib/libast/common/features/param.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1985-2009 AT&T Intellectual Property # +# Copyright (c) 1985-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libast/common/features/preroot.sh b/usr/src/lib/libast/common/features/preroot.sh index 44e8596ad9..bbc99392b9 100644 --- a/usr/src/lib/libast/common/features/preroot.sh +++ b/usr/src/lib/libast/common/features/preroot.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1985-2009 AT&T Intellectual Property # +# Copyright (c) 1985-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libast/common/features/sfinit.c b/usr/src/lib/libast/common/features/sfinit.c index 5a47c3e76c..71a7c100e2 100644 --- a/usr/src/lib/libast/common/features/sfinit.c +++ b/usr/src/lib/libast/common/features/sfinit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/sig.sh b/usr/src/lib/libast/common/features/sig.sh index b67b2b1f3b..450f5c7c1b 100644 --- a/usr/src/lib/libast/common/features/sig.sh +++ b/usr/src/lib/libast/common/features/sig.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1985-2009 AT&T Intellectual Property # +# Copyright (c) 1985-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -115,10 +115,17 @@ extern Sig_info_t sig_info; #undef extern +#if _lib_sigflag && _npt_sigflag +extern int sigflag(int, int, int); +#endif + #if _BLD_ast && defined(__EXPORT__) #define extern __EXPORT__ #endif +#if !_lib_sigflag +extern int sigflag(int, int, int); +#endif extern int sigcritical(int); extern int sigunblock(int); diff --git a/usr/src/lib/libast/common/features/signal.c b/usr/src/lib/libast/common/features/signal.c index f3c89f3574..d1040a0c02 100644 --- a/usr/src/lib/libast/common/features/signal.c +++ b/usr/src/lib/libast/common/features/signal.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/features/tmlib b/usr/src/lib/libast/common/features/tmlib index 2f88e5e625..221079c339 100644 --- a/usr/src/lib/libast/common/features/tmlib +++ b/usr/src/lib/libast/common/features/tmlib @@ -1,6 +1,18 @@ set prototyped +_cc_export_dynamic = note{ probe CC.EXPORT.DYNAMIC supported }end run{ + case `{ probe -l C make cc | grep '^CC.EXPORT.DYNAMIC = .'; } 2>/dev/null` in + '') exit 1 ;; + esac +}end + tst tzset_environ note{ tzset() bypasses user getenv() }end execute{ + #if _UWIN || !_cc_export_dynamic + int main() + { + return 0; + } + #else #include <time.h> extern char** environ; extern char* tzname[2]; @@ -19,6 +31,7 @@ tst tzset_environ note{ tzset() bypasses user getenv() }end execute{ return tzname[0] && !strcmp(tzname[0], "foo") && tzname[1] && !strcmp(tzname[1], "bar"); } + #endif }end if ( _tzset_environ ) { diff --git a/usr/src/lib/libast/common/features/tvlib b/usr/src/lib/libast/common/features/tvlib index 046e19636e..9b2f64fe28 100644 --- a/usr/src/lib/libast/common/features/tvlib +++ b/usr/src/lib/libast/common/features/tvlib @@ -1,7 +1,17 @@ hdr time lib clock_settime,gettimeofday,settimeofday,stime,utimes lib nanosleep,usleep -lib utimensat -D_ATFILE_SOURCE sys/stat.h +lib utimensat -D_ATFILE_SOURCE sys/stat.h note{ complete utimensat implementation }end link{ + #include <fcntl.h> + static struct timespec ts[2]; + int + main() + { + ts[0].tv_nsec = UTIME_NOW; + ts[1].tv_nsec = UTIME_OMIT; + return utimensat(AT_FDCWD, ".", ts, AT_SYMLINK_NOFOLLOW) != 0; + } +}end if ! mem timeval.tv_sec sys/time.h { struct timeval @@ -14,6 +24,7 @@ endif lib clock_gettime execute{ #include <time.h> + int main() { struct timespec tv; @@ -25,6 +36,7 @@ lib utimets link{ #include <time.h> #include <sys/time.h> static struct timespec tv; + int main() { return utimets(".", &tv) != 0; diff --git a/usr/src/lib/libast/common/hash/hashalloc.c b/usr/src/lib/libast/common/hash/hashalloc.c index 0dba5e6c19..6948e8ed37 100644 --- a/usr/src/lib/libast/common/hash/hashalloc.c +++ b/usr/src/lib/libast/common/hash/hashalloc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashdump.c b/usr/src/lib/libast/common/hash/hashdump.c index c453a40c0c..87e9a6db87 100644 --- a/usr/src/lib/libast/common/hash/hashdump.c +++ b/usr/src/lib/libast/common/hash/hashdump.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashfree.c b/usr/src/lib/libast/common/hash/hashfree.c index f01337e1cf..dd4100ae6d 100644 --- a/usr/src/lib/libast/common/hash/hashfree.c +++ b/usr/src/lib/libast/common/hash/hashfree.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashlast.c b/usr/src/lib/libast/common/hash/hashlast.c index 6457a1a1ab..acddf3a3f9 100644 --- a/usr/src/lib/libast/common/hash/hashlast.c +++ b/usr/src/lib/libast/common/hash/hashlast.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashlib.h b/usr/src/lib/libast/common/hash/hashlib.h index 34e61d6afb..a65ff0f5b1 100644 --- a/usr/src/lib/libast/common/hash/hashlib.h +++ b/usr/src/lib/libast/common/hash/hashlib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashlook.c b/usr/src/lib/libast/common/hash/hashlook.c index 99dec30ecc..5c4f8ff7bf 100644 --- a/usr/src/lib/libast/common/hash/hashlook.c +++ b/usr/src/lib/libast/common/hash/hashlook.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashscan.c b/usr/src/lib/libast/common/hash/hashscan.c index 9294ee6356..fc6367d464 100644 --- a/usr/src/lib/libast/common/hash/hashscan.c +++ b/usr/src/lib/libast/common/hash/hashscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashsize.c b/usr/src/lib/libast/common/hash/hashsize.c index 0016cec631..eb04554ef1 100644 --- a/usr/src/lib/libast/common/hash/hashsize.c +++ b/usr/src/lib/libast/common/hash/hashsize.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashview.c b/usr/src/lib/libast/common/hash/hashview.c index 161a2ae38f..d99134ff16 100644 --- a/usr/src/lib/libast/common/hash/hashview.c +++ b/usr/src/lib/libast/common/hash/hashview.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/hashwalk.c b/usr/src/lib/libast/common/hash/hashwalk.c index c98f764d4a..749f0c3c57 100644 --- a/usr/src/lib/libast/common/hash/hashwalk.c +++ b/usr/src/lib/libast/common/hash/hashwalk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/memhash.c b/usr/src/lib/libast/common/hash/memhash.c index e293e2bb86..1e1c308443 100644 --- a/usr/src/lib/libast/common/hash/memhash.c +++ b/usr/src/lib/libast/common/hash/memhash.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/memsum.c b/usr/src/lib/libast/common/hash/memsum.c index 6fad3b6f10..3f3ba2f750 100644 --- a/usr/src/lib/libast/common/hash/memsum.c +++ b/usr/src/lib/libast/common/hash/memsum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/strhash.c b/usr/src/lib/libast/common/hash/strhash.c index da88165683..4e40151885 100644 --- a/usr/src/lib/libast/common/hash/strhash.c +++ b/usr/src/lib/libast/common/hash/strhash.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/strkey.c b/usr/src/lib/libast/common/hash/strkey.c index 00932cc02e..d9f5ef7619 100644 --- a/usr/src/lib/libast/common/hash/strkey.c +++ b/usr/src/lib/libast/common/hash/strkey.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/hash/strsum.c b/usr/src/lib/libast/common/hash/strsum.c index f45e61f485..091e745751 100644 --- a/usr/src/lib/libast/common/hash/strsum.c +++ b/usr/src/lib/libast/common/hash/strsum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ast.h b/usr/src/lib/libast/common/include/ast.h index f9c99e866c..595a42a7d4 100644 --- a/usr/src/lib/libast/common/include/ast.h +++ b/usr/src/lib/libast/common/include/ast.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ast_dir.h b/usr/src/lib/libast/common/include/ast_dir.h index 672ce007f7..5b51a4b36b 100644 --- a/usr/src/lib/libast/common/include/ast_dir.h +++ b/usr/src/lib/libast/common/include/ast_dir.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ast_getopt.h b/usr/src/lib/libast/common/include/ast_getopt.h index 85e2b2b0ee..835b38a622 100644 --- a/usr/src/lib/libast/common/include/ast_getopt.h +++ b/usr/src/lib/libast/common/include/ast_getopt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -36,11 +36,7 @@ extern int optind; extern int optopt; extern char* optarg; -#ifndef NULL /* in case <stdlib.h> or <stdio.h> got here first */ - extern int getopt(int, char* const*, const char*); extern int getsubopt(char**, char* const*, char**); #endif - -#endif diff --git a/usr/src/lib/libast/common/include/ast_std.h b/usr/src/lib/libast/common/include/ast_std.h index 11c01b3776..2b2387b740 100644 --- a/usr/src/lib/libast/common/include/ast_std.h +++ b/usr/src/lib/libast/common/include/ast_std.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -156,6 +156,8 @@ extern char* strerror(int); #define AST_LC_COUNT 14 #define AST_LC_LANG 255 +#define AST_LC_internal 1 +#define AST_LC_setenv (1L<<27) #define AST_LC_find (1L<<28) #define AST_LC_debug (1L<<29) #define AST_LC_setlocale (1L<<30) @@ -247,8 +249,9 @@ typedef struct uint32_t env_serial; uint32_t mb_sync; + uint32_t version; - char pad[940]; + char pad[936]; } _Ast_info_t; @@ -330,7 +333,7 @@ extern int _ast_getpgrp(void); /* * and finally, standard interfaces hijacked by ast - * _ATS_STD_I delays headers that require <ast_map.h> + * _AST_STD_I delays headers that require <ast_map.h> */ #include <ast_map.h> diff --git a/usr/src/lib/libast/common/include/ast_version.h b/usr/src/lib/libast/common/include/ast_version.h index a15cf03d2c..1151836317 100644 --- a/usr/src/lib/libast/common/include/ast_version.h +++ b/usr/src/lib/libast/common/include/ast_version.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -25,4 +25,4 @@ * AT&T Research */ -#define _AST_VERSION 20090202L +#define _AST_VERSION 20100102L diff --git a/usr/src/lib/libast/common/include/ast_windows.h b/usr/src/lib/libast/common/include/ast_windows.h index 4bbd94bab5..000d2e4036 100644 --- a/usr/src/lib/libast/common/include/ast_windows.h +++ b/usr/src/lib/libast/common/include/ast_windows.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ccode.h b/usr/src/lib/libast/common/include/ccode.h index 9c33ce2cc7..c3b63a081e 100644 --- a/usr/src/lib/libast/common/include/ccode.h +++ b/usr/src/lib/libast/common/include/ccode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -34,7 +34,7 @@ #ifndef _CHARCODE_H #define _CHARCODE_H 1 -#include <ast.h> +#include <ast_common.h> #include <ast_ccode.h> typedef struct Ccmap_s diff --git a/usr/src/lib/libast/common/include/cdt.h b/usr/src/lib/libast/common/include/cdt.h index f2f0389296..1044207b76 100644 --- a/usr/src/lib/libast/common/include/cdt.h +++ b/usr/src/lib/libast/common/include/cdt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/cmdarg.h b/usr/src/lib/libast/common/include/cmdarg.h index 3dbaf20e83..59c12affad 100644 --- a/usr/src/lib/libast/common/include/cmdarg.h +++ b/usr/src/lib/libast/common/include/cmdarg.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/debug.h b/usr/src/lib/libast/common/include/debug.h index 76c21ca069..df9931e07b 100644 --- a/usr/src/lib/libast/common/include/debug.h +++ b/usr/src/lib/libast/common/include/debug.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/dt.h b/usr/src/lib/libast/common/include/dt.h index b0bb7c54db..a1d8507b44 100644 --- a/usr/src/lib/libast/common/include/dt.h +++ b/usr/src/lib/libast/common/include/dt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/error.h b/usr/src/lib/libast/common/include/error.h index 848f760817..d2581efa36 100644 --- a/usr/src/lib/libast/common/include/error.h +++ b/usr/src/lib/libast/common/include/error.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -55,7 +55,7 @@ #ifndef ERROR_translate #define ERROR_translating() (error_info.translate&&(ast.locale.set&(1<<AST_LC_MESSAGES))) -#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)l,(const char*)i,(const char*)d,(const char*)m):(m)) +#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)(l),(const char*)(i),(const char*)(d),(const char*)(m)):(char*)(m)) #endif #define ERROR_INFO 0 /* info message -- no err_id */ diff --git a/usr/src/lib/libast/common/include/find.h b/usr/src/lib/libast/common/include/find.h index b7d5810202..8d18c0e8d6 100644 --- a/usr/src/lib/libast/common/include/find.h +++ b/usr/src/lib/libast/common/include/find.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/fnv.h b/usr/src/lib/libast/common/include/fnv.h index 743b6c26fe..981cbf0880 100644 --- a/usr/src/lib/libast/common/include/fnv.h +++ b/usr/src/lib/libast/common/include/fnv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/fs3d.h b/usr/src/lib/libast/common/include/fs3d.h index 37338ab898..9240ce010a 100644 --- a/usr/src/lib/libast/common/include/fs3d.h +++ b/usr/src/lib/libast/common/include/fs3d.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/fts.h b/usr/src/lib/libast/common/include/fts.h index 8425145c35..a8f4f16a61 100644 --- a/usr/src/lib/libast/common/include/fts.h +++ b/usr/src/lib/libast/common/include/fts.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -32,7 +32,9 @@ #ifndef _FTS_H #define _FTS_H -#include <ls.h> +#include <ast_std.h> +#include <ast_fs.h> +#include <ast_mode.h> /* * fts_open flags diff --git a/usr/src/lib/libast/common/include/ftwalk.h b/usr/src/lib/libast/common/include/ftwalk.h index 9557c1ea51..0e70bc3d1b 100644 --- a/usr/src/lib/libast/common/include/ftwalk.h +++ b/usr/src/lib/libast/common/include/ftwalk.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/glob.h b/usr/src/lib/libast/common/include/glob.h index 1554c435e1..2f405922ae 100644 --- a/usr/src/lib/libast/common/include/glob.h +++ b/usr/src/lib/libast/common/include/glob.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/hash.h b/usr/src/lib/libast/common/include/hash.h index e118141c05..36e33011cf 100644 --- a/usr/src/lib/libast/common/include/hash.h +++ b/usr/src/lib/libast/common/include/hash.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/hashkey.h b/usr/src/lib/libast/common/include/hashkey.h index 55158d62fe..8e9c793e7a 100644 --- a/usr/src/lib/libast/common/include/hashkey.h +++ b/usr/src/lib/libast/common/include/hashkey.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/hashpart.h b/usr/src/lib/libast/common/include/hashpart.h index 898fdbb674..2d33003c57 100644 --- a/usr/src/lib/libast/common/include/hashpart.h +++ b/usr/src/lib/libast/common/include/hashpart.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ip6.h b/usr/src/lib/libast/common/include/ip6.h index 37de82c03c..0f89ae9a64 100644 --- a/usr/src/lib/libast/common/include/ip6.h +++ b/usr/src/lib/libast/common/include/ip6.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/ls.h b/usr/src/lib/libast/common/include/ls.h index b3d49d3e5b..0fbe0df523 100644 --- a/usr/src/lib/libast/common/include/ls.h +++ b/usr/src/lib/libast/common/include/ls.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/magic.h b/usr/src/lib/libast/common/include/magic.h index c143d4ed1f..4ea4393840 100644 --- a/usr/src/lib/libast/common/include/magic.h +++ b/usr/src/lib/libast/common/include/magic.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/magicid.h b/usr/src/lib/libast/common/include/magicid.h index 3b5acf7812..178a62cb26 100644 --- a/usr/src/lib/libast/common/include/magicid.h +++ b/usr/src/lib/libast/common/include/magicid.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/mc.h b/usr/src/lib/libast/common/include/mc.h index b66e42e54b..f4ac6f1934 100644 --- a/usr/src/lib/libast/common/include/mc.h +++ b/usr/src/lib/libast/common/include/mc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/mime.h b/usr/src/lib/libast/common/include/mime.h index 114e178475..8989a366d9 100644 --- a/usr/src/lib/libast/common/include/mime.h +++ b/usr/src/lib/libast/common/include/mime.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/mnt.h b/usr/src/lib/libast/common/include/mnt.h index 08400acd94..bf9c0a44fd 100644 --- a/usr/src/lib/libast/common/include/mnt.h +++ b/usr/src/lib/libast/common/include/mnt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/modecanon.h b/usr/src/lib/libast/common/include/modecanon.h index 058f50a89e..57cabb5523 100644 --- a/usr/src/lib/libast/common/include/modecanon.h +++ b/usr/src/lib/libast/common/include/modecanon.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/modex.h b/usr/src/lib/libast/common/include/modex.h index 675b2168e5..9a9f557ab0 100644 --- a/usr/src/lib/libast/common/include/modex.h +++ b/usr/src/lib/libast/common/include/modex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/namval.h b/usr/src/lib/libast/common/include/namval.h index f8f65ab2cb..49e777be1d 100644 --- a/usr/src/lib/libast/common/include/namval.h +++ b/usr/src/lib/libast/common/include/namval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/option.h b/usr/src/lib/libast/common/include/option.h index 9e96ee7998..5cacaf5bd0 100644 --- a/usr/src/lib/libast/common/include/option.h +++ b/usr/src/lib/libast/common/include/option.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/proc.h b/usr/src/lib/libast/common/include/proc.h index 000f638b21..9b3e80c41d 100644 --- a/usr/src/lib/libast/common/include/proc.h +++ b/usr/src/lib/libast/common/include/proc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/recfmt.h b/usr/src/lib/libast/common/include/recfmt.h index 6d7999f263..5ea55b3c6c 100644 --- a/usr/src/lib/libast/common/include/recfmt.h +++ b/usr/src/lib/libast/common/include/recfmt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/regex.h b/usr/src/lib/libast/common/include/regex.h index 3e9400e8ed..3d0132a7ec 100644 --- a/usr/src/lib/libast/common/include/regex.h +++ b/usr/src/lib/libast/common/include/regex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -65,10 +65,11 @@ #define REG_MULTIREF 0x00100000 /* multiple digit backrefs */ #define REG_MUSTDELIM 0x08000000 /* all delimiters required */ #define REG_DELIMITED 0x10000000 /* pattern[0] is delimiter */ -#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ +#define REG_CLASS_ESCAPE 0x80000000 /* \ escapes in [...] */ #define REG_SHELL_DOT 0x00200000 /* explicit leading . match */ #define REG_SHELL_ESCAPED 0x00400000 /* \ not special */ +#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ #define REG_SHELL_PATH 0x00800000 /* explicit / match */ #define REG_REGEXP 0x40000000 /* <regexp.h> compatibility */ @@ -116,7 +117,7 @@ #define REG_BADBR 10 /* invalid {...} digits */ #define REG_ERANGE 11 /* invalid [...] range endpoint */ #define REG_ESPACE 12 /* out of space */ -#define REG_BADRPT 13 /* unary op not preceeded by re */ +#define REG_BADRPT 13 /* unary op not preceded by re */ #define REG_ENULL 14 /* empty subexpr in pattern */ #define REG_ECOUNT 15 /* re component count overflow */ #define REG_BADESC 16 /* invalid \char escape */ @@ -129,7 +130,7 @@ struct regex_s; typedef struct regex_s regex_t; struct regdisc_s; typedef struct regdisc_s regdisc_t; typedef int (*regclass_t)(int); -typedef int32_t regflags_t; +typedef uint32_t regflags_t; typedef int regoff_t; typedef int (*regerror_t)(const regex_t*, regdisc_t*, int, ...); typedef void* (*regcomp_t)(const regex_t*, const char*, size_t, regdisc_t*); diff --git a/usr/src/lib/libast/common/include/sfdisc.h b/usr/src/lib/libast/common/include/sfdisc.h index b7b0781e38..9c9c222914 100644 --- a/usr/src/lib/libast/common/include/sfdisc.h +++ b/usr/src/lib/libast/common/include/sfdisc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/sfio.h b/usr/src/lib/libast/common/include/sfio.h index 3506f5c955..da6ebfd9f2 100644 --- a/usr/src/lib/libast/common/include/sfio.h +++ b/usr/src/lib/libast/common/include/sfio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/sfio_s.h b/usr/src/lib/libast/common/include/sfio_s.h index 46b2348b9c..7f7483cc79 100644 --- a/usr/src/lib/libast/common/include/sfio_s.h +++ b/usr/src/lib/libast/common/include/sfio_s.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/sfio_t.h b/usr/src/lib/libast/common/include/sfio_t.h index 5c819865c8..4240316aef 100644 --- a/usr/src/lib/libast/common/include/sfio_t.h +++ b/usr/src/lib/libast/common/include/sfio_t.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/shcmd.h b/usr/src/lib/libast/common/include/shcmd.h index 4189f92c39..e657add6af 100644 --- a/usr/src/lib/libast/common/include/shcmd.h +++ b/usr/src/lib/libast/common/include/shcmd.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/stack.h b/usr/src/lib/libast/common/include/stack.h index a9e0451567..0c80fd68c1 100644 --- a/usr/src/lib/libast/common/include/stack.h +++ b/usr/src/lib/libast/common/include/stack.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/stak.h b/usr/src/lib/libast/common/include/stak.h index a7b9185553..621684e9bf 100644 --- a/usr/src/lib/libast/common/include/stak.h +++ b/usr/src/lib/libast/common/include/stak.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/stk.h b/usr/src/lib/libast/common/include/stk.h index 5fd7430291..96bff0baa0 100644 --- a/usr/src/lib/libast/common/include/stk.h +++ b/usr/src/lib/libast/common/include/stk.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/swap.h b/usr/src/lib/libast/common/include/swap.h index 868e3fd418..3bf037756b 100644 --- a/usr/src/lib/libast/common/include/swap.h +++ b/usr/src/lib/libast/common/include/swap.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/tar.h b/usr/src/lib/libast/common/include/tar.h index a9e6af4585..6d410b6828 100644 --- a/usr/src/lib/libast/common/include/tar.h +++ b/usr/src/lib/libast/common/include/tar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/times.h b/usr/src/lib/libast/common/include/times.h index ec7f14d5ec..eeb8d57e1f 100644 --- a/usr/src/lib/libast/common/include/times.h +++ b/usr/src/lib/libast/common/include/times.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/tm.h b/usr/src/lib/libast/common/include/tm.h index 84b3ae182c..b650d5de53 100644 --- a/usr/src/lib/libast/common/include/tm.h +++ b/usr/src/lib/libast/common/include/tm.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/tok.h b/usr/src/lib/libast/common/include/tok.h index 0d23994eca..aae1837428 100644 --- a/usr/src/lib/libast/common/include/tok.h +++ b/usr/src/lib/libast/common/include/tok.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/usage.h b/usr/src/lib/libast/common/include/usage.h index e2bea60f9c..19d2b0fc14 100644 --- a/usr/src/lib/libast/common/include/usage.h +++ b/usr/src/lib/libast/common/include/usage.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/vdb.h b/usr/src/lib/libast/common/include/vdb.h index c03e85e5b3..1f144c9e20 100644 --- a/usr/src/lib/libast/common/include/vdb.h +++ b/usr/src/lib/libast/common/include/vdb.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/vecargs.h b/usr/src/lib/libast/common/include/vecargs.h index d36a403752..3d688b5b2b 100644 --- a/usr/src/lib/libast/common/include/vecargs.h +++ b/usr/src/lib/libast/common/include/vecargs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/include/vmalloc.h b/usr/src/lib/libast/common/include/vmalloc.h index 0115078cf5..f13cc58879 100644 --- a/usr/src/lib/libast/common/include/vmalloc.h +++ b/usr/src/lib/libast/common/include/vmalloc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ -#define VMALLOC_VERSION 20070911L +#define VMALLOC_VERSION 20100101L #if _PACKAGE_ast #include <ast_std.h> @@ -39,6 +39,7 @@ typedef struct _vmalloc_s Vmalloc_t; typedef struct _vmstat_s Vmstat_t; typedef struct _vmdisc_s Vmdisc_t; typedef struct _vmethod_s Vmethod_t; +typedef struct _vmdata_s Vmdata_t; typedef Void_t* (*Vmemory_f)_ARG_((Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*)); typedef int (*Vmexcept_f)_ARG_((Vmalloc_t*, int, Void_t*, Vmdisc_t*)); @@ -75,6 +76,9 @@ struct _vmalloc_s char* file; /* file name */ int line; /* line number */ Void_t* func; /* calling function */ + Vmdisc_t* disc; /* discipline to get space */ + Vmdata_t* data; /* the real region data */ + Vmalloc_t* next; /* linked list of regions */ #ifdef _VM_PRIVATE_ _VM_PRIVATE_ #endif @@ -172,7 +176,8 @@ extern int vmtrbusy _ARG_((Vmalloc_t*)); extern int vmstat _ARG_((Vmalloc_t*, Vmstat_t*)); extern int vmwalk _ARG_((Vmalloc_t*, - int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*))); + int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*,Void_t*), + Void_t*)); extern char* vmstrdup _ARG_((Vmalloc_t*, const char*)); #if !defined(_BLD_vmalloc) && !defined(_AST_STD_H) && \ @@ -311,5 +316,6 @@ _END_EXTERNS_ (VM_RSMOVE) ) #define vmnewof(v,p,t,n,x) (t*)vmresize((v), (p), sizeof(t)*(n)+(x), \ (VM_RSMOVE|VM_RSCOPY|VM_RSZERO) ) +#define vmdata(vm) ((Void_t*)(_VM_(vm)->data)) #endif /* _VMALLOC_H */ diff --git a/usr/src/lib/libast/common/include/wait.h b/usr/src/lib/libast/common/include/wait.h index ed8a1d3209..b50e6f0be2 100644 --- a/usr/src/lib/libast/common/include/wait.h +++ b/usr/src/lib/libast/common/include/wait.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/man/astsa.3 b/usr/src/lib/libast/common/man/astsa.3 index 02c803aee6..5b588a8ebe 100644 --- a/usr/src/lib/libast/common/man/astsa.3 +++ b/usr/src/lib/libast/common/man/astsa.3 @@ -45,7 +45,7 @@ .SS "\\$1" .. .ta 1.0i 2.0i 3.0i 4.0i 5.0i -.TH AST 3 +.TH ASTSA 3 .SH NAME astsa \- standalone libast support .SH SYNOPSIS diff --git a/usr/src/lib/libast/common/man/chr.3 b/usr/src/lib/libast/common/man/chr.3 index 91683ed358..8d57648b49 100644 --- a/usr/src/lib/libast/common/man/chr.3 +++ b/usr/src/lib/libast/common/man/chr.3 @@ -83,11 +83,11 @@ The following .B \e escape sequences are recognized: .TP -.LI \e ooo +.RI \e ooo The character represented by the octal code .IR ooo . .TP -.LI \ex xx +.RI \ex xx The character represented by the hex code .IR xx . .TP diff --git a/usr/src/lib/libast/common/man/fmt.3 b/usr/src/lib/libast/common/man/fmt.3 index b71772fc92..dbe1aab2ec 100644 --- a/usr/src/lib/libast/common/man/fmt.3 +++ b/usr/src/lib/libast/common/man/fmt.3 @@ -40,6 +40,7 @@ .SH NAME fmt \- string formatting routines .SH SYNOPSIS +.EX #include <ast.h> #include <ls.h> @@ -101,6 +102,7 @@ seconds. The two largest time units are used, limiting the return value length to at most 6 characters. The units are: +.RS .TP .B s seconds @@ -123,6 +125,7 @@ years .TP .B S scores +.RE .PP .L fmterror returns the system error message text for the error number diff --git a/usr/src/lib/libast/common/man/fmtls.3 b/usr/src/lib/libast/common/man/fmtls.3 index 7d3c099e17..50d872b8e1 100644 --- a/usr/src/lib/libast/common/man/fmtls.3 +++ b/usr/src/lib/libast/common/man/fmtls.3 @@ -43,8 +43,7 @@ fmtls \- format file information in buffer .EX #include <ls.h> -char* fmtls(char* \fIbuf\fP, char* \fIname\fP, struct stat* \fIst\fP, - char* \fIinfo\fP, char* \fIlink\fP, int \fIflags\fP); +char* fmtls(char* \fIbuf\fP, char* \fIname\fP, struct stat* \fIst\fP, char* \fIinfo\fP, char* \fIlink\fP, int \fIflags\fP); .EE .SH DESCRIPTION .L fmtls diff --git a/usr/src/lib/libast/common/man/hash.3 b/usr/src/lib/libast/common/man/hash.3 index 45029280c5..162d62d7fb 100644 --- a/usr/src/lib/libast/common/man/hash.3 +++ b/usr/src/lib/libast/common/man/hash.3 @@ -38,7 +38,7 @@ .. .TH HASH 3 .SH NAME -hash \- hash table support \- obsolete \- use \fBcdt\fP +hash \- hash table support (obsolete: use \fBcdt\fP instead) .SH SYNOPSIS .L "#include <hash.h>" .SH DESCRIPTION diff --git a/usr/src/lib/libast/common/man/sfdisc.3 b/usr/src/lib/libast/common/man/sfdisc.3 index d669a81217..f0ce5b0dcd 100644 --- a/usr/src/lib/libast/common/man/sfdisc.3 +++ b/usr/src/lib/libast/common/man/sfdisc.3 @@ -105,7 +105,7 @@ When inserted into a stream \f5f\fP, this discipline will cause all input operations on \f5f\fP to come from the merged data stream. \f5dcnewunion()\fP returns the discipline on success and \f5NULL\fP on failure. -.SH ACKNOWLEDGEMENTS +.SH ACKNOWLEDGMENTS Dave Korn contributed the substream discipline. Jim Arnold contributed the lzw discipline. diff --git a/usr/src/lib/libast/common/man/stak.3 b/usr/src/lib/libast/common/man/stak.3 index dc95f39432..5feac69db3 100644 --- a/usr/src/lib/libast/common/man/stak.3 +++ b/usr/src/lib/libast/common/man/stak.3 @@ -1,7 +1,7 @@ .fp 5 CW .TH STAK 3 .SH NAME -\fBstak\fR \- data stack storage library \- obsolete \- use \fBstk\fR +\fBstak\fR \- data stack storage library (obsolete: use \fBstk\fR instead) .SH SYNOPSIS .ta .75i 1.5i 2.25i 3i 3.75i 4.5i 5.25i 6i .PP diff --git a/usr/src/lib/libast/common/man/stropt.3 b/usr/src/lib/libast/common/man/stropt.3 index 778ab4f255..f2a8dae882 100644 --- a/usr/src/lib/libast/common/man/stropt.3 +++ b/usr/src/lib/libast/common/man/stropt.3 @@ -93,7 +93,7 @@ points to the option name value pair from .I n is 0 if .B no -preceeded the option +preceded the option .I name and .I v diff --git a/usr/src/lib/libast/common/man/vmalloc.3 b/usr/src/lib/libast/common/man/vmalloc.3 index 8853db4afa..e2df4990c5 100644 --- a/usr/src/lib/libast/common/man/vmalloc.3 +++ b/usr/src/lib/libast/common/man/vmalloc.3 @@ -44,7 +44,7 @@ vmalloc \- virtual memory allocation .nf .MW "Vmalloc_t* vmregion(Void_t* addr);" .MW "Void_t* vmsegment(Vmalloc_t* region, Void_t* addr);" -.MW "int vmwalk(Vmalloc_t* region, int(*walkf)(Vmalloc_t*, Void_t*, size_t, Vmdisc_t*);" +.MW "int vmwalk(Vmalloc_t* region, int(*walkf)(Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*, Void_t*), Void_t* handle);" .MW "long vmaddr(Vmalloc_t* region, Void_t* addr);" .MW "long vmsize(Vmalloc_t* region, Void_t* addr);" .MW "int vmstat(Vmalloc_t* vm, Vmstat_t* statb);" @@ -426,9 +426,10 @@ It returns the address of a found segment or \f5NULL\fP if none found. .I vmwalk walks all segments in \fIregion\fP or if \fIregion\fP is \f5NULL\fP, all segments in all regions. -At each segment, \fI(*walkf)(vm,addr,size,disc)\fP +At each segment, \fI(*walkf)(vm,addr,size,segno,disc,handle)\fP is called where \fIvm\fP is the region, \fIaddr\fP is the segment, -\fIsize\fP is the size of the segment, and \fIdisc\fP is the region's discipline. +\fIsize\fP is the size of the segment, \fIsegno\fP is the segment ordinal counting from 0, +\fIdisc\fP is the region's discipline, and \fIhandle\fP is the user supplied \fIvmwalk\fP handle. If \fIwalkf\fP returns a negative value, the walk stops and returns the same value. On success, \fIvmwalk\fP returns 0; otherwise, it returns \-1. .PP @@ -514,49 +515,90 @@ The functions .PP The \fImalloc\fP functions are instrumented for run-time debugging, profiling and tracing. -When these modes are enable, time and space performance will be affected. +When these modes are enabled, time and space performance will be affected. For accurate reporting of files and line numbers, -code should include \f5vmalloc.h\fP and compile with \f5-DVMFL\fP. - -The following environment variables should be set before any memory allocation -(e.g., before a process starts). They drive different modes: -.TP -.I VMETHOD -This defines the method to use for allocation. -Its value should be one of the strings: -\fIVmbest, Vmdebug, Vmprofile, Vmlast, Vmpool\fP. -The 'V' can be in lower case. -.TP -.I VMDEBUG -This is ignored if -a method other than \f5Vmdebug\fP has been selected with \fIVMETHOD\fP. -\fIVMDEBUG\fP can be any combination of `a', -a decimal number and a list of hexadecimal numbers. -`a' causes the program to abort on any discovered allocation error. -A hexadecimal number starts with either \fI0x\fP or \fI0X\fP -and defines an address to watch (see \fIvmdbwatch\fP). -Any other number is taken to be decimal and defines a period \fIp\fP -to check the arena for integrity. The default period is 1, ie, the -arena is checked on every call to a \fImalloc\fP function. -Other letters not part of the defined set are ignored. -.TP -.I VMPROFILE -This is ignored if a method other than \f5Vmprofile\fP -has been selected by \fIVMETHOD\fP or \fIVMDEBUG\fP. -\fIVMPROFILE\fP defines a file name to store profile data. -Each instance of the pattern `%p' found in \fIVMPROFILE\fP -is transformed to the process id of the running process. -If the file cannot be created, file descriptor 2 (standard error) -is used for output. -.TP -.I VMTRACE -If this defines a valid writable file, trace messages of all allocation calls -are written to the given file (see \fIvmopen()\fP and \fIvmtrace()\fP). -Similar to \fIVMPROFILE\fP, each instance of the pattern `%p' found -in \fIVMTRACE\fP is turned to the process id of the running process. +code should include \f5vmalloc.h\fP and compile with either \f5-DVMFL\fP +or \f5-D_BLD_debug\fP (defined by \fBnmake\fP(1) for \f5-g\fP compilations). +The +.I VMALLOC_OPTIONS +environment variable should be set before any memory allocation +(e.g., before a process starts). Its value is a space-separated list of +[\fBno\fP]\fIname\fP[=\fIvalue\fP] options that control runtime +debugging/profiling and other modes: +.TP +.B abort +If Vmregion==Vmdebug then VM_DBABORT is set, otherwise _BLD_debug +enabled assertions abort() on failure. +.TP +.B check +If Vmregion==Vmbest then the region is checked after every operation. +.TP +.BI method =method +Sets Vmregion=\fImethod\fP if not already set. +.I method +(\fBVm\fP prefix optional) may be one of: +.RS +.TP +.B best +.TP +.B debug +.TP +.B last +.TP +.B profile +.RE +.TP +.B mmap +Prefer mmap() over brk() for region allocation. +.TP +.BI period =n +Sets Vmregion=Vmdebug if not already set. If Vmregion==Vmdebug then +the region is checked every \fIn\fP operations. +.TP +.BI profile =file +Sets Vmregion=Vmprofile if not already set. If Vmregion==Vmprofile then +profile info is printed to \fIfile\fP. +.TP +.B region +If Vmregion==Vmbest then region block frees verify +that the block belongs to the region. +.BI start =n +Sets Vmregion=Vmdebug if not already set. If Vmregion==Vmdebug then +region checking starts after \fIn\fP operations. +.TP +.BI trace =file +Operation trace info is printed to \fIfile\fP. +.TP +.BI warn =file +Sets Vmregion=Vmdebug if not already set. If Vmregion==Vmdebug then +warnings are printed to \fIfile\fP. +.TP +.BI watch =address +Sets Vmregion=Vmdebug if not already set. If Vmregion==Vmdebug then +operations on \fIaddress\fP are traced. +.PP +Output files are created if they don't exist. +.BI & n +and +.BI /dev/fd/ n +name the file descriptor +.I n +which must be open for writing. The pattern +.B %p +in a file name is replaced by the current process ID. +.I VMALLOC_OPTIONS +combines the features of these previously used env vars { +.I "VMDEBUG VMETHOD VMPROFILE VMTRACE" +}. +For compatibility, if +.I VMALLOC_OPTIONS +is not defined, then { +.I "VMDEBUG VMETHOD VMPROFILE VMTRACE" +} will be checked -- this will be dropped in a future release. .SH RECENT CHANGES -\f5Vmlast\fP: allocated blocks are now allowed to be resized (09/1998). +\f5Vmlast\fP: allocated blocks are now allowed to be resized (1998-09). +\fIVMALLOC_OPTIONS\fP now controls all runtime settings (2010-01). .SH SEE ALSO \fImtreplay\fP(1), \fImalloc\fP(3). diff --git a/usr/src/lib/libast/common/misc/astintercept.c b/usr/src/lib/libast/common/misc/astintercept.c index 23f5322489..a23658d84e 100644 --- a/usr/src/lib/libast/common/misc/astintercept.c +++ b/usr/src/lib/libast/common/misc/astintercept.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/cmdarg.c b/usr/src/lib/libast/common/misc/cmdarg.c index cdcbd02b87..ae2810aaa3 100644 --- a/usr/src/lib/libast/common/misc/cmdarg.c +++ b/usr/src/lib/libast/common/misc/cmdarg.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/debug.c b/usr/src/lib/libast/common/misc/debug.c index 0ac2459f36..7c73276856 100644 --- a/usr/src/lib/libast/common/misc/debug.c +++ b/usr/src/lib/libast/common/misc/debug.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/error.c b/usr/src/lib/libast/common/misc/error.c index 1999468db9..cf7c015084 100644 --- a/usr/src/lib/libast/common/misc/error.c +++ b/usr/src/lib/libast/common/misc/error.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/errorf.c b/usr/src/lib/libast/common/misc/errorf.c index f909c3d31a..18d5284003 100644 --- a/usr/src/lib/libast/common/misc/errorf.c +++ b/usr/src/lib/libast/common/misc/errorf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/errormsg.c b/usr/src/lib/libast/common/misc/errormsg.c index 8845b22209..a8eef82a98 100644 --- a/usr/src/lib/libast/common/misc/errormsg.c +++ b/usr/src/lib/libast/common/misc/errormsg.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/errorx.c b/usr/src/lib/libast/common/misc/errorx.c index 214e0734d4..8cda4be51a 100644 --- a/usr/src/lib/libast/common/misc/errorx.c +++ b/usr/src/lib/libast/common/misc/errorx.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/fastfind.c b/usr/src/lib/libast/common/misc/fastfind.c index 0f3e043d39..c5b86b679c 100644 --- a/usr/src/lib/libast/common/misc/fastfind.c +++ b/usr/src/lib/libast/common/misc/fastfind.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/findlib.h b/usr/src/lib/libast/common/misc/findlib.h index f48ba32665..78669ddbe7 100644 --- a/usr/src/lib/libast/common/misc/findlib.h +++ b/usr/src/lib/libast/common/misc/findlib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/fmtrec.c b/usr/src/lib/libast/common/misc/fmtrec.c index 371c373e3f..5ebaa83b9d 100644 --- a/usr/src/lib/libast/common/misc/fmtrec.c +++ b/usr/src/lib/libast/common/misc/fmtrec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/fs3d.c b/usr/src/lib/libast/common/misc/fs3d.c index a486448021..bbd63a6240 100644 --- a/usr/src/lib/libast/common/misc/fs3d.c +++ b/usr/src/lib/libast/common/misc/fs3d.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/fts.c b/usr/src/lib/libast/common/misc/fts.c index 8506f84fe9..05c801690d 100644 --- a/usr/src/lib/libast/common/misc/fts.c +++ b/usr/src/lib/libast/common/misc/fts.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/ftwalk.c b/usr/src/lib/libast/common/misc/ftwalk.c index ea33821944..6ad83f815e 100644 --- a/usr/src/lib/libast/common/misc/ftwalk.c +++ b/usr/src/lib/libast/common/misc/ftwalk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/ftwflags.c b/usr/src/lib/libast/common/misc/ftwflags.c index 6a2fe25e08..9e7ee678b9 100644 --- a/usr/src/lib/libast/common/misc/ftwflags.c +++ b/usr/src/lib/libast/common/misc/ftwflags.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/getcwd.c b/usr/src/lib/libast/common/misc/getcwd.c index d6879304ca..2f60b17129 100644 --- a/usr/src/lib/libast/common/misc/getcwd.c +++ b/usr/src/lib/libast/common/misc/getcwd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/getenv.c b/usr/src/lib/libast/common/misc/getenv.c index 5391beeaa8..9252938d00 100644 --- a/usr/src/lib/libast/common/misc/getenv.c +++ b/usr/src/lib/libast/common/misc/getenv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -38,7 +38,12 @@ __STDPP__directive pragma pp:nohide getenv * UWIN: no _ast_getenv macro map to maintain ast54 compatibility */ -Intercepts_t intercepts = { 0 }; +Intercepts_t intercepts +#if _BLD_3d + ; +#else + = { 0 }; +#endif #if _UWIN && !defined(getenv) diff --git a/usr/src/lib/libast/common/misc/glob.c b/usr/src/lib/libast/common/misc/glob.c index 999db2d3cd..a0fb74c0a5 100644 --- a/usr/src/lib/libast/common/misc/glob.c +++ b/usr/src/lib/libast/common/misc/glob.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/intercepts.h b/usr/src/lib/libast/common/misc/intercepts.h index 0f1ecc917d..6afe67d5a8 100644 --- a/usr/src/lib/libast/common/misc/intercepts.h +++ b/usr/src/lib/libast/common/misc/intercepts.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/magic.c b/usr/src/lib/libast/common/misc/magic.c index 6b086a3b08..f4b3037fc0 100644 --- a/usr/src/lib/libast/common/misc/magic.c +++ b/usr/src/lib/libast/common/misc/magic.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/mime.c b/usr/src/lib/libast/common/misc/mime.c index d5e9debb37..59b05068ac 100644 --- a/usr/src/lib/libast/common/misc/mime.c +++ b/usr/src/lib/libast/common/misc/mime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/mimelib.h b/usr/src/lib/libast/common/misc/mimelib.h index 3c55acebf5..51dc072507 100644 --- a/usr/src/lib/libast/common/misc/mimelib.h +++ b/usr/src/lib/libast/common/misc/mimelib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/mimetype.c b/usr/src/lib/libast/common/misc/mimetype.c index 7df8b6c0da..526bbc7120 100644 --- a/usr/src/lib/libast/common/misc/mimetype.c +++ b/usr/src/lib/libast/common/misc/mimetype.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/optctx.c b/usr/src/lib/libast/common/misc/optctx.c index 067236b5fd..e86deb1ec7 100644 --- a/usr/src/lib/libast/common/misc/optctx.c +++ b/usr/src/lib/libast/common/misc/optctx.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/optesc.c b/usr/src/lib/libast/common/misc/optesc.c index 3e29f5051a..26c6892fab 100644 --- a/usr/src/lib/libast/common/misc/optesc.c +++ b/usr/src/lib/libast/common/misc/optesc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/optget.c b/usr/src/lib/libast/common/misc/optget.c index 551051dca3..8a11303b03 100644 --- a/usr/src/lib/libast/common/misc/optget.c +++ b/usr/src/lib/libast/common/misc/optget.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -383,6 +383,14 @@ show(register char* s) *t++ = '\\'; c = 'f'; break; + case '\n': + *t++ = '\\'; + c = 'n'; + break; + case '\t': + *t++ = '\\'; + c = 't'; + break; case '\v': *t++ = '\\'; c = 'v'; @@ -543,7 +551,7 @@ skip(register char* s, register int t1, register int t2, register int t3, regist */ static int -match(char* s, char* t, int version, const char* catalog) +match(char* s, char* t, int version, const char* id, const char* catalog) { register char* w; register char* x; @@ -563,7 +571,7 @@ match(char* s, char* t, int version, const char* catalog) { w = skip(t, ':', '?', 0, 1, 0, 0, version); w = sfprints("%-.*s", w - t, t); - x = T(error_info.id, catalog, w); + x = T(id, catalog, w); if (x == w) continue; } @@ -667,7 +675,7 @@ search(const void* tab, size_t num, size_t siz, char* s) register char* e; for (e = (p = (char*)tab) + num * siz; p < e; p += siz) - if (match(s, *((char**)p), -1, NiL)) + if (match(s, *((char**)p), -1, NiL, NiL)) return (void*)p; return 0; } @@ -710,6 +718,7 @@ static int init(register char* s, Optpass_t* p) { register char* t; + register char* u; register int c; register int a; register int n; @@ -740,6 +749,7 @@ init(register char* s, Optpass_t* p) p->prefix = 2; p->section = 1; p->flags = 0; + p->id = error_info.id; p->catalog = 0; s = next(s, 0); if (*s == ':') @@ -809,32 +819,56 @@ init(register char* s, Optpass_t* p) } } while (*s) - if (*s++ == ']' && *s++ == '[') + if (*s++ == ']') { - if (*s++ != '-') - { - if (!error_info.id && strneq(s - 1, "+NAME?", 6)) - { - for (t = s += 5; *t && *t != ' ' && *t != ']'; t++); - error_info.id = save(sfprints("%-.*s", t - s, s)); - } - break; - } - if (*s == '-') + while (isspace(*s)) s++; - if (strneq(s, "catalog?", 8)) + if (*s++ == '[') { - s += 8; - if ((t = strchr(s, ']')) && (!error_info.id || (t - s) != strlen(error_info.id) || !strneq(s, error_info.id, t - s))) - p->catalog = save(sfprints("%-.*s", t - s, s)); - if (error_info.id) + if (*s++ != '-') + { + if (strneq(s - 1, "+NAME?", 6)) + { + for (s += 5; *s == '\a' || *s == '\b' || *s == '\v' || *s == ' '; s++); + if (*s != '\f') + { + for (t = s; *t && *t != ' ' && *t != ']'; t++); + if (t > s) + { + u = t; + if (*(t - 1) == '\a' || *(t - 1) == '\b' || *(t - 1) == '\v') + t--; + if (t > s) + { + while (*u == ' ' || *u == '\\') + u++; + if (*u == '-' || *u == ']') + p->id = save(sfprints("%-.*s", t - s, s)); + } + } + } + } break; + } + if (*s == '-') + s++; + if (strneq(s, "catalog?", 8)) + p->catalog = s += 8; } } } + if (!error_info.id) + { + if (!(error_info.id = p->id)) + p->id = "command"; + } + else if (p->id == error_info.id) + p->id = save(p->id); + if (s = p->catalog) + p->catalog = ((t = strchr(s, ']')) && (!p->id || (t - s) != strlen(p->id) || !strneq(s, p->id, t - s))) ? save(sfprints("%-.*s", t - s, s)) : (char*)0; if (!p->catalog) { - if (opt_info.disc && opt_info.disc->catalog && (!error_info.id || !streq(opt_info.disc->catalog, error_info.id))) + if (opt_info.disc && opt_info.disc->catalog && (!p->id || !streq(opt_info.disc->catalog, p->id))) p->catalog = opt_info.disc->catalog; else p->catalog = ID; @@ -872,7 +906,8 @@ init(register char* s, Optpass_t* p) sfputc(opt_info.state->cp, '['); sfputc(opt_info.state->cp, '-'); sfputc(opt_info.state->cp, ']'); - while (c = *s++) + c = *s++; + while (c) { sfputc(opt_info.state->cp, '['); sfputc(opt_info.state->cp, c); @@ -885,24 +920,21 @@ init(register char* s, Optpass_t* p) { while ((c = *s++) && c != ')') sfputc(opt_info.state->cp, c); - if (!c || *s != '(') + if (!c || (c = *s++) != '(') break; sfputc(opt_info.state->cp, '|'); - s++; } } sfputc(opt_info.state->cp, ']'); if (a) sfputr(opt_info.state->cp, ":[string]", -1); - if (!c) - break; } if (!(p->oopts = s = sfstruse(opt_info.state->cp))) return -1; s += n; } p->opts = s; - message((-1, "version=%d prefix=%d section=%d flags=%04x catalog=%s", p->version, p->prefix, p->section, p->flags, p->catalog)); + message((-1, "version=%d prefix=%d section=%d flags=%04x id=%s catalog=%s", p->version, p->prefix, p->section, p->flags, p->id, p->catalog)); return 0; } @@ -939,20 +971,18 @@ font(int f, int style, int set) */ static char* -expand(register char* s, register char* e, char** p, Sfio_t* ip) +expand(register char* s, register char* e, char** p, Sfio_t* ip, char* id) { register int c; register char* b = s; int n; - message((-23, "AHA#%d expand(%s)", __LINE__, show(s))); n = sfstrtell(ip); c = 1; while ((!e || s < e) && (c = *s++) && c != '\f'); sfwrite(ip, b, s - b - 1); sfputc(ip, 0); b = sfstrbase(ip) + n; - message((-23, "AHA#%d expand(%s)", __LINE__, b)); n = sfstrtell(ip); if (!c) s--; @@ -960,7 +990,7 @@ expand(register char* s, register char* e, char** p, Sfio_t* ip) { if (!*++b || streq(b, "NAME")) { - if (!(b = error_info.id)) + if (!(b = id)) b = "command"; sfstrseek(ip, 0, SEEK_SET); sfputr(ip, b, -1); @@ -984,7 +1014,7 @@ expand(register char* s, register char* e, char** p, Sfio_t* ip) */ static Push_t* -info(Push_t* psp, char* s, char* e, Sfio_t* ip) +info(Push_t* psp, char* s, char* e, Sfio_t* ip, char* id) { register char* b; int n; @@ -992,7 +1022,7 @@ info(Push_t* psp, char* s, char* e, Sfio_t* ip) static Push_t push; - b = expand(s, e, &s, ip); + b = expand(s, e, &s, ip, id); n = strlen(b); if (tsp = newof(0, Push_t, 1, n + 1)) { @@ -1013,7 +1043,7 @@ info(Push_t* psp, char* s, char* e, Sfio_t* ip) */ static Push_t* -localize(Push_t* psp, char* s, char* e, int term, int n, char* catalog, int version, Sfio_t* ip) +localize(Push_t* psp, char* s, char* e, int term, int n, Sfio_t* ip, int version, char* id, char* catalog) { char* t; char* u; @@ -1039,7 +1069,7 @@ localize(Push_t* psp, char* s, char* e, int term, int n, char* catalog, int vers } sfputc(ip, c); } - if (!(s = sfstruse(ip)) || (u = T(error_info.id, catalog, s)) == s) + if (!(s = sfstruse(ip)) || (u = T(id, catalog, s)) == s) return 0; n = strlen(u); if (tsp = newof(0, Push_t, 1, n + 1)) @@ -1061,7 +1091,7 @@ localize(Push_t* psp, char* s, char* e, int term, int n, char* catalog, int vers */ static int -label(register Sfio_t* sp, int sep, register char* s, int about, int z, int level, int style, int f, Sfio_t* ip, int version, char* catalog) +label(register Sfio_t* sp, int sep, register char* s, int about, int z, int level, int style, int f, Sfio_t* ip, int version, char* id, char* catalog) { register int c; register char* t; @@ -1128,7 +1158,7 @@ label(register Sfio_t* sp, int sep, register char* s, int about, int z, int leve y = p + 1; } if (X(catalog) && (!level || *s == '\a' || *(s - 1) != '+') && - (tsp = localize(psp, s, e, (sep || level) ? '?' : 0, sep || level, catalog, version, ip))) + (tsp = localize(psp, s, e, (sep || level) ? '?' : 0, sep || level, ip, version, id, catalog))) { psp= tsp; s = psp->nb; @@ -1192,7 +1222,7 @@ label(register Sfio_t* sp, int sep, register char* s, int about, int z, int leve if (va & OPT_optional) sfputc(sp, '['); sfputc(sp, '='); - label(sp, 0, y, 0, -1, 0, style, FONT_ITALIC, ip, version, catalog); + label(sp, 0, y, 0, -1, 0, style, FONT_ITALIC, ip, version, id, catalog); if (va & OPT_optional) sfputc(sp, ']'); y = 0; @@ -1206,7 +1236,7 @@ label(register Sfio_t* sp, int sep, register char* s, int about, int z, int leve continue; else if (sep) goto restore; - else if (X(catalog) && (tsp = localize(psp, s, e, 0, 1, catalog, version, ip))) + else if (X(catalog) && (tsp = localize(psp, s, e, 0, 1, ip, version, id, catalog))) { psp = tsp; s = psp->nb; @@ -1259,7 +1289,7 @@ label(register Sfio_t* sp, int sep, register char* s, int about, int z, int leve a = FONT_BOLD; goto setfont; case '\f': - psp = info(psp, s, e, ip); + psp = info(psp, s, e, ip, id); if (psp->nb) { s = psp->nb; @@ -1362,7 +1392,7 @@ label(register Sfio_t* sp, int sep, register char* s, int about, int z, int leve */ static void -args(register Sfio_t* sp, register char* p, register int n, int flags, int style, Sfio_t* ip, int version, char* catalog) +args(register Sfio_t* sp, register char* p, register int n, int flags, int style, Sfio_t* ip, int version, char* id, char* catalog) { register int i; register char* t; @@ -1383,7 +1413,7 @@ args(register Sfio_t* sp, register char* p, register int n, int flags, int style t = (char*)memchr(p, '\n', n); if (style >= STYLE_man) { - if (!(a = error_info.id)) + if (!(a = id)) a = "..."; sfprintf(sp, "\t%s%s%s%s[%s%s%s%s%s]", font(FONT_BOLD, style, 1), a, font(FONT_BOLD, style, 0), b, b, font(FONT_ITALIC, style, 1), o, font(FONT_ITALIC, style, 0), b); } @@ -1391,7 +1421,7 @@ args(register Sfio_t* sp, register char* p, register int n, int flags, int style sfprintf(sp, "%*.*s%s%s%s[%s%s%s]", OPT_USAGE - 1, OPT_USAGE - 1, T(NiL, ID, "Or:"), b, a, b, b, o, b); else { - if (!(a = error_info.id)) + if (!(a = error_info.id) && !(a = id)) a = "..."; if (!sfstrtell(sp)) sfprintf(sp, "[%s%s%s]", b, o, b); @@ -1406,7 +1436,7 @@ args(register Sfio_t* sp, register char* p, register int n, int flags, int style { sfwrite(ip, p, i); if (b = sfstruse(ip)) - sfputr(sp, T(error_info.id, catalog, b), -1); + sfputr(sp, T(id, catalog, b), -1); else sfwrite(sp, p, i); } @@ -1429,7 +1459,7 @@ args(register Sfio_t* sp, register char* p, register int n, int flags, int style } } if (n) - label(sp, sep, p, 0, n, 0, style, 0, ip, version, catalog); + label(sp, sep, p, 0, n, 0, style, 0, ip, version, id, catalog); } /* @@ -1439,7 +1469,7 @@ args(register Sfio_t* sp, register char* p, register int n, int flags, int style */ static int -item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int version, char* catalog) +item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int version, char* id, char* catalog) { register char* t; int n; @@ -1460,7 +1490,7 @@ item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int versi for (n = 0; n < level; n++) sfputc(sp, '\t'); } - label(sp, 0, s + 1, about, -1, level, style, FONT_LITERAL, ip, version, catalog); + label(sp, 0, s + 1, about, -1, level, style, FONT_LITERAL, ip, version, id, catalog); sfputc(sp, '\n'); if (style >= STYLE_nroff) sfprintf(sp, ".DE"); @@ -1490,9 +1520,9 @@ item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int versi opt_info.state->flags |= OPT_proprietary; break; } - label(sp, 0, s, about, -1, level, 0, 0, ip, version, catalog); + label(sp, 0, s, about, -1, level, 0, 0, ip, version, id, catalog); sfputr(sp, "\">", -1); - label(sp, 0, s, about, -1, level, style, level ? FONT_BOLD : 0, ip, version, catalog); + label(sp, 0, s, about, -1, level, style, level ? FONT_BOLD : 0, ip, version, id, catalog); sfputr(sp, "</A>", -1); if (!level) sfputr(sp, "</H4>", -1); @@ -1508,7 +1538,7 @@ item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int versi else if (style != STYLE_options && style != STYLE_match || *s == '-' || *s == '+') sfputc(sp, '\t'); } - label(sp, 0, s, about, -1, level, style, FONT_BOLD, ip, version, catalog); + label(sp, 0, s, about, -1, level, style, FONT_BOLD, ip, version, id, catalog); } } else @@ -1529,11 +1559,28 @@ item(Sfio_t* sp, char* s, int about, int level, int style, Sfio_t* ip, int versi * output text to sp from p according to style */ +#if _BLD_DEBUG + +static char* textout(Sfio_t*, char*, int, int, int, Sfio_t*, int, char*, char*); + static char* -textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip, int version, char* catalog) +trace_textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip, int version, char* id, char* catalog, int line) { -#if 0 -#define textout(a,b,c,d,e,f,g,h) (sfprintf(a,"(%d)",__LINE__),textout(a,b,c,d,e,f,g,h)) + static int depth = 0; + + message((-21, "opthelp: txt#%d +++ %2d \"%s\" style=%d level=%d bump=%d", line, ++depth, show(p), style, level, bump)); + p = textout(sp, p, style, level, bump, ip, version, id, catalog); + message((-21, "opthelp: txt#%d --- %2d \"%s\"", line, depth--, show(p))); + return p; +} + +#endif + +static char* +textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip, int version, char* id, char* catalog) +{ +#if _BLD_DEBUG +#define textout(sp,p,style,level,bump,ip,version,id,catalog) trace_textout(sp,p,style,level,bump,ip,version,id,catalog,__LINE__) #endif register char* t; register int c; @@ -1573,7 +1620,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip } if (*p == '\f') { - psp = info(psp, p + 1, NiL, ip); + psp = info(psp, p + 1, NiL, ip, id); if (psp->nb) p = psp->nb; else @@ -1621,7 +1668,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip if ((c = *p) != '?') return skip(p, 0, 0, 0, 1, level, 1, version); e = C("version"); - par = item(sp, e, about, level, style, ip, version, ID); + par = item(sp, e, about, level, style, ip, version, id, ID); for (;;) { while (isspace(*(p + 1))) @@ -1658,7 +1705,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip *((t = e) + 1) = '|'; } } - par = item(sp, t, about, level, style, ip, version, catalog); + par = item(sp, t, about, level, style, ip, version, id, catalog); c = *p; } if (!about && level) @@ -1676,7 +1723,15 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip if (c == ':') c = *(p = skip(p, '?', 0, 0, 1, 0, 0, version)); if ((c == ']' || c == '?' && *(p + 1) == ']' && *(p + 2) != ']' && p++) && (c = *(p = next(p + 1, version))) == GO) - p = textout(sp, p, style, level + bump + par + 1, 0, ip, version, catalog); + { + p = textout(sp, p, style, level + bump + par + 1, 0, ip, version, id, catalog); + if (level > lev && *p && *(p = next(p, version)) == '[') + { + p++; + message((-21, "textout#%d p=%s", __LINE__, show(p))); + goto again; + } + } else if (c == '?' || c == ' ') { p++; @@ -1684,7 +1739,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip sfputc(sp, c); else { - if (X(catalog) && (tsp = localize(psp, p, NiL, 0, 1, catalog, version, ip))) + if (X(catalog) && (tsp = localize(psp, p, NiL, 0, 1, ip, version, id, catalog))) { psp = tsp; p = psp->nb; @@ -1800,7 +1855,15 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip p = skip(p, 0, 0, 0, 1, 0, 1, version); } if (*(p = next(p, version)) == GO) - p = textout(sp, p, style, level + bump + !level, 0, ip, version, catalog); + { + p = textout(sp, p, style, level + bump + !level, 0, ip, version, id, catalog); + if (*p && *(p = next(p, version)) == '[' && !isalnum(*(p + 1))) + { + p++; + message((-21, "textout#%d p=%s", __LINE__, show(p))); + goto again; + } + } else if (*p == '[' && level > lev) { p++; @@ -1811,7 +1874,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip p++; if (style != STYLE_keys) { - psp = info(psp, p, NiL, ip); + psp = info(psp, p, NiL, ip, id); if (psp->nb) p = psp->nb; else @@ -1880,7 +1943,7 @@ textout(Sfio_t* sp, register char* p, int style, int level, int bump, Sfio_t* ip case '\f': if (style != STYLE_keys) { - psp = info(psp, p, NiL, ip); + psp = info(psp, p, NiL, ip, id); if (psp->nb) p = psp->nb; else @@ -2038,7 +2101,6 @@ opthelp(const char* oopts, const char* what) char* d; char* v; char* ov; - char* name; char* pp; char* rb; char* re; @@ -2065,6 +2127,7 @@ opthelp(const char* oopts, const char* what) int prefix; int version; long tp; + char* id; char* catalog; Optpass_t* o; Optpass_t* q; @@ -2121,7 +2184,6 @@ opthelp(const char* oopts, const char* what) if (!(opts = sfstruse(sp_help))) goto nospace; } - message((-20, "AHA#%d style=%d", __LINE__, style)); again: if (opts) { @@ -2205,6 +2267,7 @@ opthelp(const char* oopts, const char* what) p = q->opts; prefix = q->prefix; version = q->version; + id = q->id; catalog = q->catalog; switch (style) { @@ -2232,7 +2295,7 @@ opthelp(const char* oopts, const char* what) c = 'b'; break; case '\f': - psp = info(psp, p, NiL, sp_info); + psp = info(psp, p, NiL, sp_info, id); if (psp->nb) p = psp->nb; else @@ -2288,7 +2351,7 @@ opthelp(const char* oopts, const char* what) } if (c == '\f') { - psp = info(psp, p, NiL, sp_info); + psp = info(psp, p, NiL, sp_info, id); if (psp->nb) p = psp->nb; else @@ -2360,7 +2423,7 @@ opthelp(const char* oopts, const char* what) else { if (*(p + 1) == '\f' && (vp = opt_info.state->vp)) - p = expand(p + 2, NiL, &t, vp); + p = expand(p + 2, NiL, &t, vp, id); p = skip(p, ':', '?', 0, 1, 0, 0, version); if (*p == ':') p++; @@ -2581,7 +2644,7 @@ opthelp(const char* oopts, const char* what) } if (*p == '\f') { - psp = info(psp, p + 1, NiL, sp_info); + psp = info(psp, p + 1, NiL, sp_info, id); if (psp->nb) p = psp->nb; else @@ -2633,7 +2696,7 @@ opthelp(const char* oopts, const char* what) if (!sp_misc && !(sp_misc = sfstropen())) goto nospace; else - p = textout(sp_misc, p, style, 1, 3, sp_info, version, catalog); + p = textout(sp_misc, p, style, 1, 3, sp_info, version, id, catalog); continue; } } @@ -2650,11 +2713,11 @@ opthelp(const char* oopts, const char* what) s++; if (*(w + 1) == '-') w++; - if (match(w + 1, s, version, catalog)) + if (match(w + 1, s, version, id, catalog)) { if (*(p + 1) == '-') p++; - p = textout(sp, p, style, 1, 3, sp_info, version, catalog); + p = textout(sp, p, style, 1, 3, sp_info, version, id, catalog); matched = -1; continue; } @@ -2667,7 +2730,7 @@ opthelp(const char* oopts, const char* what) { if (style >= STYLE_man) { - p = textout(sp_body, p, style, 0, 0, sp_info, version, catalog); + p = textout(sp_body, p, style, 0, 0, sp_info, version, id, catalog); if (!sp_head) { sp_head = sp_body; @@ -2682,14 +2745,14 @@ opthelp(const char* oopts, const char* what) { if (p[1] == '?') { - p = textout(sp, p, style, 1, 3, sp_info, version, catalog); + p = textout(sp, p, style, 1, 3, sp_info, version, id, catalog); continue; } paragraph = 0; } - if (match((char*)what + 1, p + 1, version, catalog)) + if (match((char*)what + 1, p + 1, version, id, catalog)) { - p = textout(sp, p, style, 1, 3, sp_info, version, catalog); + p = textout(sp, p, style, 1, 3, sp_info, version, id, catalog); matched = -1; paragraph = 1; continue; @@ -2738,7 +2801,7 @@ opthelp(const char* oopts, const char* what) else { if (*p == '\f' && (vp = opt_info.state->vp)) - p = expand(p + 1, NiL, &t, vp); + p = expand(p + 1, NiL, &t, vp, id); else t = 0; if (*p == ':') @@ -2758,7 +2821,7 @@ opthelp(const char* oopts, const char* what) d = 0; if (style == STYLE_match) { - if (wl && !match((char*)what, w, version, catalog)) + if (wl && !match((char*)what, w, version, id, catalog)) wl = 0; if ((!wl || *w == ':' || *w == '?') && (what[1] || sl && !memchr(s, what[0], sl) || !sl && what[0] != f)) { @@ -2911,7 +2974,7 @@ opthelp(const char* oopts, const char* what) if (!head) { head = 1; - item(sp_body, (flags & OPT_functions) ? C("FUNCTIONS") : C("OPTIONS"), 0, 0, style, sp_info, version, ID); + item(sp_body, (flags & OPT_functions) ? C("FUNCTIONS") : C("OPTIONS"), 0, 0, style, sp_info, version, id, ID); } if (style >= STYLE_nroff) { @@ -2954,7 +3017,7 @@ opthelp(const char* oopts, const char* what) else sfputr(sp, "void", -1); if (w) - label(sp_body, ' ', w, 0, -1, 0, style, FONT_BOLD, sp_info, version, catalog); + label(sp_body, ' ', w, 0, -1, 0, style, FONT_BOLD, sp_info, version, id, catalog); } else { @@ -2966,10 +3029,10 @@ opthelp(const char* oopts, const char* what) sfputc(sp_body, ' '); if (w) { - if (label(sp_body, 0, w, 0, -1, 0, style, 0, sp_info, version, catalog)) + if (label(sp_body, 0, w, 0, -1, 0, style, 0, sp_info, version, id, catalog)) { sfputc(sp_body, '|'); - label(sp_body, 0, w, 0, -1, 0, style, 0, sp_info, version, native); + label(sp_body, 0, w, 0, -1, 0, style, 0, sp_info, version, id, native); } } else @@ -2991,7 +3054,7 @@ opthelp(const char* oopts, const char* what) } sfputc(sp_body, ' '); if (y) - label(sp_body, 0, y, 0, -1, 0, style, 0, sp_info, version, catalog); + label(sp_body, 0, y, 0, -1, 0, style, 0, sp_info, version, id, catalog); else sfputc(sp_body, '-'); if (v) @@ -3037,10 +3100,10 @@ opthelp(const char* oopts, const char* what) if (prefix > 1) sfputc(sp_body, '-'); } - if (label(sp_body, 0, w, 0, -1, 0, style, FONT_BOLD, sp_info, version, catalog)) + if (label(sp_body, 0, w, 0, -1, 0, style, FONT_BOLD, sp_info, version, id, catalog)) { sfputc(sp_body, '|'); - label(sp_body, 0, w, 0, -1, 0, style, FONT_BOLD, sp_info, version, native); + label(sp_body, 0, w, 0, -1, 0, style, FONT_BOLD, sp_info, version, id, native); } } if (y) @@ -3051,7 +3114,7 @@ opthelp(const char* oopts, const char* what) sfputc(sp_body, ' '); if (w) sfputc(sp_body, prefix == 1 ? ' ' : '='); - label(sp_body, 0, y, 0, -1, 0, style, FONT_ITALIC, sp_info, version, catalog); + label(sp_body, 0, y, 0, -1, 0, style, FONT_ITALIC, sp_info, version, id, catalog); if (a & OPT_optional) sfputc(sp_body, ']'); } @@ -3059,9 +3122,9 @@ opthelp(const char* oopts, const char* what) if (style >= STYLE_match) { if (d) - textout(sp_body, d, style, 0, 3, sp_info, version, catalog); + textout(sp_body, d, style, 0, 3, sp_info, version, id, catalog); if (u) - textout(sp_body, u, style, 0, 3, sp_info, version, catalog); + textout(sp_body, u, style, 0, 3, sp_info, version, id, catalog); if ((a & OPT_invert) && w && (d || u)) { u = skip(w, ':', '?', 0, 1, 0, 0, version); @@ -3071,11 +3134,11 @@ opthelp(const char* oopts, const char* what) sfprintf(sp_info, " %s %s\bno%-.*s\b %s.", T(NiL, ID, "On by default; use"), "--"+2-prefix, u - w, w, T(NiL, ID, "to turn off")); if (!(t = sfstruse(sp_info))) goto nospace; - textout(sp_body, t, style, 0, 0, sp_info, version, NiL); + textout(sp_body, t, style, 0, 0, sp_info, version, NiL, NiL); } if (*p == GO) { - p = u ? skip(p + 1, 0, 0, 0, 0, 1, 1, version) : textout(sp_body, p, style, 4, 0, sp_info, version, catalog); + p = u ? skip(p + 1, 0, 0, 0, 0, 1, 1, version) : textout(sp_body, p, style, 4, 0, sp_info, version, id, catalog); y = "+?"; } else @@ -3098,7 +3161,7 @@ opthelp(const char* oopts, const char* what) sfprintf(sp_info, "%s%s", y, T(NiL, ID, "The option value may be omitted.")); if (!(t = sfstruse(sp_info))) goto nospace; - textout(sp_body, t, style, 4, 0, sp_info, version, NiL); + textout(sp_body, t, style, 4, 0, sp_info, version, NiL, NiL); y = " "; } if (v) @@ -3115,7 +3178,7 @@ opthelp(const char* oopts, const char* what) sfputc(sp_info, '.'); if (!(t = sfstruse(sp_info))) goto nospace; - textout(sp_body, t, style, 4, 0, sp_info, version, NiL); + textout(sp_body, t, style, 4, 0, sp_info, version, NiL, NiL); } } else if (!mutex) @@ -3124,7 +3187,7 @@ opthelp(const char* oopts, const char* what) if (*p == GO) { if (style >= STYLE_match) - p = textout(sp_body, p, style, 4, 0, sp_info, version, catalog); + p = textout(sp_body, p, style, 4, 0, sp_info, version, id, catalog); else p = skip(p + 1, 0, 0, 0, 0, 1, 1, version); } @@ -3140,12 +3203,13 @@ opthelp(const char* oopts, const char* what) for (t = p; *t == '\t' || *t == '\n'; t++); if (*t) { - item(sp_body, C("IMPLEMENTATION"), 0, 0, style, sp_info, version, ID); + item(sp_body, C("IMPLEMENTATION"), 0, 0, style, sp_info, version, id, ID); sfputr(sp_body, p, -1); } } } version = o->version; + id = o->id; catalog = o->catalog; if (style >= STYLE_keys) { @@ -3162,6 +3226,17 @@ opthelp(const char* oopts, const char* what) sfputc(sp, ']'); if (style == STYLE_nroff) { + char ud[64]; + + s = o->id; + t = ud; + while (t < &ud[sizeof(ud)-2] && (c = *s++)) + { + if (islower(c)) + c = toupper(c); + *t++ = c; + } + *t = 0; sfprintf(sp, "\ .\\\" format with nroff|troff|groff -man\n\ .fp 5 CW\n\ @@ -3241,7 +3316,7 @@ opthelp(const char* oopts, const char* what) .TH %s %d\n\ " , o->prefix == 2 ? "\\\\-\\\\-" : o->prefix == 1 ? "\\\\-" : "" -, error_info.id +, ud , section ); } @@ -3287,7 +3362,7 @@ opthelp(const char* oopts, const char* what) sfclose(sp_head); sp_head = 0; } - item(sp, C("SYNOPSIS"), 0, 0, style, sp_info, version, ID); + item(sp, C("SYNOPSIS"), 0, 0, style, sp_info, version, id, ID); } if (x) { @@ -3295,7 +3370,7 @@ opthelp(const char* oopts, const char* what) xl = t - x; if (style >= STYLE_match) { - args(sp, x, xl, flags, style, sp_info, version, catalog); + args(sp, x, xl, flags, style, sp_info, version, id, catalog); x = 0; } } @@ -3313,7 +3388,7 @@ opthelp(const char* oopts, const char* what) sp_body = 0; } if (x && style != STYLE_posix) - args(sp, x, xl, flags, style, sp_info, version, catalog); + args(sp, x, xl, flags, style, sp_info, version, id, catalog); if (sp_info) { sfclose(sp_info); @@ -3326,16 +3401,10 @@ opthelp(const char* oopts, const char* what) } if (!(p = sfstruse(sp))) goto nospace; - name = error_info.id ? error_info.id : "command"; - m = strlen(name) + 1; -#if 0 - if (!opt_info.state->width) -#endif - { - astwinsize(1, NiL, &opt_info.state->width); - if (opt_info.state->width < 20) - opt_info.state->width = OPT_WIDTH; - } + astwinsize(1, NiL, &opt_info.state->width); + if (opt_info.state->width < 20) + opt_info.state->width = OPT_WIDTH; + m = strlen((style <= STYLE_long && error_info.id && !strchr(error_info.id, '/')) ? error_info.id : id) + 1; margin = style == STYLE_api ? (8 * 1024) : (opt_info.state->width - 1); if (!(opt_info.state->flags & OPT_preformat)) { @@ -3348,8 +3417,19 @@ opthelp(const char* oopts, const char* what) ts = OPT_USAGE + m; if (style == STYLE_html) { - sfprintf(mp, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n<HEAD>\n<META name=\"generator\" content=\"optget (AT&T Research) 2000-04-01\">\n%s<TITLE>%s man document</TITLE>\n</HEAD>\n<BODY bgcolor=white>\n", (opt_info.state->flags & OPT_proprietary) ? "<!--INTERNAL-->\n" : "", name); - sfprintf(mp, "<H4><TABLE width=100%%><TR><TH align=left> %s ( %d ) <TH align=center><A href=\".\" title=\"Index\">%s</A><TH align=right>%s ( %d )</TR></TABLE></H4>\n<HR>\n", name, section, T(NiL, ID, heading[section % 10]), name, section); + char ud[64]; + + s = id; + t = ud; + while (t < &ud[sizeof(ud)-2] && (c = *s++)) + { + if (islower(c)) + c = toupper(c); + *t++ = c; + } + *t = 0; + sfprintf(mp, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n<HEAD>\n<META name=\"generator\" content=\"optget (AT&T Research) 2000-04-01\">\n%s<TITLE>%s man document</TITLE>\n</HEAD>\n<BODY bgcolor=white>\n", (opt_info.state->flags & OPT_proprietary) ? "<!--INTERNAL-->\n" : "", id); + sfprintf(mp, "<H4><TABLE width=100%%><TR><TH align=left> %s ( %d ) <TH align=center><A href=\".\" title=\"Index\">%s</A><TH align=right>%s ( %d )</TR></TABLE></H4>\n<HR>\n", ud, section, T(NiL, ID, heading[section % 10]), ud, section); sfprintf(mp, "<DL compact>\n<DT>"); co = 2; *(pt = ptstk) = 0; @@ -3677,7 +3757,7 @@ optnumber(const char* s, char** t, int* e) */ static int -opterror(register char* p, int version, char* catalog, int err) +opterror(register char* p, int err, int version, char* id, char* catalog) { register Sfio_t* mp; register Sfio_t* tp; @@ -3718,7 +3798,7 @@ opterror(register char* p, int version, char* catalog, int err) if (!X(catalog)) sfputc(mp, ' '); else if (p = sfstruse(tp)) - sfputr(mp, T(error_info.id, catalog, p), ' '); + sfputr(mp, T(id, catalog, p), ' '); else goto nospace; } @@ -3811,6 +3891,7 @@ optget(register char** argv, const char* oopts) char* y; char* numopt; char* opts; + char* id; char* catalog; int n; int m; @@ -3906,6 +3987,7 @@ optget(register char** argv, const char* oopts) opts = pass->opts; prefix = pass->prefix; version = pass->version; + id = pass->id; if (!(xp = opt_info.state->xp) || (catalog = pass->catalog) && !X(catalog)) catalog = 0; else /* if (!error_info.catalog) */ @@ -4267,7 +4349,7 @@ optget(register char** argv, const char* oopts) } if (*s == '\f') { - psp = info(psp, s + 1, NiL, opt_info.state->xp); + psp = info(psp, s + 1, NiL, opt_info.state->xp, id); if (psp->nb) s = psp->nb; else @@ -4294,7 +4376,7 @@ optget(register char** argv, const char* oopts) if (*(s + 1) == '\f' && (vp = opt_info.state->vp)) { sfputc(vp, k); - s = expand(s + 2, NiL, &t, vp); + s = expand(s + 2, NiL, &t, vp, id); if (*s) *(f = s - 1) = k; else @@ -4316,7 +4398,7 @@ optget(register char** argv, const char* oopts) { p = skip(s + 1, '?', 0, 0, 1, 0, 0, version); e = sfprints("%-.*s", p - (s + 1), s + 1); - g = T(error_info.id, catalog, e); + g = T(id, catalog, e); if (g == e) p = 0; else @@ -4453,7 +4535,7 @@ optget(register char** argv, const char* oopts) if (!(n = (m || *s == ':' || *s == '|' || *s == '?' || *s == ']' || *s == 0)) && x) { psp = pop(psp); - return opterror("?", version, catalog, 0); + return opterror("?", 0, version, id, catalog); } for (x = k; *(f + 1) == '|' && (j = *(f + 2)) && j != '!' && j != '=' && j != ':' && j != '?' && j != ']'; f += 2); if (*f == ':') @@ -4706,7 +4788,7 @@ optget(register char** argv, const char* oopts) *w++ = *b++; } if (!num && v) - return opterror(no ? "!" : "=", version, catalog, 0); + return opterror(no ? "!" : "=", 0, version, id, catalog); w = &opt_info.name[prefix]; c = x; s = a; @@ -4731,7 +4813,7 @@ optget(register char** argv, const char* oopts) if (w || !isdigit(c) || !numopt || !(pass->flags & OPT_numeric)) { pop(psp); - return opterror("", version, catalog, 0); + return opterror("", 0, version, id, catalog); } s = numopt; c = opt_info.option[1] = numchr; @@ -4754,7 +4836,7 @@ optget(register char** argv, const char* oopts) if (v) { pop(psp); - return opterror("!", version, catalog, 0); + return opterror("!", 0, version, id, catalog); } opt_info.num = (long)(opt_info.number = 0); } @@ -4772,7 +4854,7 @@ optget(register char** argv, const char* oopts) if (!opt_info.arg) { pop(psp); - return opterror(s, version, catalog, 0); + return opterror(s, 0, version, id, catalog); } } else if (*(t = next(s + 2, version)) == '[') @@ -4798,7 +4880,7 @@ optget(register char** argv, const char* oopts) if (err || e == opt_info.arg) { pop(psp); - return opterror(s, version, catalog, err); + return opterror(s, err, version, id, catalog); } } } @@ -4819,7 +4901,7 @@ optget(register char** argv, const char* oopts) else { opt_info.offset = 0; - c = opterror(s, version, catalog, err); + c = opterror(s, err, version, id, catalog); } pop(psp); return c; @@ -4855,7 +4937,7 @@ optget(register char** argv, const char* oopts) { pop(psp); opt_info.offset = 0; - return opterror(s, version, catalog, err); + return opterror(s, err, version, id, catalog); } } } @@ -4864,7 +4946,7 @@ optget(register char** argv, const char* oopts) { opt_info.index--; pop(psp); - return opterror(s, version, catalog, 0); + return opterror(s, 0, version, id, catalog); } opt_info.offset = 0; optarg: @@ -4897,7 +4979,7 @@ optget(register char** argv, const char* oopts) { p = skip(s + 1, '?', 0, 0, 1, 0, 0, version); e = sfprints("%-.*s", p - (s + 1), s + 1); - b = T(error_info.id, catalog, e); + b = T(id, catalog, e); if (b == e) p = 0; else @@ -4978,7 +5060,7 @@ optget(register char** argv, const char* oopts) if (!(n = (m || *s == ':' || *s == '|' || *s == '?' || *s == ']')) && x) { pop(psp); - return opterror("&", version, catalog, 0); + return opterror("&", 0, version, id, catalog); } for (x = k; *(f + 1) == '|' && (j = *(f + 2)) && j != '!' && j != '=' && j != ':' && j != '?' && j != ']'; f += 2); if (*f == ':') @@ -5010,7 +5092,7 @@ optget(register char** argv, const char* oopts) if (!(opt_info.num = (long)(opt_info.number = x))) { pop(psp); - return opterror("*", version, catalog, 0); + return opterror("*", 0, version, id, catalog); } } } @@ -5018,7 +5100,7 @@ optget(register char** argv, const char* oopts) else if (w && v) { pop(psp); - return opterror("=", version, catalog, 0); + return opterror("=", 0, version, id, catalog); } else { @@ -5052,11 +5134,11 @@ optget(register char** argv, const char* oopts) } opt_info.state->force = hp->style; } - else if (match(s, "ESC", -1, NiL) || match(s, "EMPHASIS", -1, NiL)) + else if (match(s, "ESC", -1, ID, NiL) || match(s, "EMPHASIS", -1, ID, NiL)) opt_info.state->emphasis = n; - else if (match(s, "PREFORMAT", -1, NiL)) + else if (match(s, "PREFORMAT", -1, ID, NiL)) opt_info.state->flags |= OPT_preformat; - else if (match(s, "TEST", -1, NiL)) + else if (match(s, "TEST", -1, ID, NiL)) { opt_info.state->width = OPT_WIDTH; opt_info.state->emphasis = 1; @@ -5064,7 +5146,7 @@ optget(register char** argv, const char* oopts) else { pop(psp); - return opterror(v, version, catalog, 0); + return opterror(v, 0, version, id, catalog); } psp = pop(psp); if (argv == opt_info.state->strv) @@ -5074,13 +5156,13 @@ optget(register char** argv, const char* oopts) if ((opt_info.arg = opthelp(NiL, v)) == (char*)unknown) { pop(psp); - return opterror(v, version, catalog, 0); + return opterror(v, 0, version, id, catalog); } pop(psp); return '?'; nospace: pop(psp); - return opterror(NiL, 0, NiL, 0); + return opterror(NiL, 0, 0, NiL, NiL); } /* @@ -5261,5 +5343,5 @@ optstr(const char* str, const char* opts) c = '-'; return c; nospace: - return opterror(NiL, 0, NiL, 0); + return opterror(NiL, 0, 0, NiL, NiL); } diff --git a/usr/src/lib/libast/common/misc/optjoin.c b/usr/src/lib/libast/common/misc/optjoin.c index 1f792e76e5..023738cf9a 100644 --- a/usr/src/lib/libast/common/misc/optjoin.c +++ b/usr/src/lib/libast/common/misc/optjoin.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/optlib.h b/usr/src/lib/libast/common/misc/optlib.h index ff697034f2..366fe8f0c4 100644 --- a/usr/src/lib/libast/common/misc/optlib.h +++ b/usr/src/lib/libast/common/misc/optlib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -57,6 +57,7 @@ typedef struct Optpass_s { char* opts; char* oopts; + char* id; char* catalog; unsigned char version; unsigned char prefix; diff --git a/usr/src/lib/libast/common/misc/procclose.c b/usr/src/lib/libast/common/misc/procclose.c index 07915f8b22..bfc84f9d17 100644 --- a/usr/src/lib/libast/common/misc/procclose.c +++ b/usr/src/lib/libast/common/misc/procclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/procfree.c b/usr/src/lib/libast/common/misc/procfree.c index c3effe4456..920c9b2237 100644 --- a/usr/src/lib/libast/common/misc/procfree.c +++ b/usr/src/lib/libast/common/misc/procfree.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/proclib.h b/usr/src/lib/libast/common/misc/proclib.h index 85dc1f7d2d..6221d7f999 100644 --- a/usr/src/lib/libast/common/misc/proclib.h +++ b/usr/src/lib/libast/common/misc/proclib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/procopen.c b/usr/src/lib/libast/common/misc/procopen.c index 541fba6c14..9f0194cf42 100644 --- a/usr/src/lib/libast/common/misc/procopen.c +++ b/usr/src/lib/libast/common/misc/procopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/procrun.c b/usr/src/lib/libast/common/misc/procrun.c index e6dd204d74..8b6236b6bd 100644 --- a/usr/src/lib/libast/common/misc/procrun.c +++ b/usr/src/lib/libast/common/misc/procrun.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/recfmt.c b/usr/src/lib/libast/common/misc/recfmt.c index f056984e39..baf153469f 100644 --- a/usr/src/lib/libast/common/misc/recfmt.c +++ b/usr/src/lib/libast/common/misc/recfmt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/reclen.c b/usr/src/lib/libast/common/misc/reclen.c index 6ca007ee70..9091e52052 100644 --- a/usr/src/lib/libast/common/misc/reclen.c +++ b/usr/src/lib/libast/common/misc/reclen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/recstr.c b/usr/src/lib/libast/common/misc/recstr.c index 8ffed6ecfd..dabed6b1e7 100644 --- a/usr/src/lib/libast/common/misc/recstr.c +++ b/usr/src/lib/libast/common/misc/recstr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/setenviron.c b/usr/src/lib/libast/common/misc/setenviron.c index c2e75da3d5..35d3397f51 100644 --- a/usr/src/lib/libast/common/misc/setenviron.c +++ b/usr/src/lib/libast/common/misc/setenviron.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/sigcrit.c b/usr/src/lib/libast/common/misc/sigcrit.c index 1627e4ee4c..e8c1ee2ecf 100644 --- a/usr/src/lib/libast/common/misc/sigcrit.c +++ b/usr/src/lib/libast/common/misc/sigcrit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/sigdata.c b/usr/src/lib/libast/common/misc/sigdata.c index 6b5c8a337d..de0a489a08 100644 --- a/usr/src/lib/libast/common/misc/sigdata.c +++ b/usr/src/lib/libast/common/misc/sigdata.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/signal.c b/usr/src/lib/libast/common/misc/signal.c index c64d04b941..034c653a52 100644 --- a/usr/src/lib/libast/common/misc/signal.c +++ b/usr/src/lib/libast/common/misc/signal.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/stack.c b/usr/src/lib/libast/common/misc/stack.c index 941c7fa0fb..6c5ca49ebc 100644 --- a/usr/src/lib/libast/common/misc/stack.c +++ b/usr/src/lib/libast/common/misc/stack.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/state.c b/usr/src/lib/libast/common/misc/state.c index 2e6ac5eb6b..37b6e9e737 100644 --- a/usr/src/lib/libast/common/misc/state.c +++ b/usr/src/lib/libast/common/misc/state.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ #pragma prototyped -static const char id[] = "\n@(#)$Id: ast (AT&T Research) 2008-04-01 $\0\n"; +static const char id[] = "\n@(#)$Id: ast (AT&T Research) 2010-01-02 $\0\n"; #include <ast.h> @@ -29,12 +29,14 @@ static const char id[] = "\n@(#)$Id: ast (AT&T Research) 2008-04-01 $\0\n"; _Ast_info_t _ast_info = { - "libast", - { 0, 0 }, - 0, 0, 0, 0, 0, - strcmp, - 0, 0, - 1 + "libast", /* id */ + { 0 }, + 0,0,0,0,0, + strcmp, /* collate */ + 0,0, + 1, /* mb_cur_max */ + 0,0,0,0,0,0,0, + 20100102 /* version */ }; __EXTERN__(_Ast_info_t, _ast_info); diff --git a/usr/src/lib/libast/common/misc/stk.c b/usr/src/lib/libast/common/misc/stk.c index 90de21eac3..beb09381fc 100644 --- a/usr/src/lib/libast/common/misc/stk.c +++ b/usr/src/lib/libast/common/misc/stk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/systrace.c b/usr/src/lib/libast/common/misc/systrace.c index 506125ba92..072801a062 100644 --- a/usr/src/lib/libast/common/misc/systrace.c +++ b/usr/src/lib/libast/common/misc/systrace.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/translate.c b/usr/src/lib/libast/common/misc/translate.c index b8d79b9fe5..f3754e694a 100644 --- a/usr/src/lib/libast/common/misc/translate.c +++ b/usr/src/lib/libast/common/misc/translate.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -173,6 +173,7 @@ init(register char* s) * locate the default locale catalog */ + ast.locale.set |= AST_LC_internal; u = setlocale(LC_MESSAGES, NiL); setlocale(LC_MESSAGES, "C"); if ((d = find("C", s)) != NOCAT) @@ -210,6 +211,7 @@ init(register char* s) catclose(d); } setlocale(LC_MESSAGES, u); + ast.locale.set &= ~AST_LC_internal; return cp; } diff --git a/usr/src/lib/libast/common/misc/univdata.c b/usr/src/lib/libast/common/misc/univdata.c index 865f3e8b9f..8421b07375 100644 --- a/usr/src/lib/libast/common/misc/univdata.c +++ b/usr/src/lib/libast/common/misc/univdata.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/misc/univlib.h b/usr/src/lib/libast/common/misc/univlib.h index 8ce891748e..4e05ae925e 100644 --- a/usr/src/lib/libast/common/misc/univlib.h +++ b/usr/src/lib/libast/common/misc/univlib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/obsolete/spawn.c b/usr/src/lib/libast/common/obsolete/spawn.c index 3bc86e9854..738653fcdb 100644 --- a/usr/src/lib/libast/common/obsolete/spawn.c +++ b/usr/src/lib/libast/common/obsolete/spawn.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathaccess.c b/usr/src/lib/libast/common/path/pathaccess.c index c38b19a88e..188d24d404 100644 --- a/usr/src/lib/libast/common/path/pathaccess.c +++ b/usr/src/lib/libast/common/path/pathaccess.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathbin.c b/usr/src/lib/libast/common/path/pathbin.c index 97fff55e57..3f455d8fe7 100644 --- a/usr/src/lib/libast/common/path/pathbin.c +++ b/usr/src/lib/libast/common/path/pathbin.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathcanon.c b/usr/src/lib/libast/common/path/pathcanon.c index 72f4e6b444..b2dd0e4d80 100644 --- a/usr/src/lib/libast/common/path/pathcanon.c +++ b/usr/src/lib/libast/common/path/pathcanon.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathcat.c b/usr/src/lib/libast/common/path/pathcat.c index 75eebd420f..cc200c3411 100644 --- a/usr/src/lib/libast/common/path/pathcat.c +++ b/usr/src/lib/libast/common/path/pathcat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathcd.c b/usr/src/lib/libast/common/path/pathcd.c index e2c921a3a4..b9cd837268 100644 --- a/usr/src/lib/libast/common/path/pathcd.c +++ b/usr/src/lib/libast/common/path/pathcd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathcheck.c b/usr/src/lib/libast/common/path/pathcheck.c index 624cd35da4..5857c5a896 100644 --- a/usr/src/lib/libast/common/path/pathcheck.c +++ b/usr/src/lib/libast/common/path/pathcheck.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathexists.c b/usr/src/lib/libast/common/path/pathexists.c index 23c47e4820..3bf4b53fc5 100644 --- a/usr/src/lib/libast/common/path/pathexists.c +++ b/usr/src/lib/libast/common/path/pathexists.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathfind.c b/usr/src/lib/libast/common/path/pathfind.c index ce736e52bb..8a4c2fb236 100644 --- a/usr/src/lib/libast/common/path/pathfind.c +++ b/usr/src/lib/libast/common/path/pathfind.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathgetlink.c b/usr/src/lib/libast/common/path/pathgetlink.c index 408b6757ae..a2fbd41d47 100644 --- a/usr/src/lib/libast/common/path/pathgetlink.c +++ b/usr/src/lib/libast/common/path/pathgetlink.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathkey.c b/usr/src/lib/libast/common/path/pathkey.c index 7fe06995a6..bc153ea7c8 100644 --- a/usr/src/lib/libast/common/path/pathkey.c +++ b/usr/src/lib/libast/common/path/pathkey.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathnative.c b/usr/src/lib/libast/common/path/pathnative.c index 9075b49343..1f3eedb0e5 100644 --- a/usr/src/lib/libast/common/path/pathnative.c +++ b/usr/src/lib/libast/common/path/pathnative.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathpath.c b/usr/src/lib/libast/common/path/pathpath.c index cead8785f7..36be12d741 100644 --- a/usr/src/lib/libast/common/path/pathpath.c +++ b/usr/src/lib/libast/common/path/pathpath.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathposix.c b/usr/src/lib/libast/common/path/pathposix.c index e6772e1881..fcfb053adc 100644 --- a/usr/src/lib/libast/common/path/pathposix.c +++ b/usr/src/lib/libast/common/path/pathposix.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathprobe.c b/usr/src/lib/libast/common/path/pathprobe.c index be9e3bdcf5..a7cefd113c 100644 --- a/usr/src/lib/libast/common/path/pathprobe.c +++ b/usr/src/lib/libast/common/path/pathprobe.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathprog.c b/usr/src/lib/libast/common/path/pathprog.c index e184db0448..9b7936992c 100644 --- a/usr/src/lib/libast/common/path/pathprog.c +++ b/usr/src/lib/libast/common/path/pathprog.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathrepl.c b/usr/src/lib/libast/common/path/pathrepl.c index 4a6d5372f5..31c5b5ac57 100644 --- a/usr/src/lib/libast/common/path/pathrepl.c +++ b/usr/src/lib/libast/common/path/pathrepl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathsetlink.c b/usr/src/lib/libast/common/path/pathsetlink.c index 97e1069af5..1469595232 100644 --- a/usr/src/lib/libast/common/path/pathsetlink.c +++ b/usr/src/lib/libast/common/path/pathsetlink.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathshell.c b/usr/src/lib/libast/common/path/pathshell.c index aae0c60237..64889c5376 100644 --- a/usr/src/lib/libast/common/path/pathshell.c +++ b/usr/src/lib/libast/common/path/pathshell.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathstat.c b/usr/src/lib/libast/common/path/pathstat.c index d8c224fad3..2067e0ceec 100644 --- a/usr/src/lib/libast/common/path/pathstat.c +++ b/usr/src/lib/libast/common/path/pathstat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/path/pathtemp.c b/usr/src/lib/libast/common/path/pathtemp.c index 3c4b72f59f..21f9cf17a6 100644 --- a/usr/src/lib/libast/common/path/pathtemp.c +++ b/usr/src/lib/libast/common/path/pathtemp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -39,11 +39,13 @@ * pathtemp(p,sizeof(p),0,"tn",0) * tmpnam(p) pathtemp(p,L_tmpnam,0,"tn",0) * tempnam(d,p) pathtemp(0,d,p,0) + * mktemp(p) pathtemp(0,0,p,0) * * if buf==0 then space is malloc'd * buf size is size * dir and pfx may be 0 - * only first 5 chars of pfx are used + * if pfx contains trailing X's then it is a mktemp(3) template + * otherwise only first 5 chars of pfx are used * if fdp!=0 then the path is opened O_EXCL and *fdp is the open fd * malloc'd space returned by successful pathtemp() calls * must be freed by the caller @@ -59,12 +61,17 @@ * manual cycled by application with dir=(nil) * (nil) cycle TMPPATH * /prefix dir specifies the default prefix (default ast) + * /private private file/dir modes + * /public public file/dir modes + * /seed dir specifies pseudo-random generator seed + * 0 or "0" to re-initialize * /TMPPATH dir overrides the env value * /TMPDIR dir overrides the env value */ #include <ast.h> #include <ls.h> +#include <tv.h> #include <tm.h> #define ATTEMPT 10 @@ -81,10 +88,11 @@ static struct mode_t mode; char** vec; char** dir; - unsigned long key; - unsigned long rng; + uint32_t key; + uint32_t rng; pid_t pid; int manual; + int seed; char* pfx; char* tmpdir; char* tmppath; @@ -97,11 +105,15 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) register char* b; register char* s; register char* x; - char* fmt; + uint32_t key; int m; int n; + int l; + int r; int z; int attempt; + Tv_t tv; + char keybuf[16]; if (pfx && *pfx == '/') { @@ -126,9 +138,20 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) return (char*)pfx; } else if (streq(pfx, "private")) + { tmp.mode = S_IRUSR|S_IWUSR; + return (char*)pfx; + } else if (streq(pfx, "public")) + { tmp.mode = S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH; + return (char*)pfx; + } + else if (streq(pfx, "seed")) + { + tmp.key = (tmp.seed = (tmp.rng = dir ? (uint32_t)strtoul(dir, NiL, 0) : (uint32_t)1) != 0)? (uint32_t)0x63c63cd9L : 0; + return (char*)pfx; + } else if (streq(pfx, TMP_ENV)) { if (tmp.vec) @@ -155,6 +178,10 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) } return 0; } + if (tmp.seed) + tv.tv_nsec = 0; + else + tvgettime(&tv); if (!(d = (char*)dir) || *d && eaccess(d, W_OK|X_OK)) { if (!tmp.vec) @@ -208,18 +235,37 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) len--; if (!(b = buf) && !(b = newof(0, char, len, 1))) return 0; - if (buf && dir && pfx && (buf == (char*)dir && (buf + strlen(buf) + 1) == (char*)pfx || buf == (char*)pfx && !*dir) && !strcmp((char*)pfx + strlen(pfx) + 1, "XXXXX")) + z = 0; + if (!pfx && !(pfx = tmp.pfx)) + pfx = "ast"; + m = strlen(pfx); + if (buf && dir && (buf == (char*)dir && (buf + strlen(buf) + 1) == (char*)pfx || buf == (char*)pfx && !*dir) && !strcmp((char*)pfx + m + 1, "XXXXX")) { - z = 0; d = (char*)dir; - len = m = strlen(d) + strlen(pfx) + 8; - fmt = "%03.3.32lu%03.3.32lu"; + len = m += strlen(d) + 8; + l = 3; + r = 3; + } + else if (*pfx && pfx[m - 1] == 'X') + { + for (l = m; l && pfx[l - 1] == 'X'; l--); + r = m - l; + m = l; + l = r / 2; + r -= l; + } + else if (strchr(pfx, '.')) + { + m = 5; + l = 3; + r = 3; } else { z = '.'; m = 5; - fmt = "%02.2.32lu.%03.3.32lu"; + l = 2; + r = 3; } x = b + len; s = b; @@ -230,8 +276,6 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) if (s < x && s > b && *(s - 1) != '/') *s++ = '/'; } - if (!pfx && !(pfx = tmp.pfx)) - pfx = "ast"; if ((x - s) > m) x = s + m; while (s < x && (n = *pfx++)) @@ -244,7 +288,7 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) len -= (s - b); for (attempt = 0; attempt < ATTEMPT; attempt++) { - if (!tmp.rng || attempt || tmp.pid != getpid()) + if (!tmp.rng || !tmp.seed && (attempt || tmp.pid != getpid())) { register int r; @@ -253,7 +297,7 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) */ tmp.pid = getpid(); - tmp.rng = (unsigned long)tmp.pid * ((unsigned long)time(NiL) ^ (((unsigned long)(&attempt)) >> 3) ^ (((unsigned long)tmp.dir) >> 3)); + tmp.rng = (uintptr_t)tmp.pid * ((uintptr_t)time(NiL) ^ (((uintptr_t)(&attempt)) >> 3) ^ (((uintptr_t)tmp.dir) >> 3)); if (!tmp.key) tmp.key = (tmp.rng >> 16) | ((tmp.rng & 0xffff) << 16); tmp.rng ^= tmp.key; @@ -270,8 +314,12 @@ pathtemp(char* buf, size_t len, const char* dir, const char* pfx, int* fdp) * generate a pseudo-random name */ - tmp.key = tmp.rng * tmp.key + 987654321L; - sfsprintf(s, len, fmt, (tmp.key >> 15) & 0x7fff, tmp.key & 0x7fff); + key = tmp.rng * tmp.key + tv.tv_nsec; + if (!tmp.seed) + tvgettime(&tv); + tmp.key = tmp.rng * key + tv.tv_nsec; + sfsprintf(keybuf, sizeof(keybuf), "%07.7.32I*u%07.7.32I*u", sizeof(key), key, sizeof(tmp.key), tmp.key); + sfsprintf(s, len, "%-.*s%s%-.*s", l, keybuf, z ? "." : "", r, keybuf + sizeof(keybuf) / 2); if (fdp) { if ((n = open(b, O_CREAT|O_RDWR|O_EXCL|O_TEMPORARY, tmp.mode)) >= 0) diff --git a/usr/src/lib/libast/common/path/pathtmp.c b/usr/src/lib/libast/common/path/pathtmp.c index 0be0306a69..06b97755fa 100644 --- a/usr/src/lib/libast/common/path/pathtmp.c +++ b/usr/src/lib/libast/common/path/pathtmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/astconf.c b/usr/src/lib/libast/common/port/astconf.c index 3b3c7000a7..b99eb27174 100644 --- a/usr/src/lib/libast/common/port/astconf.c +++ b/usr/src/lib/libast/common/port/astconf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1119,7 +1119,7 @@ print(Sfio_t* sp, register Lookup_t* look, const char* name, const char* path, i { if (streq(p->name, "VERSION")) { - v = _AST_VERSION; + v = ast.version; break; } } diff --git a/usr/src/lib/libast/common/port/astcopy.c b/usr/src/lib/libast/common/port/astcopy.c index 3634328d62..b946b7fd26 100644 --- a/usr/src/lib/libast/common/port/astcopy.c +++ b/usr/src/lib/libast/common/port/astcopy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/astdynamic.c b/usr/src/lib/libast/common/port/astdynamic.c index a772b67878..fb038f2910 100644 --- a/usr/src/lib/libast/common/port/astdynamic.c +++ b/usr/src/lib/libast/common/port/astdynamic.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/astlicense.c b/usr/src/lib/libast/common/port/astlicense.c index 6627b20b6b..2461c67607 100644 --- a/usr/src/lib/libast/common/port/astlicense.c +++ b/usr/src/lib/libast/common/port/astlicense.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -50,14 +50,15 @@ #define USAGE 4 #define OPEN 5 #define CPL 6 -#define BSD 7 -#define ZLIB 8 -#define MIT 9 -#define GPL 10 -#define SPECIAL 11 -#define NONEXCLUSIVE 12 -#define NONCOMMERCIAL 13 -#define PROPRIETARY 14 +#define EPL 7 +#define BSD 8 +#define ZLIB 9 +#define MIT 10 +#define GPL 11 +#define SPECIAL 12 +#define NONEXCLUSIVE 13 +#define NONCOMMERCIAL 14 +#define PROPRIETARY 15 #define AUTHOR 0 #define CLASS 1 @@ -160,6 +161,7 @@ static const Item_t lic[] = LIC("usage", USAGE), LIC("open", OPEN), LIC("cpl", OPEN), + LIC("epl", OPEN), LIC("bsd", OPEN), LIC("zlib", OPEN), LIC("mit", OPEN), @@ -281,6 +283,7 @@ expand(Notice_t* notice, register Buffer_t* b, const Item_t* item) register char* x; register char* z; register int c; + int m; if (t = item->data) { @@ -290,16 +293,28 @@ expand(Notice_t* notice, register Buffer_t* b, const Item_t* item) { if (*t == '$' && t < (e + 2) && *(t + 1) == '{') { + m = 0; x = t += 2; while (t < e && (c = *t++) != '}') if (c == '.') x = t; + else if (c == '/') + { + m = 1; + break; + } if ((c = lookup(key, x, t - x - 1)) >= 0 && (x = notice->item[c].data)) { z = x + notice->item[c].size; while (x < z) - PUT(b, *x++); + { + c = *x++; + if (!m || c >= '0' && c <= '9') + PUT(b, c); + } } + if (m) + while (t < e && *t++ != '}'); } else if (q > 0 && *t == '\\' && (*(t + 1) == q || *(t + 1) == '\\')) t++; @@ -459,6 +474,7 @@ astlicense(char* p, int size, char* file, char* options, int cc1, int cc2, int c h = lookup(key, x, n); if (c == ']') c = *++s; + quote = 0; if (c == '=' || first) { if (c == '=') @@ -512,7 +528,6 @@ astlicense(char* p, int size, char* file, char* options, int cc1, int cc2, int c } continue; } - quote = 0; v = s; while ((c = *s) && (q == '"' && (c == '\\' && (*(s + 1) == '"' || *(s + 1) == '\\') && s++ && (quote = q)) || q && c != q || !q && c != ' ' && c != '\t' && c != '\n' && c != '\r' && c != ',' && c != ';')) { @@ -671,12 +686,15 @@ astlicense(char* p, int size, char* file, char* options, int cc1, int cc2, int c if (notice.type >= SPECIAL) COMMENT(¬ice, &buf, "All Rights Reserved", 0); } - if (notice.type == CPL) + if (notice.type == CPL || notice.type == EPL) { copy(&tmp, notice.item[PACKAGE].data ? "and" : "This software", -1); copy(&tmp, " is licensed under the", -1); comment(¬ice, &buf, BUF(&tmp), USE(&tmp), 0); - copy(&tmp, "Common Public License", -1); + if (notice.type == EPL) + copy(&tmp, "Eclipse Public License", -1); + else + copy(&tmp, "Common Public License", -1); if (notice.item[VERSION].data) { copy(&tmp, ", Version ", -1); @@ -718,6 +736,8 @@ astlicense(char* p, int size, char* file, char* options, int cc1, int cc2, int c comment(¬ice, &buf, BUF(&tmp), USE(&tmp), 0); } } + else if (notice.type == EPL) + COMMENT(¬ice, &buf, "http://www.eclipse.org/org/documents/epl-v10.html", 0); else COMMENT(¬ice, &buf, "http://www.opensource.org/licenses/cpl", 0); comment(¬ice, &buf, NiL, 0, 0); diff --git a/usr/src/lib/libast/common/port/astmath.c b/usr/src/lib/libast/common/port/astmath.c index eba93b384b..cc2d602f30 100644 --- a/usr/src/lib/libast/common/port/astmath.c +++ b/usr/src/lib/libast/common/port/astmath.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/astquery.c b/usr/src/lib/libast/common/port/astquery.c index 2cfa7bd3d3..3284783314 100644 --- a/usr/src/lib/libast/common/port/astquery.c +++ b/usr/src/lib/libast/common/port/astquery.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/aststatic.c b/usr/src/lib/libast/common/port/aststatic.c index a4764670c2..9792f03a35 100644 --- a/usr/src/lib/libast/common/port/aststatic.c +++ b/usr/src/lib/libast/common/port/aststatic.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/astwinsize.c b/usr/src/lib/libast/common/port/astwinsize.c index 350859a2b1..8c77f63942 100644 --- a/usr/src/lib/libast/common/port/astwinsize.c +++ b/usr/src/lib/libast/common/port/astwinsize.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/iblocks.c b/usr/src/lib/libast/common/port/iblocks.c index 3fd30dcbde..07cea73b86 100644 --- a/usr/src/lib/libast/common/port/iblocks.c +++ b/usr/src/lib/libast/common/port/iblocks.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/lc.c b/usr/src/lib/libast/common/port/lc.c index d4f2158c2e..db94a6acbb 100644 --- a/usr/src/lib/libast/common/port/lc.c +++ b/usr/src/lib/libast/common/port/lc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/lcgen.c b/usr/src/lib/libast/common/port/lcgen.c index 4fd1271ce5..e91f69b39a 100644 --- a/usr/src/lib/libast/common/port/lcgen.c +++ b/usr/src/lib/libast/common/port/lcgen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -332,7 +332,9 @@ char** argv; fprintf(hf, "#define LC_undefined\t\t0x00100\n"); fprintf(hf, "#define LC_utf8\t\t\t0x00200\n"); fprintf(hf, "#define LC_verbose\t\t0x00400\n"); - fprintf(hf, "#define LC_user\t\t\t0x10000\n"); + fprintf(hf, "#define LC_setlocale\t\t\t0x10000\n"); + fprintf(hf, "#define LC_setenv\t\t\t0x20000\n"); + fprintf(hf, "#define LC_user\t\t\t0x40000\n"); fprintf(lf, "/* : : generated by %s : : */\n", command); fprintf(lf, "\n"); fprintf(lf, "#include \"lclib.h\"\n"); @@ -677,6 +679,7 @@ char** argv; fprintf(hf, "\tint\t\t\tinternal;\n"); fprintf(hf, "\tLc_category_set_f\tsetf;\n"); fprintf(hf, "\tLc_t*\t\t\tprev;\n"); + fprintf(hf, "\tunsigned int\t\tflags;\n"); fprintf(hf, "} Lc_category_t;\n"); fprintf(hf, "\n"); fprintf(hf, "#if _BLD_ast && defined(__EXPORT__)\n"); diff --git a/usr/src/lib/libast/common/port/lclang.h b/usr/src/lib/libast/common/port/lclang.h index 2433d9fcfa..917a538744 100644 --- a/usr/src/lib/libast/common/port/lclang.h +++ b/usr/src/lib/libast/common/port/lclang.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/lclib.h b/usr/src/lib/libast/common/port/lclib.h index 50dc36ea53..32eaacd176 100644 --- a/usr/src/lib/libast/common/port/lclib.h +++ b/usr/src/lib/libast/common/port/lclib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/mc.c b/usr/src/lib/libast/common/port/mc.c index e5637b5669..5c26513f2f 100644 --- a/usr/src/lib/libast/common/port/mc.c +++ b/usr/src/lib/libast/common/port/mc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/mnt.c b/usr/src/lib/libast/common/port/mnt.c index 37a6ed4812..080abed431 100644 --- a/usr/src/lib/libast/common/port/mnt.c +++ b/usr/src/lib/libast/common/port/mnt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/port/touch.c b/usr/src/lib/libast/common/port/touch.c index f3974502bb..7486062c03 100644 --- a/usr/src/lib/libast/common/port/touch.c +++ b/usr/src/lib/libast/common/port/touch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/preroot/getpreroot.c b/usr/src/lib/libast/common/preroot/getpreroot.c index e63b6678eb..8d48fa9825 100644 --- a/usr/src/lib/libast/common/preroot/getpreroot.c +++ b/usr/src/lib/libast/common/preroot/getpreroot.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/preroot/ispreroot.c b/usr/src/lib/libast/common/preroot/ispreroot.c index d03bdbb4af..235994a483 100644 --- a/usr/src/lib/libast/common/preroot/ispreroot.c +++ b/usr/src/lib/libast/common/preroot/ispreroot.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/preroot/realopen.c b/usr/src/lib/libast/common/preroot/realopen.c index cbe6f0031d..6d3361ded3 100644 --- a/usr/src/lib/libast/common/preroot/realopen.c +++ b/usr/src/lib/libast/common/preroot/realopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/preroot/setpreroot.c b/usr/src/lib/libast/common/preroot/setpreroot.c index fa482ec03a..1656e0703e 100644 --- a/usr/src/lib/libast/common/preroot/setpreroot.c +++ b/usr/src/lib/libast/common/preroot/setpreroot.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regalloc.c b/usr/src/lib/libast/common/regex/regalloc.c index 710800ef60..8c90f5f7f3 100644 --- a/usr/src/lib/libast/common/regex/regalloc.c +++ b/usr/src/lib/libast/common/regex/regalloc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regcache.c b/usr/src/lib/libast/common/regex/regcache.c index f40f31fc09..438f7e79e1 100644 --- a/usr/src/lib/libast/common/regex/regcache.c +++ b/usr/src/lib/libast/common/regex/regcache.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -23,31 +23,25 @@ /* * regcomp() regex_t cache - * AT&T Research + * at&t research */ #include <ast.h> #include <regex.h> #define CACHE 8 /* default # cached re's */ -#define MAXPAT 256 /* max pattern length + 1 */ +#define ROUND 64 /* pattern buffer size round */ -#define KEEP 01 -#define DROP 02 - -typedef union Pattern_u -{ - unsigned long key; - char buf[MAXPAT]; -} Pattern_t; +typedef unsigned long Key_t; typedef struct Cache_s { - Pattern_t pattern; + char* pattern; regex_t re; unsigned long serial; regflags_t reflags; - int flags; + int keep; + int size; } Cache_t; typedef struct State_s @@ -70,9 +64,9 @@ flushcache(void) register int i; for (i = matchstate.size; i--;) - if (matchstate.cache[i] && matchstate.cache[i]->flags) + if (matchstate.cache[i] && matchstate.cache[i]->keep) { - matchstate.cache[i]->flags = 0; + matchstate.cache[i]->keep = 0; regfree(&matchstate.cache[i]->re); } } @@ -90,7 +84,7 @@ regcache(const char* pattern, regflags_t reflags, int* status) int empty; int unused; int old; - Pattern_t head; + Key_t key; /* * 0 pattern flushes the cache and reflags>0 extends cache @@ -137,25 +131,18 @@ regcache(const char* pattern, regflags_t reflags, int* status) * check if the pattern is in the cache */ - for (i = 0; i < sizeof(unsigned long) && pattern[i]; i++) - head.buf[i] = pattern[i]; - for (; i < sizeof(unsigned long); i++) - head.buf[i] = 0; + for (i = 0; i < sizeof(key) && pattern[i]; i++) + ((char*)&key)[i] = pattern[i]; + for (; i < sizeof(key); i++) + ((char*)&key)[i] = 0; empty = unused = -1; old = 0; for (i = matchstate.size; i--;) if (!matchstate.cache[i]) empty = i; - else if (!(matchstate.cache[i]->flags & KEEP)) - { - if (matchstate.cache[i]->flags) - { - matchstate.cache[i]->flags = 0; - regfree(&matchstate.cache[i]->re); - } + else if (!matchstate.cache[i]->keep) unused = i; - } - else if (matchstate.cache[i]->pattern.key == head.key && !strcmp(matchstate.cache[i]->pattern.buf, pattern) && matchstate.cache[i]->reflags == reflags) + else if (*(Key_t*)matchstate.cache[i]->pattern == key && !strcmp(matchstate.cache[i]->pattern, pattern) && matchstate.cache[i]->reflags == reflags) break; else if (!matchstate.cache[old] || matchstate.cache[old]->serial > matchstate.cache[i]->serial) old = i; @@ -174,29 +161,33 @@ regcache(const char* pattern, regflags_t reflags, int* status) *status = REG_ESPACE; return 0; } - if (cp->flags) + if (cp->keep) { - cp->flags = 0; + cp->keep = 0; regfree(&cp->re); } - cp->reflags = reflags; - if ((i = strlen(pattern)) < sizeof(cp->pattern.buf)) + if ((i = strlen(pattern) + 1) >= cp->size) { - if (i < sizeof(unsigned long)) - memset(cp->pattern.buf, 0, sizeof(unsigned long)); - strcpy(cp->pattern.buf, pattern); - pattern = (const char*)cp->pattern.buf; - cp->flags = KEEP; + cp->size = roundof(i, ROUND); + if (!(cp->pattern = newof(cp->pattern, char, cp->size, 0))) + { + if (status) + *status = REG_ESPACE; + return 0; + } } - else - cp->flags = DROP; - if (i = regcomp(&cp->re, pattern, cp->reflags)) + strcpy(cp->pattern, pattern); + while (++i < sizeof(Key_t)) + cp->pattern[i] = 0; + pattern = (const char*)cp->pattern; + if (i = regcomp(&cp->re, pattern, reflags)) { if (status) *status = i; - cp->flags = 0; return 0; } + cp->keep = 1; + cp->reflags = reflags; } else cp = matchstate.cache[i]; diff --git a/usr/src/lib/libast/common/regex/regclass.c b/usr/src/lib/libast/common/regex/regclass.c index b68ef4b00b..e908d6821c 100644 --- a/usr/src/lib/libast/common/regex/regclass.c +++ b/usr/src/lib/libast/common/regex/regclass.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regcoll.c b/usr/src/lib/libast/common/regex/regcoll.c index 178b635790..240dcc1f4c 100644 --- a/usr/src/lib/libast/common/regex/regcoll.c +++ b/usr/src/lib/libast/common/regex/regcoll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regcomp.c b/usr/src/lib/libast/common/regex/regcomp.c index 90098dfbc2..4573cc217b 100644 --- a/usr/src/lib/libast/common/regex/regcomp.c +++ b/usr/src/lib/libast/common/regex/regcomp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -85,6 +85,7 @@ typedef struct Stats_s unsigned short a; /* number of alternations */ unsigned short b; /* number of backrefs */ unsigned short c; /* number of closures */ + unsigned short e; /* $ */ unsigned short i; /* number of negations */ unsigned short p; /* number of named subexpressions */ unsigned short s; /* number of simple closures */ @@ -461,6 +462,9 @@ stats(register Cenv_t* env, register Rex_t* e) if ((env->stats.n += cn) < nn) return 1; break; + case REX_END: + env->stats.e = 1; + break; case REX_GROUP: if (e->re.group.number && ++env->stats.p <= 0 || !e->re.group.number && ++env->stats.u <= 0) return 1; @@ -995,9 +999,9 @@ token(register Cenv_t* env) } else if (c == '^') { - if (env->type == BRE && (env->cursor == env->pattern || posixkludge)) + if (env->type == BRE && (env->cursor == env->pattern || posixkludge == 1)) { - env->posixkludge = 1; + env->posixkludge = 2; return T_CFLX; } } @@ -1069,7 +1073,7 @@ col(Celt_t* ce, int ic, unsigned char* bp, int bw, int bc, unsigned char* ep, in if (cc > 0) { cc = -1; - k += wctomb((char*)k, c); + k += mbconv((char*)k, c); } else for (e = k + bw; k < e; *k++ = *s++); @@ -1125,7 +1129,7 @@ col(Celt_t* ce, int ic, unsigned char* bp, int bw, int bc, unsigned char* ep, in if (cc > 0) { cc = -1; - k += wctomb((char*)k, c); + k += mbconv((char*)k, c); } else for (e = k + ew; k < e; *k++ = *s++); @@ -1199,10 +1203,10 @@ bra(Cenv_t* env) inrange = 0; for (;;) { - if (!(c = *env->cursor) || c == env->terminator || (env->flags & REG_ESCAPE) && c == env->delimiter) + if (!(c = *env->cursor) || c == env->terminator || c == env->delimiter && (env->flags & REG_ESCAPE)) goto error; env->cursor += (w = MBSIZE(env->cursor)); - if (c == '\\') + if (c == '\\' && ((env->flags & REG_CLASS_ESCAPE) || env->type >= SRE && env->parnest || *env->cursor == env->delimiter && (env->flags & REG_ESCAPE))) { if (*env->cursor) { @@ -1380,18 +1384,24 @@ bra(Cenv_t* env) complicated++; if (inrange == 2) { - if (last > c) + if (last <= c) + { + for (i = last; i <= c; i++) + setadd(e->re.charclass, i); + inrange = env->type >= SRE || (env->flags & REG_LENIENT); + elements += 2; + } + else if (env->type >= SRE) { - if (env->type < SRE && !(env->flags & REG_LENIENT)) - goto erange; setadd(e->re.charclass, last); setadd(e->re.charclass, c); + elements += 2; + inrange = 1; } + else if (!(env->flags & REG_LENIENT)) + goto erange; else - for (i = last; i <= c; i++) - setadd(e->re.charclass, i); - inrange = env->type >= SRE || (env->flags & REG_LENIENT); - elements += 2; + inrange = 0; } else if (inrange == 1) { @@ -1465,7 +1475,7 @@ bra(Cenv_t* env) goto error; pp = env->cursor; env->cursor += (w = MBSIZE(env->cursor)); - if (c == '\\') + if (c == '\\' && ((env->flags & REG_CLASS_ESCAPE) || env->type >= SRE && env->parnest || *env->cursor == env->delimiter && (env->flags & REG_ESCAPE))) { if (*env->cursor) { @@ -1497,7 +1507,7 @@ bra(Cenv_t* env) if (env->token.len > 1 || w >= 0 && w < T_META) { c = w; - w = wctomb(mbc, c); + w = mbconv(mbc, c); pp = (unsigned char*)mbc; env->cursor += env->token.len; } @@ -1597,7 +1607,7 @@ bra(Cenv_t* env) if (iswupper(wc)) { wc = towlower(wc); - rw = wctomb((char*)pp, wc); + rw = mbconv((char*)pp, wc); c = 'u'; } else if (iswlower(wc)) @@ -1635,7 +1645,7 @@ bra(Cenv_t* env) wc = towupper(wc); c = 'U'; } - rw = wctomb((char*)pp, wc); + rw = mbconv((char*)pp, wc); } inrange = 0; c = *pp; @@ -2048,6 +2058,7 @@ grp(Cenv_t* env, int parno) case 'M': /* glob(3) */ case 'N': /* glob(3) */ case 'O': /* glob(3) */ + case 'P': case 'R': /* pcre */ case 'S': case 'U': /* pcre */ @@ -2138,28 +2149,28 @@ grp(Cenv_t* env, int parno) env->flags &= ~REG_COMMENT; break; case 'A': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); env->flags |= REG_AUGMENTED|REG_EXTENDED; typ = ARE; break; case 'B': case 'G': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); typ = BRE; break; case 'E': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); env->flags |= REG_EXTENDED; typ = ERE; break; case 'F': case 'L': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); env->flags |= REG_LITERAL; typ = ERE; break; case 'K': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); env->flags |= REG_AUGMENTED|REG_SHELL|REG_LEFT|REG_RIGHT; typ = KRE; break; @@ -2172,8 +2183,13 @@ grp(Cenv_t* env, int parno) case 'O': /* used by caller to disable glob(3) GLOB_STARSTAR */ break; + case 'P': + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); + env->flags |= REG_EXTENDED|REG_CLASS_ESCAPE; + typ = ERE; + break; case 'S': - env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT); + env->flags &= ~(REG_AUGMENTED|REG_EXTENDED|REG_LITERAL|REG_SHELL|REG_LEFT|REG_RIGHT|REG_CLASS_ESCAPE); env->flags |= REG_SHELL|REG_LEFT|REG_RIGHT; typ = SRE; break; @@ -2549,7 +2565,7 @@ seq(Cenv_t* env) c = towupper(c); if ((&buf[sizeof(buf)] - s) < MB_CUR_MAX) break; - if ((n = wctomb((char*)s, c)) < 0) + if ((n = mbconv((char*)s, c)) < 0) *s++ = c; else if (n) s += n; @@ -3004,7 +3020,7 @@ special(Cenv_t* env, regex_t* p) a->re.bm.back = (y == e || y == e->re.group.expr.rex) ? (m - n) : -1; a->re.bm.left = l - 1; a->re.bm.right = env->stats.m - l - n; - a->re.bm.complete = (y != e && (e->type != REX_GROUP || y != e->re.group.expr.rex) || e->next || ((a->re.bm.left + a->re.bm.right) >= 0)) ? 0 : n; + a->re.bm.complete = (env->stats.e || y != e && (e->type != REX_GROUP || y != e->re.group.expr.rex) || e->next || ((a->re.bm.left + a->re.bm.right) >= 0)) ? 0 : n; h = (Bm_mask_t*)&a->re.bm.mask[n]; a->re.bm.skip = (size_t*)(h + n * (UCHAR_MAX + 1)); a->re.bm.fail = &a->re.bm.skip[UCHAR_MAX + 1]; @@ -3394,6 +3410,7 @@ regcomb(regex_t* p, regex_t* q) Rex_t* e = p->env->rex; Rex_t* f = q->env->rex; Rex_t* g; + Rex_t* h; Cenv_t env; if (!e || !f) @@ -3428,13 +3445,15 @@ regcomb(regex_t* p, regex_t* q) drop(env.disc, f); f = q->env->rex; } - if (e->next && e->next->type == REX_END && f->next && f->next->type == REX_END) + for (g = e; g->next; g = g->next); + for (h = f; h->next; h = h->next); + if (g->next && g->next->type == REX_END && h->next && h->next->type == REX_END) { p->env->flags |= REG_RIGHT; - drop(env.disc, e->next); - e->next = 0; - drop(env.disc, f->next); - f->next = 0; + drop(env.disc, g->next); + g->next = 0; + drop(env.disc, h->next); + h->next = 0; } if (!(g = trie(&env, f, e))) return fatal(p->env->disc, REG_BADPAT, NiL); diff --git a/usr/src/lib/libast/common/regex/regdecomp.c b/usr/src/lib/libast/common/regex/regdecomp.c index a89722480a..1f239615b1 100644 --- a/usr/src/lib/libast/common/regex/regdecomp.c +++ b/usr/src/lib/libast/common/regex/regdecomp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -75,6 +75,7 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) unsigned char* s; unsigned char* t; int c; + int m; int cb; int cd; int cr; @@ -152,19 +153,19 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) cb = cd = cr = 0; s = nc; t = ic; - for (c = 0; c <= UCHAR_MAX; c++) - if (settst(e->re.charclass, c)) + for (m = 0; m <= UCHAR_MAX; m++) + if (settst(e->re.charclass, m)) { - if (c == ']') + if (m == ']') cb = 1; - else if (c == '-') + else if (m == '-') cr = 1; - else if (c == delimiter) + else if (m == delimiter) cd = 1; else if (nb < 0) - ne = nb = c; - else if (ne == (c - 1)) - ne = c; + ne = nb = m; + else if (ne == (m - 1)) + ne = m; else { if (ne == nb) @@ -175,21 +176,21 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) *s++ = '-'; *s++ = ne; } - ne = nb = c; + ne = nb = m; } } else { - if (c == ']') + if (m == ']') cb = -1; - else if (c == '-') + else if (m == '-') cr = -1; - else if (c == delimiter) + else if (m == delimiter) cd = -1; else if (ib < 0) - ie = ib = c; - else if (ie == (c - 1)) - ie = c; + ie = ib = m; + else if (ie == (m - 1)) + ie = m; else { if (ie == ib) @@ -200,7 +201,7 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) *t++ = '-'; *t++ = ie; } - ie = ib = c; + ie = ib = m; } } if (nb >= 0) @@ -228,7 +229,7 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) sfputc(sp, ']'); if (cr < 0) sfputc(sp, '-'); - if (cd < 0) + if (cd < 0 && delimiter > 0) { if (flags & REG_ESCAPE) sfputc(sp, '\\'); @@ -242,7 +243,7 @@ decomp(register Rex_t* e, Sfio_t* sp, int type, int delimiter, regflags_t flags) sfputc(sp, ']'); if (cr > 0) sfputc(sp, '-'); - if (cd > 0) + if (cd > 0 && delimiter > 0) { if (flags & REG_ESCAPE) sfputc(sp, '\\'); @@ -400,7 +401,7 @@ regdecomp(regex_t* p, regflags_t flags, char* buf, size_t n) if (!(sp = sfstropen())) return 0; - if (flags < 0) + if (flags == (regflags_t)~0) flags = p->env->flags; switch (flags & (REG_AUGMENTED|REG_EXTENDED|REG_SHELL)) { @@ -427,12 +428,12 @@ regdecomp(regex_t* p, regflags_t flags, char* buf, size_t n) sfputc(sp, delimiter); } else - delimiter = 0; + delimiter = -1; if (decomp(p->env->rex, sp, type, delimiter, flags)) r = 0; else { - if (delimiter) + if (delimiter > 0) sfputc(sp, delimiter); if ((r = sfstrtell(sp) + 1) <= n) { diff --git a/usr/src/lib/libast/common/regex/regerror.c b/usr/src/lib/libast/common/regex/regerror.c index 596e62ce45..3899e47008 100644 --- a/usr/src/lib/libast/common/regex/regerror.c +++ b/usr/src/lib/libast/common/regex/regerror.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -25,7 +25,7 @@ * posix regex error message handler */ -static const char id[] = "\n@(#)$Id: regex (AT&T Research) 2008-05-11 $\0\n"; +static const char id[] = "\n@(#)$Id: regex (AT&T Research) 2009-12-11 $\0\n"; #include "reglib.h" @@ -45,7 +45,7 @@ static const char* reg_error[] = /* REG_BADBR */ "invalid {...} digits", /* REG_ERANGE */ "invalid [...] range endpoint", /* REG_ESPACE */ "out of space", - /* REG_BADRPT */ "unary op not preceeded by re", + /* REG_BADRPT */ "unary op not preceded by re", /* REG_ENULL */ "empty subexpr in pattern", /* REG_ECOUNT */ "re component count overflow", /* REG_BADESC */ "invalid \\char escape", diff --git a/usr/src/lib/libast/common/regex/regexec.c b/usr/src/lib/libast/common/regex/regexec.c index 3293c2207e..e73efa09bc 100644 --- a/usr/src/lib/libast/common/regex/regexec.c +++ b/usr/src/lib/libast/common/regex/regexec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regfatal.c b/usr/src/lib/libast/common/regex/regfatal.c index ccf3a1ec44..ae48477e90 100644 --- a/usr/src/lib/libast/common/regex/regfatal.c +++ b/usr/src/lib/libast/common/regex/regfatal.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/reginit.c b/usr/src/lib/libast/common/regex/reginit.c index 133702b721..23066fa5b5 100644 --- a/usr/src/lib/libast/common/regex/reginit.c +++ b/usr/src/lib/libast/common/regex/reginit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/reglib.h b/usr/src/lib/libast/common/regex/reglib.h index 25f461debe..8d2d3ea707 100644 --- a/usr/src/lib/libast/common/regex/reglib.h +++ b/usr/src/lib/libast/common/regex/reglib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regnexec.c b/usr/src/lib/libast/common/regex/regnexec.c index 28763b471a..13bb1b7238 100644 --- a/usr/src/lib/libast/common/regex/regnexec.c +++ b/usr/src/lib/libast/common/regex/regnexec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -628,7 +628,7 @@ collic(register Celt_t* ce, char* key, register char* nxt, int c, int x) c = towlower(c); else return 0; - x = wctomb(key, c); + x = mbconv(key, c); key[x] = 0; return collelt(ce, key, c, 0); } diff --git a/usr/src/lib/libast/common/regex/regrecord.c b/usr/src/lib/libast/common/regex/regrecord.c index 1f531aa63a..1a3b428ac1 100644 --- a/usr/src/lib/libast/common/regex/regrecord.c +++ b/usr/src/lib/libast/common/regex/regrecord.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regrexec.c b/usr/src/lib/libast/common/regex/regrexec.c index 4b49a57d63..a6d5fb5351 100644 --- a/usr/src/lib/libast/common/regex/regrexec.c +++ b/usr/src/lib/libast/common/regex/regrexec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regstat.c b/usr/src/lib/libast/common/regex/regstat.c index c896068672..456bec1e86 100644 --- a/usr/src/lib/libast/common/regex/regstat.c +++ b/usr/src/lib/libast/common/regex/regstat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regsub.c b/usr/src/lib/libast/common/regex/regsub.c index 749c9d1a13..288ed1418f 100644 --- a/usr/src/lib/libast/common/regex/regsub.c +++ b/usr/src/lib/libast/common/regex/regsub.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regsubcomp.c b/usr/src/lib/libast/common/regex/regsubcomp.c index d7b3625049..bc0f866a40 100644 --- a/usr/src/lib/libast/common/regex/regsubcomp.c +++ b/usr/src/lib/libast/common/regex/regsubcomp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/regsubexec.c b/usr/src/lib/libast/common/regex/regsubexec.c index b4599ee5a1..d94635b548 100644 --- a/usr/src/lib/libast/common/regex/regsubexec.c +++ b/usr/src/lib/libast/common/regex/regsubexec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/regex/ucs_names.h b/usr/src/lib/libast/common/regex/ucs_names.h index 13acdd5edd..c97e48d916 100644 --- a/usr/src/lib/libast/common/regex/ucs_names.h +++ b/usr/src/lib/libast/common/regex/ucs_names.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfclrerr.c b/usr/src/lib/libast/common/sfio/_sfclrerr.c index a5c02aca9c..6bb4de38f5 100644 --- a/usr/src/lib/libast/common/sfio/_sfclrerr.c +++ b/usr/src/lib/libast/common/sfio/_sfclrerr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfdlen.c b/usr/src/lib/libast/common/sfio/_sfdlen.c index 179231a4c3..7eee346f37 100644 --- a/usr/src/lib/libast/common/sfio/_sfdlen.c +++ b/usr/src/lib/libast/common/sfio/_sfdlen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfeof.c b/usr/src/lib/libast/common/sfio/_sfeof.c index d11e24b272..dfd8e9c6a2 100644 --- a/usr/src/lib/libast/common/sfio/_sfeof.c +++ b/usr/src/lib/libast/common/sfio/_sfeof.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sferror.c b/usr/src/lib/libast/common/sfio/_sferror.c index 39124c804d..a34d9168fd 100644 --- a/usr/src/lib/libast/common/sfio/_sferror.c +++ b/usr/src/lib/libast/common/sfio/_sferror.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sffileno.c b/usr/src/lib/libast/common/sfio/_sffileno.c index 642bfe9f14..7b7dcf8692 100644 --- a/usr/src/lib/libast/common/sfio/_sffileno.c +++ b/usr/src/lib/libast/common/sfio/_sffileno.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfgetc.c b/usr/src/lib/libast/common/sfio/_sfgetc.c index dc83691c9c..0138c8a9f7 100644 --- a/usr/src/lib/libast/common/sfio/_sfgetc.c +++ b/usr/src/lib/libast/common/sfio/_sfgetc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfgetl.c b/usr/src/lib/libast/common/sfio/_sfgetl.c index fd084ebc8e..6aa31dd3d2 100644 --- a/usr/src/lib/libast/common/sfio/_sfgetl.c +++ b/usr/src/lib/libast/common/sfio/_sfgetl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfgetl2.c b/usr/src/lib/libast/common/sfio/_sfgetl2.c index 4e0a66729b..c6728f5840 100644 --- a/usr/src/lib/libast/common/sfio/_sfgetl2.c +++ b/usr/src/lib/libast/common/sfio/_sfgetl2.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfgetu.c b/usr/src/lib/libast/common/sfio/_sfgetu.c index adfc9370bd..4d8fd3f5f5 100644 --- a/usr/src/lib/libast/common/sfio/_sfgetu.c +++ b/usr/src/lib/libast/common/sfio/_sfgetu.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfgetu2.c b/usr/src/lib/libast/common/sfio/_sfgetu2.c index c19ed29b86..aa878938c8 100644 --- a/usr/src/lib/libast/common/sfio/_sfgetu2.c +++ b/usr/src/lib/libast/common/sfio/_sfgetu2.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfllen.c b/usr/src/lib/libast/common/sfio/_sfllen.c index 478d7ed897..fdce589fcc 100644 --- a/usr/src/lib/libast/common/sfio/_sfllen.c +++ b/usr/src/lib/libast/common/sfio/_sfllen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfopen.c b/usr/src/lib/libast/common/sfio/_sfopen.c index be64dc6a26..80b669cbe6 100644 --- a/usr/src/lib/libast/common/sfio/_sfopen.c +++ b/usr/src/lib/libast/common/sfio/_sfopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfputc.c b/usr/src/lib/libast/common/sfio/_sfputc.c index d8255f8da1..350b027c26 100644 --- a/usr/src/lib/libast/common/sfio/_sfputc.c +++ b/usr/src/lib/libast/common/sfio/_sfputc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfputd.c b/usr/src/lib/libast/common/sfio/_sfputd.c index 43e395980f..717d81c5d0 100644 --- a/usr/src/lib/libast/common/sfio/_sfputd.c +++ b/usr/src/lib/libast/common/sfio/_sfputd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfputl.c b/usr/src/lib/libast/common/sfio/_sfputl.c index 16d3d00b42..597944fbd4 100644 --- a/usr/src/lib/libast/common/sfio/_sfputl.c +++ b/usr/src/lib/libast/common/sfio/_sfputl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfputm.c b/usr/src/lib/libast/common/sfio/_sfputm.c index 79f1bad4ac..37ecc4dfaa 100644 --- a/usr/src/lib/libast/common/sfio/_sfputm.c +++ b/usr/src/lib/libast/common/sfio/_sfputm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfputu.c b/usr/src/lib/libast/common/sfio/_sfputu.c index 69d4903e83..6afa21ca88 100644 --- a/usr/src/lib/libast/common/sfio/_sfputu.c +++ b/usr/src/lib/libast/common/sfio/_sfputu.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfslen.c b/usr/src/lib/libast/common/sfio/_sfslen.c index dcf6f60e62..23db89f3fa 100644 --- a/usr/src/lib/libast/common/sfio/_sfslen.c +++ b/usr/src/lib/libast/common/sfio/_sfslen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfstacked.c b/usr/src/lib/libast/common/sfio/_sfstacked.c index 12b62bc025..98f8b9e89e 100644 --- a/usr/src/lib/libast/common/sfio/_sfstacked.c +++ b/usr/src/lib/libast/common/sfio/_sfstacked.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfulen.c b/usr/src/lib/libast/common/sfio/_sfulen.c index e872fc2750..762b0b7da7 100644 --- a/usr/src/lib/libast/common/sfio/_sfulen.c +++ b/usr/src/lib/libast/common/sfio/_sfulen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/_sfvalue.c b/usr/src/lib/libast/common/sfio/_sfvalue.c index 89f55f5605..6d4847b0e9 100644 --- a/usr/src/lib/libast/common/sfio/_sfvalue.c +++ b/usr/src/lib/libast/common/sfio/_sfvalue.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfclose.c b/usr/src/lib/libast/common/sfio/sfclose.c index 08f5d1c2a9..446e11087d 100644 --- a/usr/src/lib/libast/common/sfio/sfclose.c +++ b/usr/src/lib/libast/common/sfio/sfclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfclrlock.c b/usr/src/lib/libast/common/sfio/sfclrlock.c index 211d16d20d..f6b3a24667 100644 --- a/usr/src/lib/libast/common/sfio/sfclrlock.c +++ b/usr/src/lib/libast/common/sfio/sfclrlock.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfcvt.c b/usr/src/lib/libast/common/sfio/sfcvt.c index 0022470438..646a89e2ea 100644 --- a/usr/src/lib/libast/common/sfio/sfcvt.c +++ b/usr/src/lib/libast/common/sfio/sfcvt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfdisc.c b/usr/src/lib/libast/common/sfio/sfdisc.c index cf390d1160..3958fc3671 100644 --- a/usr/src/lib/libast/common/sfio/sfdisc.c +++ b/usr/src/lib/libast/common/sfio/sfdisc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfdlen.c b/usr/src/lib/libast/common/sfio/sfdlen.c index 8d4cd03c47..d44c98211b 100644 --- a/usr/src/lib/libast/common/sfio/sfdlen.c +++ b/usr/src/lib/libast/common/sfio/sfdlen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfecvt.c b/usr/src/lib/libast/common/sfio/sfecvt.c index 1e35ec231b..d51e3fa050 100644 --- a/usr/src/lib/libast/common/sfio/sfecvt.c +++ b/usr/src/lib/libast/common/sfio/sfecvt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfexcept.c b/usr/src/lib/libast/common/sfio/sfexcept.c index c427d5333c..b2025a8122 100644 --- a/usr/src/lib/libast/common/sfio/sfexcept.c +++ b/usr/src/lib/libast/common/sfio/sfexcept.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfextern.c b/usr/src/lib/libast/common/sfio/sfextern.c index a7f4941153..88f500067e 100644 --- a/usr/src/lib/libast/common/sfio/sfextern.c +++ b/usr/src/lib/libast/common/sfio/sfextern.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sffcvt.c b/usr/src/lib/libast/common/sfio/sffcvt.c index 1d6a5ff397..f6e3431c24 100644 --- a/usr/src/lib/libast/common/sfio/sffcvt.c +++ b/usr/src/lib/libast/common/sfio/sffcvt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sffilbuf.c b/usr/src/lib/libast/common/sfio/sffilbuf.c index 5fa88a4918..d7209a7ca7 100644 --- a/usr/src/lib/libast/common/sfio/sffilbuf.c +++ b/usr/src/lib/libast/common/sfio/sffilbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfflsbuf.c b/usr/src/lib/libast/common/sfio/sfflsbuf.c index a7018da0cc..aaaa66d715 100644 --- a/usr/src/lib/libast/common/sfio/sfflsbuf.c +++ b/usr/src/lib/libast/common/sfio/sfflsbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfgetd.c b/usr/src/lib/libast/common/sfio/sfgetd.c index 803761843b..510c272305 100644 --- a/usr/src/lib/libast/common/sfio/sfgetd.c +++ b/usr/src/lib/libast/common/sfio/sfgetd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfgetl.c b/usr/src/lib/libast/common/sfio/sfgetl.c index fd7e3390b6..01cbf756be 100644 --- a/usr/src/lib/libast/common/sfio/sfgetl.c +++ b/usr/src/lib/libast/common/sfio/sfgetl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfgetm.c b/usr/src/lib/libast/common/sfio/sfgetm.c index 7199c9c34d..a72e6b3d30 100644 --- a/usr/src/lib/libast/common/sfio/sfgetm.c +++ b/usr/src/lib/libast/common/sfio/sfgetm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfgetr.c b/usr/src/lib/libast/common/sfio/sfgetr.c index 7a1aa3184a..6d422692f5 100644 --- a/usr/src/lib/libast/common/sfio/sfgetr.c +++ b/usr/src/lib/libast/common/sfio/sfgetr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfgetu.c b/usr/src/lib/libast/common/sfio/sfgetu.c index 6f64003854..2f26665c8a 100644 --- a/usr/src/lib/libast/common/sfio/sfgetu.c +++ b/usr/src/lib/libast/common/sfio/sfgetu.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfhdr.h b/usr/src/lib/libast/common/sfio/sfhdr.h index 8fe2e3a52d..0547ee54ec 100644 --- a/usr/src/lib/libast/common/sfio/sfhdr.h +++ b/usr/src/lib/libast/common/sfio/sfhdr.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfllen.c b/usr/src/lib/libast/common/sfio/sfllen.c index 17381b15fa..9bf2eda3a3 100644 --- a/usr/src/lib/libast/common/sfio/sfllen.c +++ b/usr/src/lib/libast/common/sfio/sfllen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfmode.c b/usr/src/lib/libast/common/sfio/sfmode.c index 1e9a2badd8..5ba7358d25 100644 --- a/usr/src/lib/libast/common/sfio/sfmode.c +++ b/usr/src/lib/libast/common/sfio/sfmode.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfmove.c b/usr/src/lib/libast/common/sfio/sfmove.c index 8ac858c204..d17bea90f3 100644 --- a/usr/src/lib/libast/common/sfio/sfmove.c +++ b/usr/src/lib/libast/common/sfio/sfmove.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfmutex.c b/usr/src/lib/libast/common/sfio/sfmutex.c index 2a1cc12eac..ac17596b5b 100644 --- a/usr/src/lib/libast/common/sfio/sfmutex.c +++ b/usr/src/lib/libast/common/sfio/sfmutex.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfnew.c b/usr/src/lib/libast/common/sfio/sfnew.c index e163b750f3..08b41e7f07 100644 --- a/usr/src/lib/libast/common/sfio/sfnew.c +++ b/usr/src/lib/libast/common/sfio/sfnew.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfnotify.c b/usr/src/lib/libast/common/sfio/sfnotify.c index c5424f0018..3fc13a3290 100644 --- a/usr/src/lib/libast/common/sfio/sfnotify.c +++ b/usr/src/lib/libast/common/sfio/sfnotify.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfnputc.c b/usr/src/lib/libast/common/sfio/sfnputc.c index 3b9bf164c8..85c9f6214d 100644 --- a/usr/src/lib/libast/common/sfio/sfnputc.c +++ b/usr/src/lib/libast/common/sfio/sfnputc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfopen.c b/usr/src/lib/libast/common/sfio/sfopen.c index 944bfa9f3b..90403d535b 100644 --- a/usr/src/lib/libast/common/sfio/sfopen.c +++ b/usr/src/lib/libast/common/sfio/sfopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpeek.c b/usr/src/lib/libast/common/sfio/sfpeek.c index 40c827d48b..0cf32301f9 100644 --- a/usr/src/lib/libast/common/sfio/sfpeek.c +++ b/usr/src/lib/libast/common/sfio/sfpeek.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpkrd.c b/usr/src/lib/libast/common/sfio/sfpkrd.c index 398a880054..cf66d7a46b 100644 --- a/usr/src/lib/libast/common/sfio/sfpkrd.c +++ b/usr/src/lib/libast/common/sfio/sfpkrd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpoll.c b/usr/src/lib/libast/common/sfio/sfpoll.c index d26917e1c2..32bdf7d14c 100644 --- a/usr/src/lib/libast/common/sfio/sfpoll.c +++ b/usr/src/lib/libast/common/sfio/sfpoll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpool.c b/usr/src/lib/libast/common/sfio/sfpool.c index c1a16fe32a..be01693b5d 100644 --- a/usr/src/lib/libast/common/sfio/sfpool.c +++ b/usr/src/lib/libast/common/sfio/sfpool.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpopen.c b/usr/src/lib/libast/common/sfio/sfpopen.c index d496c13e7b..a14d11e0e1 100644 --- a/usr/src/lib/libast/common/sfio/sfpopen.c +++ b/usr/src/lib/libast/common/sfio/sfpopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfprintf.c b/usr/src/lib/libast/common/sfio/sfprintf.c index db8969bd27..d886afe02e 100644 --- a/usr/src/lib/libast/common/sfio/sfprintf.c +++ b/usr/src/lib/libast/common/sfio/sfprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfprints.c b/usr/src/lib/libast/common/sfio/sfprints.c index 402cefe5dc..2e3f8d8659 100644 --- a/usr/src/lib/libast/common/sfio/sfprints.c +++ b/usr/src/lib/libast/common/sfio/sfprints.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfpurge.c b/usr/src/lib/libast/common/sfio/sfpurge.c index d0a0d48a3a..c537893eb5 100644 --- a/usr/src/lib/libast/common/sfio/sfpurge.c +++ b/usr/src/lib/libast/common/sfio/sfpurge.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfputd.c b/usr/src/lib/libast/common/sfio/sfputd.c index 1409aa5c8b..7ce4ef5976 100644 --- a/usr/src/lib/libast/common/sfio/sfputd.c +++ b/usr/src/lib/libast/common/sfio/sfputd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfputl.c b/usr/src/lib/libast/common/sfio/sfputl.c index 2c64c9bb94..0645f24f3e 100644 --- a/usr/src/lib/libast/common/sfio/sfputl.c +++ b/usr/src/lib/libast/common/sfio/sfputl.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfputm.c b/usr/src/lib/libast/common/sfio/sfputm.c index 5ee927401d..4390307b1e 100644 --- a/usr/src/lib/libast/common/sfio/sfputm.c +++ b/usr/src/lib/libast/common/sfio/sfputm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfputr.c b/usr/src/lib/libast/common/sfio/sfputr.c index 2969cd8baa..b2b2a6086f 100644 --- a/usr/src/lib/libast/common/sfio/sfputr.c +++ b/usr/src/lib/libast/common/sfio/sfputr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfputu.c b/usr/src/lib/libast/common/sfio/sfputu.c index fee187a1cd..3568c7655d 100644 --- a/usr/src/lib/libast/common/sfio/sfputu.c +++ b/usr/src/lib/libast/common/sfio/sfputu.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfraise.c b/usr/src/lib/libast/common/sfio/sfraise.c index aab5d00024..1517520b5b 100644 --- a/usr/src/lib/libast/common/sfio/sfraise.c +++ b/usr/src/lib/libast/common/sfio/sfraise.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfrd.c b/usr/src/lib/libast/common/sfio/sfrd.c index 0eb881b19b..1a2c40b13f 100644 --- a/usr/src/lib/libast/common/sfio/sfrd.c +++ b/usr/src/lib/libast/common/sfio/sfrd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfread.c b/usr/src/lib/libast/common/sfio/sfread.c index c9377d4f68..503b417e7f 100644 --- a/usr/src/lib/libast/common/sfio/sfread.c +++ b/usr/src/lib/libast/common/sfio/sfread.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfreserve.c b/usr/src/lib/libast/common/sfio/sfreserve.c index 6c8726d4a3..26e9ae2494 100644 --- a/usr/src/lib/libast/common/sfio/sfreserve.c +++ b/usr/src/lib/libast/common/sfio/sfreserve.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfresize.c b/usr/src/lib/libast/common/sfio/sfresize.c index cd8e803346..9d4dabbab1 100644 --- a/usr/src/lib/libast/common/sfio/sfresize.c +++ b/usr/src/lib/libast/common/sfio/sfresize.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfscanf.c b/usr/src/lib/libast/common/sfio/sfscanf.c index c48e1a1419..4a37090218 100644 --- a/usr/src/lib/libast/common/sfio/sfscanf.c +++ b/usr/src/lib/libast/common/sfio/sfscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfseek.c b/usr/src/lib/libast/common/sfio/sfseek.c index d3ad987945..4eb1370b39 100644 --- a/usr/src/lib/libast/common/sfio/sfseek.c +++ b/usr/src/lib/libast/common/sfio/sfseek.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfset.c b/usr/src/lib/libast/common/sfio/sfset.c index 8b1d57ec35..c9c0ddf093 100644 --- a/usr/src/lib/libast/common/sfio/sfset.c +++ b/usr/src/lib/libast/common/sfio/sfset.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfsetbuf.c b/usr/src/lib/libast/common/sfio/sfsetbuf.c index d354f48497..8dee41ddd8 100644 --- a/usr/src/lib/libast/common/sfio/sfsetbuf.c +++ b/usr/src/lib/libast/common/sfio/sfsetbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfsetfd.c b/usr/src/lib/libast/common/sfio/sfsetfd.c index 911dcb3a5c..2d74af9a18 100644 --- a/usr/src/lib/libast/common/sfio/sfsetfd.c +++ b/usr/src/lib/libast/common/sfio/sfsetfd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfsize.c b/usr/src/lib/libast/common/sfio/sfsize.c index 75d7e0789e..525f226cd0 100644 --- a/usr/src/lib/libast/common/sfio/sfsize.c +++ b/usr/src/lib/libast/common/sfio/sfsize.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfsk.c b/usr/src/lib/libast/common/sfio/sfsk.c index 5b717a5e07..1617880d6a 100644 --- a/usr/src/lib/libast/common/sfio/sfsk.c +++ b/usr/src/lib/libast/common/sfio/sfsk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfstack.c b/usr/src/lib/libast/common/sfio/sfstack.c index 2162f9f292..073ba9b61d 100644 --- a/usr/src/lib/libast/common/sfio/sfstack.c +++ b/usr/src/lib/libast/common/sfio/sfstack.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfstrtod.c b/usr/src/lib/libast/common/sfio/sfstrtod.c index 0927e3c3e4..ddbf2b127a 100644 --- a/usr/src/lib/libast/common/sfio/sfstrtod.c +++ b/usr/src/lib/libast/common/sfio/sfstrtod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfstrtof.h b/usr/src/lib/libast/common/sfio/sfstrtof.h index bdedd2db5e..2bde892365 100644 --- a/usr/src/lib/libast/common/sfio/sfstrtof.h +++ b/usr/src/lib/libast/common/sfio/sfstrtof.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfswap.c b/usr/src/lib/libast/common/sfio/sfswap.c index ca32892692..2366219b02 100644 --- a/usr/src/lib/libast/common/sfio/sfswap.c +++ b/usr/src/lib/libast/common/sfio/sfswap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfsync.c b/usr/src/lib/libast/common/sfio/sfsync.c index 9d2f1e06be..ebfc6e6c8a 100644 --- a/usr/src/lib/libast/common/sfio/sfsync.c +++ b/usr/src/lib/libast/common/sfio/sfsync.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sftable.c b/usr/src/lib/libast/common/sfio/sftable.c index c1e4651a53..df4760602e 100644 --- a/usr/src/lib/libast/common/sfio/sftable.c +++ b/usr/src/lib/libast/common/sfio/sftable.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -340,6 +340,8 @@ int type; /* >0: scanf, =0: printf, -1: internal */ } /* get value for positions */ + if(ft) + memcpy(&savft, ft, sizeof(*ft)); for(n = 0; n <= maxp; ++n) { if(fp[n].ft.fmt == 0) /* gap: pretend it's a 'd' pattern */ { fp[n].ft.fmt = 'd'; diff --git a/usr/src/lib/libast/common/sfio/sftell.c b/usr/src/lib/libast/common/sfio/sftell.c index e46ed41b86..47d59bba95 100644 --- a/usr/src/lib/libast/common/sfio/sftell.c +++ b/usr/src/lib/libast/common/sfio/sftell.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sftmp.c b/usr/src/lib/libast/common/sfio/sftmp.c index 1adf1066ae..86532282ff 100644 --- a/usr/src/lib/libast/common/sfio/sftmp.c +++ b/usr/src/lib/libast/common/sfio/sftmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfungetc.c b/usr/src/lib/libast/common/sfio/sfungetc.c index de2512892c..e9b90a6640 100644 --- a/usr/src/lib/libast/common/sfio/sfungetc.c +++ b/usr/src/lib/libast/common/sfio/sfungetc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfvprintf.c b/usr/src/lib/libast/common/sfio/sfvprintf.c index 94c23703cc..4a17020776 100644 --- a/usr/src/lib/libast/common/sfio/sfvprintf.c +++ b/usr/src/lib/libast/common/sfio/sfvprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -264,8 +264,7 @@ loop_fmt : { t_str = (*_Sffmtintf)(t_str+1,&n); if(*t_str == '$') { if(!fp && - !(fp = (*_Sffmtposf) - (f,oform,oargs,ft,0)) ) + !(fp = (*_Sffmtposf)(f,oform,oargs,ft,0)) ) goto pop_fmt; n = FP_SET(n,argn); } diff --git a/usr/src/lib/libast/common/sfio/sfvscanf.c b/usr/src/lib/libast/common/sfio/sfvscanf.c index 9047b1a670..8ad68c325b 100644 --- a/usr/src/lib/libast/common/sfio/sfvscanf.c +++ b/usr/src/lib/libast/common/sfio/sfvscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -462,8 +462,7 @@ loop_fmt: { t_str = (*_Sffmtintf)(t_str+1,&n); if(*t_str == '$') { if(!fp && - !(fp = (*_Sffmtposf) - (f,oform,oargs,ft,1)) ) + !(fp = (*_Sffmtposf)(f,oform,oargs,ft,1)) ) goto pop_fmt; n = FP_SET(n,argn); } diff --git a/usr/src/lib/libast/common/sfio/sfwalk.c b/usr/src/lib/libast/common/sfio/sfwalk.c index a97b079924..89b011ece9 100644 --- a/usr/src/lib/libast/common/sfio/sfwalk.c +++ b/usr/src/lib/libast/common/sfio/sfwalk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfwr.c b/usr/src/lib/libast/common/sfio/sfwr.c index 87f27ca3bd..bca87078fd 100644 --- a/usr/src/lib/libast/common/sfio/sfwr.c +++ b/usr/src/lib/libast/common/sfio/sfwr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/sfwrite.c b/usr/src/lib/libast/common/sfio/sfwrite.c index da36623347..f6c9cd9392 100644 --- a/usr/src/lib/libast/common/sfio/sfwrite.c +++ b/usr/src/lib/libast/common/sfio/sfwrite.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/sfio/vthread.h b/usr/src/lib/libast/common/sfio/vthread.h index fa5f503e6c..031c28bcb5 100644 --- a/usr/src/lib/libast/common/sfio/vthread.h +++ b/usr/src/lib/libast/common/sfio/vthread.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/bytesex.h b/usr/src/lib/libast/common/std/bytesex.h index e105fc5f58..1f78d13287 100644 --- a/usr/src/lib/libast/common/std/bytesex.h +++ b/usr/src/lib/libast/common/std/bytesex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/dirent.h b/usr/src/lib/libast/common/std/dirent.h index ea81d037a5..05e76cadae 100644 --- a/usr/src/lib/libast/common/std/dirent.h +++ b/usr/src/lib/libast/common/std/dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/endian.h b/usr/src/lib/libast/common/std/endian.h index 6ad7ddcaad..1c992dd490 100644 --- a/usr/src/lib/libast/common/std/endian.h +++ b/usr/src/lib/libast/common/std/endian.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/iconv.h b/usr/src/lib/libast/common/std/iconv.h index 5b02759721..e65540c075 100644 --- a/usr/src/lib/libast/common/std/iconv.h +++ b/usr/src/lib/libast/common/std/iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/nl_types.h b/usr/src/lib/libast/common/std/nl_types.h index e71605ff40..581cc13a81 100644 --- a/usr/src/lib/libast/common/std/nl_types.h +++ b/usr/src/lib/libast/common/std/nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/stdio.h b/usr/src/lib/libast/common/std/stdio.h index 2053ba8b27..0d9876a250 100644 --- a/usr/src/lib/libast/common/std/stdio.h +++ b/usr/src/lib/libast/common/std/stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/std/wchar.h b/usr/src/lib/libast/common/std/wchar.h index 5bd6aa3ba8..43c5ef1e98 100644 --- a/usr/src/lib/libast/common/std/wchar.h +++ b/usr/src/lib/libast/common/std/wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_doprnt.c b/usr/src/lib/libast/common/stdio/_doprnt.c index 5f02ffdd7b..b198dc5b92 100644 --- a/usr/src/lib/libast/common/stdio/_doprnt.c +++ b/usr/src/lib/libast/common/stdio/_doprnt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_doscan.c b/usr/src/lib/libast/common/stdio/_doscan.c index 8334f44bee..f849cc378a 100644 --- a/usr/src/lib/libast/common/stdio/_doscan.c +++ b/usr/src/lib/libast/common/stdio/_doscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_filbuf.c b/usr/src/lib/libast/common/stdio/_filbuf.c index 420c429c91..803469de61 100644 --- a/usr/src/lib/libast/common/stdio/_filbuf.c +++ b/usr/src/lib/libast/common/stdio/_filbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_flsbuf.c b/usr/src/lib/libast/common/stdio/_flsbuf.c index ecf9a2cbb6..6052e56df8 100644 --- a/usr/src/lib/libast/common/stdio/_flsbuf.c +++ b/usr/src/lib/libast/common/stdio/_flsbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdfun.c b/usr/src/lib/libast/common/stdio/_stdfun.c index a6a82ae902..4a625827a5 100644 --- a/usr/src/lib/libast/common/stdio/_stdfun.c +++ b/usr/src/lib/libast/common/stdio/_stdfun.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdopen.c b/usr/src/lib/libast/common/stdio/_stdopen.c index 0290aa9e5f..698cc6287c 100644 --- a/usr/src/lib/libast/common/stdio/_stdopen.c +++ b/usr/src/lib/libast/common/stdio/_stdopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdprintf.c b/usr/src/lib/libast/common/stdio/_stdprintf.c index 9f46637c9a..0b6380bd27 100644 --- a/usr/src/lib/libast/common/stdio/_stdprintf.c +++ b/usr/src/lib/libast/common/stdio/_stdprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdscanf.c b/usr/src/lib/libast/common/stdio/_stdscanf.c index 998636a41f..259e60ff74 100644 --- a/usr/src/lib/libast/common/stdio/_stdscanf.c +++ b/usr/src/lib/libast/common/stdio/_stdscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdsprnt.c b/usr/src/lib/libast/common/stdio/_stdsprnt.c index bd91deafd7..f9b57767e4 100644 --- a/usr/src/lib/libast/common/stdio/_stdsprnt.c +++ b/usr/src/lib/libast/common/stdio/_stdsprnt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdvbuf.c b/usr/src/lib/libast/common/stdio/_stdvbuf.c index 6307c47115..2cf7cffd4b 100644 --- a/usr/src/lib/libast/common/stdio/_stdvbuf.c +++ b/usr/src/lib/libast/common/stdio/_stdvbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdvsnprnt.c b/usr/src/lib/libast/common/stdio/_stdvsnprnt.c index fb992302cf..5986077e78 100644 --- a/usr/src/lib/libast/common/stdio/_stdvsnprnt.c +++ b/usr/src/lib/libast/common/stdio/_stdvsnprnt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdvsprnt.c b/usr/src/lib/libast/common/stdio/_stdvsprnt.c index af3840f345..e239e79cde 100644 --- a/usr/src/lib/libast/common/stdio/_stdvsprnt.c +++ b/usr/src/lib/libast/common/stdio/_stdvsprnt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/_stdvsscn.c b/usr/src/lib/libast/common/stdio/_stdvsscn.c index be57402e0c..7c97f35d3f 100644 --- a/usr/src/lib/libast/common/stdio/_stdvsscn.c +++ b/usr/src/lib/libast/common/stdio/_stdvsscn.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/asprintf.c b/usr/src/lib/libast/common/stdio/asprintf.c index bbf155196d..11c23bcada 100644 --- a/usr/src/lib/libast/common/stdio/asprintf.c +++ b/usr/src/lib/libast/common/stdio/asprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/clearerr.c b/usr/src/lib/libast/common/stdio/clearerr.c index 39c202d1de..b23d627d2a 100644 --- a/usr/src/lib/libast/common/stdio/clearerr.c +++ b/usr/src/lib/libast/common/stdio/clearerr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fclose.c b/usr/src/lib/libast/common/stdio/fclose.c index 7ba4a27dda..760658d771 100644 --- a/usr/src/lib/libast/common/stdio/fclose.c +++ b/usr/src/lib/libast/common/stdio/fclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fcloseall.c b/usr/src/lib/libast/common/stdio/fcloseall.c index 37728c9dc5..9b314b3fec 100644 --- a/usr/src/lib/libast/common/stdio/fcloseall.c +++ b/usr/src/lib/libast/common/stdio/fcloseall.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fdopen.c b/usr/src/lib/libast/common/stdio/fdopen.c index c356270653..79ddc09a35 100644 --- a/usr/src/lib/libast/common/stdio/fdopen.c +++ b/usr/src/lib/libast/common/stdio/fdopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/feof.c b/usr/src/lib/libast/common/stdio/feof.c index e289f7c2b8..6379c36638 100644 --- a/usr/src/lib/libast/common/stdio/feof.c +++ b/usr/src/lib/libast/common/stdio/feof.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ferror.c b/usr/src/lib/libast/common/stdio/ferror.c index 53879696f5..466dab00da 100644 --- a/usr/src/lib/libast/common/stdio/ferror.c +++ b/usr/src/lib/libast/common/stdio/ferror.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fflush.c b/usr/src/lib/libast/common/stdio/fflush.c index 3abb8b4257..3159ee3358 100644 --- a/usr/src/lib/libast/common/stdio/fflush.c +++ b/usr/src/lib/libast/common/stdio/fflush.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fgetc.c b/usr/src/lib/libast/common/stdio/fgetc.c index a99d12bb0c..4770f92c22 100644 --- a/usr/src/lib/libast/common/stdio/fgetc.c +++ b/usr/src/lib/libast/common/stdio/fgetc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fgetpos.c b/usr/src/lib/libast/common/stdio/fgetpos.c index df9573e8d8..13c25eec68 100644 --- a/usr/src/lib/libast/common/stdio/fgetpos.c +++ b/usr/src/lib/libast/common/stdio/fgetpos.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fgets.c b/usr/src/lib/libast/common/stdio/fgets.c index 15368b5add..e367164777 100644 --- a/usr/src/lib/libast/common/stdio/fgets.c +++ b/usr/src/lib/libast/common/stdio/fgets.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fgetwc.c b/usr/src/lib/libast/common/stdio/fgetwc.c index 65acb7925e..b8d1c86c95 100644 --- a/usr/src/lib/libast/common/stdio/fgetwc.c +++ b/usr/src/lib/libast/common/stdio/fgetwc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fgetws.c b/usr/src/lib/libast/common/stdio/fgetws.c index d1d9acde30..77b785247b 100644 --- a/usr/src/lib/libast/common/stdio/fgetws.c +++ b/usr/src/lib/libast/common/stdio/fgetws.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fileno.c b/usr/src/lib/libast/common/stdio/fileno.c index b5507afdc6..4691796cf9 100644 --- a/usr/src/lib/libast/common/stdio/fileno.c +++ b/usr/src/lib/libast/common/stdio/fileno.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/flockfile.c b/usr/src/lib/libast/common/stdio/flockfile.c index 5df7aa11a5..a6d8a20c9e 100644 --- a/usr/src/lib/libast/common/stdio/flockfile.c +++ b/usr/src/lib/libast/common/stdio/flockfile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fmemopen.c b/usr/src/lib/libast/common/stdio/fmemopen.c index fa1cdb5adb..7b669fa4a7 100644 --- a/usr/src/lib/libast/common/stdio/fmemopen.c +++ b/usr/src/lib/libast/common/stdio/fmemopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fopen.c b/usr/src/lib/libast/common/stdio/fopen.c index 8c723e849a..98582981f1 100644 --- a/usr/src/lib/libast/common/stdio/fopen.c +++ b/usr/src/lib/libast/common/stdio/fopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fprintf.c b/usr/src/lib/libast/common/stdio/fprintf.c index 345fce71cb..57f0ce6a62 100644 --- a/usr/src/lib/libast/common/stdio/fprintf.c +++ b/usr/src/lib/libast/common/stdio/fprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fpurge.c b/usr/src/lib/libast/common/stdio/fpurge.c index 2b57e51ac0..93a8650e52 100644 --- a/usr/src/lib/libast/common/stdio/fpurge.c +++ b/usr/src/lib/libast/common/stdio/fpurge.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fputc.c b/usr/src/lib/libast/common/stdio/fputc.c index 4ea662824c..bfe43a4169 100644 --- a/usr/src/lib/libast/common/stdio/fputc.c +++ b/usr/src/lib/libast/common/stdio/fputc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fputs.c b/usr/src/lib/libast/common/stdio/fputs.c index a5d5a94cd6..d1692d353d 100644 --- a/usr/src/lib/libast/common/stdio/fputs.c +++ b/usr/src/lib/libast/common/stdio/fputs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fputwc.c b/usr/src/lib/libast/common/stdio/fputwc.c index 7f7637f7bd..fb82594124 100644 --- a/usr/src/lib/libast/common/stdio/fputwc.c +++ b/usr/src/lib/libast/common/stdio/fputwc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fputws.c b/usr/src/lib/libast/common/stdio/fputws.c index 844088b694..7a9b42b313 100644 --- a/usr/src/lib/libast/common/stdio/fputws.c +++ b/usr/src/lib/libast/common/stdio/fputws.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fread.c b/usr/src/lib/libast/common/stdio/fread.c index d94c1f341d..bc51ce4286 100644 --- a/usr/src/lib/libast/common/stdio/fread.c +++ b/usr/src/lib/libast/common/stdio/fread.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/freopen.c b/usr/src/lib/libast/common/stdio/freopen.c index 1746a450b7..a5e020c3c0 100644 --- a/usr/src/lib/libast/common/stdio/freopen.c +++ b/usr/src/lib/libast/common/stdio/freopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fscanf.c b/usr/src/lib/libast/common/stdio/fscanf.c index 6ab28131ea..0c7192f059 100644 --- a/usr/src/lib/libast/common/stdio/fscanf.c +++ b/usr/src/lib/libast/common/stdio/fscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fseek.c b/usr/src/lib/libast/common/stdio/fseek.c index b6175f1b15..f6fd1688c8 100644 --- a/usr/src/lib/libast/common/stdio/fseek.c +++ b/usr/src/lib/libast/common/stdio/fseek.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fseeko.c b/usr/src/lib/libast/common/stdio/fseeko.c index cb69bbeaa6..da563e0708 100644 --- a/usr/src/lib/libast/common/stdio/fseeko.c +++ b/usr/src/lib/libast/common/stdio/fseeko.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fsetpos.c b/usr/src/lib/libast/common/stdio/fsetpos.c index 3212b9499d..5594689870 100644 --- a/usr/src/lib/libast/common/stdio/fsetpos.c +++ b/usr/src/lib/libast/common/stdio/fsetpos.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ftell.c b/usr/src/lib/libast/common/stdio/ftell.c index cf5b1336cf..2045a7d901 100644 --- a/usr/src/lib/libast/common/stdio/ftell.c +++ b/usr/src/lib/libast/common/stdio/ftell.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ftello.c b/usr/src/lib/libast/common/stdio/ftello.c index 65ba754468..5d5cf6482c 100644 --- a/usr/src/lib/libast/common/stdio/ftello.c +++ b/usr/src/lib/libast/common/stdio/ftello.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ftrylockfile.c b/usr/src/lib/libast/common/stdio/ftrylockfile.c index b00fe135b7..e7ab814e5d 100644 --- a/usr/src/lib/libast/common/stdio/ftrylockfile.c +++ b/usr/src/lib/libast/common/stdio/ftrylockfile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/funlockfile.c b/usr/src/lib/libast/common/stdio/funlockfile.c index fb186a32cb..783ac5e343 100644 --- a/usr/src/lib/libast/common/stdio/funlockfile.c +++ b/usr/src/lib/libast/common/stdio/funlockfile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fwide.c b/usr/src/lib/libast/common/stdio/fwide.c index 4db3e3d4eb..c5c29f26ad 100644 --- a/usr/src/lib/libast/common/stdio/fwide.c +++ b/usr/src/lib/libast/common/stdio/fwide.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fwprintf.c b/usr/src/lib/libast/common/stdio/fwprintf.c index 7ced942740..74ec5c1d13 100644 --- a/usr/src/lib/libast/common/stdio/fwprintf.c +++ b/usr/src/lib/libast/common/stdio/fwprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fwrite.c b/usr/src/lib/libast/common/stdio/fwrite.c index 2121d32c19..48e354de39 100644 --- a/usr/src/lib/libast/common/stdio/fwrite.c +++ b/usr/src/lib/libast/common/stdio/fwrite.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/fwscanf.c b/usr/src/lib/libast/common/stdio/fwscanf.c index dc6e31667d..2a095cb40d 100644 --- a/usr/src/lib/libast/common/stdio/fwscanf.c +++ b/usr/src/lib/libast/common/stdio/fwscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getc.c b/usr/src/lib/libast/common/stdio/getc.c index b52909ef49..9b7bfb4663 100644 --- a/usr/src/lib/libast/common/stdio/getc.c +++ b/usr/src/lib/libast/common/stdio/getc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getchar.c b/usr/src/lib/libast/common/stdio/getchar.c index 5c85793bb6..c82793dacd 100644 --- a/usr/src/lib/libast/common/stdio/getchar.c +++ b/usr/src/lib/libast/common/stdio/getchar.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getdelim.c b/usr/src/lib/libast/common/stdio/getdelim.c index a24ad68fd8..97053407af 100644 --- a/usr/src/lib/libast/common/stdio/getdelim.c +++ b/usr/src/lib/libast/common/stdio/getdelim.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getline.c b/usr/src/lib/libast/common/stdio/getline.c index b4936c2b30..4e69c75258 100644 --- a/usr/src/lib/libast/common/stdio/getline.c +++ b/usr/src/lib/libast/common/stdio/getline.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getw.c b/usr/src/lib/libast/common/stdio/getw.c index 264fd7b375..f857036584 100644 --- a/usr/src/lib/libast/common/stdio/getw.c +++ b/usr/src/lib/libast/common/stdio/getw.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getwc.c b/usr/src/lib/libast/common/stdio/getwc.c index 970d1fb588..05ffd87718 100644 --- a/usr/src/lib/libast/common/stdio/getwc.c +++ b/usr/src/lib/libast/common/stdio/getwc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/getwchar.c b/usr/src/lib/libast/common/stdio/getwchar.c index 59b85f41c7..9258c9c807 100644 --- a/usr/src/lib/libast/common/stdio/getwchar.c +++ b/usr/src/lib/libast/common/stdio/getwchar.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/pclose.c b/usr/src/lib/libast/common/stdio/pclose.c index 5c49dc9bea..d1f4a5998c 100644 --- a/usr/src/lib/libast/common/stdio/pclose.c +++ b/usr/src/lib/libast/common/stdio/pclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/popen.c b/usr/src/lib/libast/common/stdio/popen.c index 38329fd259..ec99d32d21 100644 --- a/usr/src/lib/libast/common/stdio/popen.c +++ b/usr/src/lib/libast/common/stdio/popen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/printf.c b/usr/src/lib/libast/common/stdio/printf.c index a191f32bc1..563d6e2c86 100644 --- a/usr/src/lib/libast/common/stdio/printf.c +++ b/usr/src/lib/libast/common/stdio/printf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/putc.c b/usr/src/lib/libast/common/stdio/putc.c index ad8742f63c..80803e2a20 100644 --- a/usr/src/lib/libast/common/stdio/putc.c +++ b/usr/src/lib/libast/common/stdio/putc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/putchar.c b/usr/src/lib/libast/common/stdio/putchar.c index e339082c75..e4007c04e3 100644 --- a/usr/src/lib/libast/common/stdio/putchar.c +++ b/usr/src/lib/libast/common/stdio/putchar.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/puts.c b/usr/src/lib/libast/common/stdio/puts.c index 523383f93e..5163be9c13 100644 --- a/usr/src/lib/libast/common/stdio/puts.c +++ b/usr/src/lib/libast/common/stdio/puts.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/putw.c b/usr/src/lib/libast/common/stdio/putw.c index bb120a8434..d39cce6dbd 100644 --- a/usr/src/lib/libast/common/stdio/putw.c +++ b/usr/src/lib/libast/common/stdio/putw.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/putwc.c b/usr/src/lib/libast/common/stdio/putwc.c index 21d0006257..dfc3581ca1 100644 --- a/usr/src/lib/libast/common/stdio/putwc.c +++ b/usr/src/lib/libast/common/stdio/putwc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/putwchar.c b/usr/src/lib/libast/common/stdio/putwchar.c index bbca267759..94772e1a10 100644 --- a/usr/src/lib/libast/common/stdio/putwchar.c +++ b/usr/src/lib/libast/common/stdio/putwchar.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/rewind.c b/usr/src/lib/libast/common/stdio/rewind.c index 285857848e..6def773202 100644 --- a/usr/src/lib/libast/common/stdio/rewind.c +++ b/usr/src/lib/libast/common/stdio/rewind.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/scanf.c b/usr/src/lib/libast/common/stdio/scanf.c index e06681ee09..542e572e45 100644 --- a/usr/src/lib/libast/common/stdio/scanf.c +++ b/usr/src/lib/libast/common/stdio/scanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/setbuf.c b/usr/src/lib/libast/common/stdio/setbuf.c index 7ec63c4604..ab35560040 100644 --- a/usr/src/lib/libast/common/stdio/setbuf.c +++ b/usr/src/lib/libast/common/stdio/setbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/setbuffer.c b/usr/src/lib/libast/common/stdio/setbuffer.c index 18e6f5dac9..83368bd412 100644 --- a/usr/src/lib/libast/common/stdio/setbuffer.c +++ b/usr/src/lib/libast/common/stdio/setbuffer.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/setlinebuf.c b/usr/src/lib/libast/common/stdio/setlinebuf.c index ffb71365ce..d23c201920 100644 --- a/usr/src/lib/libast/common/stdio/setlinebuf.c +++ b/usr/src/lib/libast/common/stdio/setlinebuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/setvbuf.c b/usr/src/lib/libast/common/stdio/setvbuf.c index b8673fafe8..39b4362e8f 100644 --- a/usr/src/lib/libast/common/stdio/setvbuf.c +++ b/usr/src/lib/libast/common/stdio/setvbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/snprintf.c b/usr/src/lib/libast/common/stdio/snprintf.c index fd22ea1088..db8a46e9c1 100644 --- a/usr/src/lib/libast/common/stdio/snprintf.c +++ b/usr/src/lib/libast/common/stdio/snprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/sprintf.c b/usr/src/lib/libast/common/stdio/sprintf.c index 76f434e73d..4de333bf63 100644 --- a/usr/src/lib/libast/common/stdio/sprintf.c +++ b/usr/src/lib/libast/common/stdio/sprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/sscanf.c b/usr/src/lib/libast/common/stdio/sscanf.c index 014a328f7e..f965439570 100644 --- a/usr/src/lib/libast/common/stdio/sscanf.c +++ b/usr/src/lib/libast/common/stdio/sscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/stdhdr.h b/usr/src/lib/libast/common/stdio/stdhdr.h index 3436bb9fc5..6911129f3b 100644 --- a/usr/src/lib/libast/common/stdio/stdhdr.h +++ b/usr/src/lib/libast/common/stdio/stdhdr.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/stdio_c99.c b/usr/src/lib/libast/common/stdio/stdio_c99.c index 9bfe96ebba..01e289d213 100644 --- a/usr/src/lib/libast/common/stdio/stdio_c99.c +++ b/usr/src/lib/libast/common/stdio/stdio_c99.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/swprintf.c b/usr/src/lib/libast/common/stdio/swprintf.c index 4b43fccc33..93546cf85e 100644 --- a/usr/src/lib/libast/common/stdio/swprintf.c +++ b/usr/src/lib/libast/common/stdio/swprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/swscanf.c b/usr/src/lib/libast/common/stdio/swscanf.c index 6653930fba..220c326e4d 100644 --- a/usr/src/lib/libast/common/stdio/swscanf.c +++ b/usr/src/lib/libast/common/stdio/swscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/tmpfile.c b/usr/src/lib/libast/common/stdio/tmpfile.c index 7d19057681..ad8975b187 100644 --- a/usr/src/lib/libast/common/stdio/tmpfile.c +++ b/usr/src/lib/libast/common/stdio/tmpfile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ungetc.c b/usr/src/lib/libast/common/stdio/ungetc.c index dc86703317..8f5a84aeae 100644 --- a/usr/src/lib/libast/common/stdio/ungetc.c +++ b/usr/src/lib/libast/common/stdio/ungetc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/ungetwc.c b/usr/src/lib/libast/common/stdio/ungetwc.c index 12aa1cc92a..15f787488c 100644 --- a/usr/src/lib/libast/common/stdio/ungetwc.c +++ b/usr/src/lib/libast/common/stdio/ungetwc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vasprintf.c b/usr/src/lib/libast/common/stdio/vasprintf.c index 1bb9609243..8db739aaf7 100644 --- a/usr/src/lib/libast/common/stdio/vasprintf.c +++ b/usr/src/lib/libast/common/stdio/vasprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vfprintf.c b/usr/src/lib/libast/common/stdio/vfprintf.c index 42fca64d7e..9632c3d5a9 100644 --- a/usr/src/lib/libast/common/stdio/vfprintf.c +++ b/usr/src/lib/libast/common/stdio/vfprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vfscanf.c b/usr/src/lib/libast/common/stdio/vfscanf.c index dd0d2a1a0d..43d48540f0 100644 --- a/usr/src/lib/libast/common/stdio/vfscanf.c +++ b/usr/src/lib/libast/common/stdio/vfscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vfwprintf.c b/usr/src/lib/libast/common/stdio/vfwprintf.c index 06e4bfcdeb..331a65901b 100644 --- a/usr/src/lib/libast/common/stdio/vfwprintf.c +++ b/usr/src/lib/libast/common/stdio/vfwprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vfwscanf.c b/usr/src/lib/libast/common/stdio/vfwscanf.c index 7e3d9baa51..14a5c1ef2b 100644 --- a/usr/src/lib/libast/common/stdio/vfwscanf.c +++ b/usr/src/lib/libast/common/stdio/vfwscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vprintf.c b/usr/src/lib/libast/common/stdio/vprintf.c index 983bf17118..6772dc38af 100644 --- a/usr/src/lib/libast/common/stdio/vprintf.c +++ b/usr/src/lib/libast/common/stdio/vprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vscanf.c b/usr/src/lib/libast/common/stdio/vscanf.c index 4e5d8a6f7d..ca5c9ba2a8 100644 --- a/usr/src/lib/libast/common/stdio/vscanf.c +++ b/usr/src/lib/libast/common/stdio/vscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vsnprintf.c b/usr/src/lib/libast/common/stdio/vsnprintf.c index d794845cbf..d7e3fd87ef 100644 --- a/usr/src/lib/libast/common/stdio/vsnprintf.c +++ b/usr/src/lib/libast/common/stdio/vsnprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vsprintf.c b/usr/src/lib/libast/common/stdio/vsprintf.c index 365f54b8a8..1732087dfb 100644 --- a/usr/src/lib/libast/common/stdio/vsprintf.c +++ b/usr/src/lib/libast/common/stdio/vsprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vsscanf.c b/usr/src/lib/libast/common/stdio/vsscanf.c index f3a76d6d5e..ad3ec60315 100644 --- a/usr/src/lib/libast/common/stdio/vsscanf.c +++ b/usr/src/lib/libast/common/stdio/vsscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vswprintf.c b/usr/src/lib/libast/common/stdio/vswprintf.c index a6c1d84e48..c92d492450 100644 --- a/usr/src/lib/libast/common/stdio/vswprintf.c +++ b/usr/src/lib/libast/common/stdio/vswprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vswscanf.c b/usr/src/lib/libast/common/stdio/vswscanf.c index 94dabdda18..64a9fa240c 100644 --- a/usr/src/lib/libast/common/stdio/vswscanf.c +++ b/usr/src/lib/libast/common/stdio/vswscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vwprintf.c b/usr/src/lib/libast/common/stdio/vwprintf.c index 5b44f2caa8..560f88bacb 100644 --- a/usr/src/lib/libast/common/stdio/vwprintf.c +++ b/usr/src/lib/libast/common/stdio/vwprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/vwscanf.c b/usr/src/lib/libast/common/stdio/vwscanf.c index f9fa06eac8..560acc8b73 100644 --- a/usr/src/lib/libast/common/stdio/vwscanf.c +++ b/usr/src/lib/libast/common/stdio/vwscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/wprintf.c b/usr/src/lib/libast/common/stdio/wprintf.c index 5a3e5d5510..e0beb131e0 100644 --- a/usr/src/lib/libast/common/stdio/wprintf.c +++ b/usr/src/lib/libast/common/stdio/wprintf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/stdio/wscanf.c b/usr/src/lib/libast/common/stdio/wscanf.c index 1aa647a5cf..99777add18 100644 --- a/usr/src/lib/libast/common/stdio/wscanf.c +++ b/usr/src/lib/libast/common/stdio/wscanf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/base64.c b/usr/src/lib/libast/common/string/base64.c index e919cba7a6..7e1f59f869 100644 --- a/usr/src/lib/libast/common/string/base64.c +++ b/usr/src/lib/libast/common/string/base64.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -119,6 +119,16 @@ base64encode(const void* fb, size_t fz, void** fn, void* tb, size_t tz, void** t done: if (fz) { + if (tp >= te) + { + if (fn) + *fn = fp; + if (tn) + *tn = tp; + n = tp - (unsigned char*)tb + 1; + tp = tmp; + te = tp + sizeof(tmp) - B64_EC + 1; + } b = *fp++ << 16; if (fz == 2) b |= *fp++ << 8; diff --git a/usr/src/lib/libast/common/string/ccmap.c b/usr/src/lib/libast/common/string/ccmap.c index 106d887da5..fbb07b8f6d 100644 --- a/usr/src/lib/libast/common/string/ccmap.c +++ b/usr/src/lib/libast/common/string/ccmap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/ccmapid.c b/usr/src/lib/libast/common/string/ccmapid.c index fc1e7a071c..89ca51c588 100644 --- a/usr/src/lib/libast/common/string/ccmapid.c +++ b/usr/src/lib/libast/common/string/ccmapid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/ccnative.c b/usr/src/lib/libast/common/string/ccnative.c index a3aa48e995..a92ebb3f9c 100644 --- a/usr/src/lib/libast/common/string/ccnative.c +++ b/usr/src/lib/libast/common/string/ccnative.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/chresc.c b/usr/src/lib/libast/common/string/chresc.c index e1b6fbe087..edb8f1a218 100644 --- a/usr/src/lib/libast/common/string/chresc.c +++ b/usr/src/lib/libast/common/string/chresc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/chrtoi.c b/usr/src/lib/libast/common/string/chrtoi.c index e41c37e15a..503fb41dc9 100644 --- a/usr/src/lib/libast/common/string/chrtoi.c +++ b/usr/src/lib/libast/common/string/chrtoi.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtbase.c b/usr/src/lib/libast/common/string/fmtbase.c index 5589d50ff8..bbdbe8165e 100644 --- a/usr/src/lib/libast/common/string/fmtbase.c +++ b/usr/src/lib/libast/common/string/fmtbase.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtbuf.c b/usr/src/lib/libast/common/string/fmtbuf.c index 4202e780bf..7b7e21e27c 100644 --- a/usr/src/lib/libast/common/string/fmtbuf.c +++ b/usr/src/lib/libast/common/string/fmtbuf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtclock.c b/usr/src/lib/libast/common/string/fmtclock.c index 1036fdee95..6cba718e19 100644 --- a/usr/src/lib/libast/common/string/fmtclock.c +++ b/usr/src/lib/libast/common/string/fmtclock.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtdev.c b/usr/src/lib/libast/common/string/fmtdev.c index 0a5886b234..5445554976 100644 --- a/usr/src/lib/libast/common/string/fmtdev.c +++ b/usr/src/lib/libast/common/string/fmtdev.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtelapsed.c b/usr/src/lib/libast/common/string/fmtelapsed.c index ec140a5a03..ae1ea5c474 100644 --- a/usr/src/lib/libast/common/string/fmtelapsed.c +++ b/usr/src/lib/libast/common/string/fmtelapsed.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmterror.c b/usr/src/lib/libast/common/string/fmterror.c index da9c44efd4..078c7be4c6 100644 --- a/usr/src/lib/libast/common/string/fmterror.c +++ b/usr/src/lib/libast/common/string/fmterror.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtesc.c b/usr/src/lib/libast/common/string/fmtesc.c index a88844216b..de3acdba22 100644 --- a/usr/src/lib/libast/common/string/fmtesc.c +++ b/usr/src/lib/libast/common/string/fmtesc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtfmt.c b/usr/src/lib/libast/common/string/fmtfmt.c index 351460626b..91cdd3b9ce 100644 --- a/usr/src/lib/libast/common/string/fmtfmt.c +++ b/usr/src/lib/libast/common/string/fmtfmt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtfs.c b/usr/src/lib/libast/common/string/fmtfs.c index 7b613bcb9a..cdc00f504c 100644 --- a/usr/src/lib/libast/common/string/fmtfs.c +++ b/usr/src/lib/libast/common/string/fmtfs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtgid.c b/usr/src/lib/libast/common/string/fmtgid.c index 55ad21700c..2132f7c284 100644 --- a/usr/src/lib/libast/common/string/fmtgid.c +++ b/usr/src/lib/libast/common/string/fmtgid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtident.c b/usr/src/lib/libast/common/string/fmtident.c index 5a7f8418f6..2896291fdb 100644 --- a/usr/src/lib/libast/common/string/fmtident.c +++ b/usr/src/lib/libast/common/string/fmtident.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtip4.c b/usr/src/lib/libast/common/string/fmtip4.c index 3faedbbbc0..377d90cd22 100644 --- a/usr/src/lib/libast/common/string/fmtip4.c +++ b/usr/src/lib/libast/common/string/fmtip4.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtip6.c b/usr/src/lib/libast/common/string/fmtip6.c index 6e62d988a6..5b1133a12d 100644 --- a/usr/src/lib/libast/common/string/fmtip6.c +++ b/usr/src/lib/libast/common/string/fmtip6.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtls.c b/usr/src/lib/libast/common/string/fmtls.c index 6b92a5b3e1..b446c4661c 100644 --- a/usr/src/lib/libast/common/string/fmtls.c +++ b/usr/src/lib/libast/common/string/fmtls.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtmatch.c b/usr/src/lib/libast/common/string/fmtmatch.c index ac8ab6707d..6bb08731dd 100644 --- a/usr/src/lib/libast/common/string/fmtmatch.c +++ b/usr/src/lib/libast/common/string/fmtmatch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtmode.c b/usr/src/lib/libast/common/string/fmtmode.c index 3445467972..a710135e7f 100644 --- a/usr/src/lib/libast/common/string/fmtmode.c +++ b/usr/src/lib/libast/common/string/fmtmode.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtnum.c b/usr/src/lib/libast/common/string/fmtnum.c index bfebea9f17..14db553969 100644 --- a/usr/src/lib/libast/common/string/fmtnum.c +++ b/usr/src/lib/libast/common/string/fmtnum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtperm.c b/usr/src/lib/libast/common/string/fmtperm.c index 0fd30dd9bf..ffc3b3c3f2 100644 --- a/usr/src/lib/libast/common/string/fmtperm.c +++ b/usr/src/lib/libast/common/string/fmtperm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtre.c b/usr/src/lib/libast/common/string/fmtre.c index 05fc4ab69c..4667062aec 100644 --- a/usr/src/lib/libast/common/string/fmtre.c +++ b/usr/src/lib/libast/common/string/fmtre.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtscale.c b/usr/src/lib/libast/common/string/fmtscale.c index 511acf5cde..3e3c656a7d 100644 --- a/usr/src/lib/libast/common/string/fmtscale.c +++ b/usr/src/lib/libast/common/string/fmtscale.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtsignal.c b/usr/src/lib/libast/common/string/fmtsignal.c index 88162606c1..84ffbe90ac 100644 --- a/usr/src/lib/libast/common/string/fmtsignal.c +++ b/usr/src/lib/libast/common/string/fmtsignal.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmttime.c b/usr/src/lib/libast/common/string/fmttime.c index 45ba4bff32..3474e54027 100644 --- a/usr/src/lib/libast/common/string/fmttime.c +++ b/usr/src/lib/libast/common/string/fmttime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmttmx.c b/usr/src/lib/libast/common/string/fmttmx.c index b178cf46ae..13f60b39a9 100644 --- a/usr/src/lib/libast/common/string/fmttmx.c +++ b/usr/src/lib/libast/common/string/fmttmx.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmttv.c b/usr/src/lib/libast/common/string/fmttv.c index 2478ca8991..efb391d163 100644 --- a/usr/src/lib/libast/common/string/fmttv.c +++ b/usr/src/lib/libast/common/string/fmttv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtuid.c b/usr/src/lib/libast/common/string/fmtuid.c index 2c9fb16227..c3ea365d6b 100644 --- a/usr/src/lib/libast/common/string/fmtuid.c +++ b/usr/src/lib/libast/common/string/fmtuid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/fmtversion.c b/usr/src/lib/libast/common/string/fmtversion.c index e7829717dd..d5ef6a1cf9 100644 --- a/usr/src/lib/libast/common/string/fmtversion.c +++ b/usr/src/lib/libast/common/string/fmtversion.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/memdup.c b/usr/src/lib/libast/common/string/memdup.c index d69cb9416c..8664adc129 100644 --- a/usr/src/lib/libast/common/string/memdup.c +++ b/usr/src/lib/libast/common/string/memdup.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/modedata.c b/usr/src/lib/libast/common/string/modedata.c index c9d3a18e77..3ae540df56 100644 --- a/usr/src/lib/libast/common/string/modedata.c +++ b/usr/src/lib/libast/common/string/modedata.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/modei.c b/usr/src/lib/libast/common/string/modei.c index cce5492601..27bbe28a16 100644 --- a/usr/src/lib/libast/common/string/modei.c +++ b/usr/src/lib/libast/common/string/modei.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/modelib.h b/usr/src/lib/libast/common/string/modelib.h index 8e6c6536f3..74e070e747 100644 --- a/usr/src/lib/libast/common/string/modelib.h +++ b/usr/src/lib/libast/common/string/modelib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/modex.c b/usr/src/lib/libast/common/string/modex.c index d61856730a..186d576dbf 100644 --- a/usr/src/lib/libast/common/string/modex.c +++ b/usr/src/lib/libast/common/string/modex.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/stracmp.c b/usr/src/lib/libast/common/string/stracmp.c index 3f34f01a24..7dacde4e55 100644 --- a/usr/src/lib/libast/common/string/stracmp.c +++ b/usr/src/lib/libast/common/string/stracmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strcopy.c b/usr/src/lib/libast/common/string/strcopy.c index 7c73b363ad..e726db97ec 100644 --- a/usr/src/lib/libast/common/string/strcopy.c +++ b/usr/src/lib/libast/common/string/strcopy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strdup.c b/usr/src/lib/libast/common/string/strdup.c index a60ea63612..2ecb9579b4 100644 --- a/usr/src/lib/libast/common/string/strdup.c +++ b/usr/src/lib/libast/common/string/strdup.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strelapsed.c b/usr/src/lib/libast/common/string/strelapsed.c index 04e9a68546..c6bc318fcf 100644 --- a/usr/src/lib/libast/common/string/strelapsed.c +++ b/usr/src/lib/libast/common/string/strelapsed.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -128,11 +128,13 @@ strelapsed(register const char* s, char** e, int n) v *= 20 * 12 * 4 * 7 * 24 * 60 * 60; break; } - /*FALLTHROUGH*/ - case 0: v += f; f = 0; break; + case 0: + s--; + v += f; + break; default: if (p) { diff --git a/usr/src/lib/libast/common/string/strerror.c b/usr/src/lib/libast/common/string/strerror.c index 74fbafc553..2541efd847 100644 --- a/usr/src/lib/libast/common/string/strerror.c +++ b/usr/src/lib/libast/common/string/strerror.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -28,8 +28,7 @@ * return error message string given errno */ -#include <ast.h> -#include <error.h> +#include "lclib.h" #include "FEATURE/errno" @@ -113,10 +112,12 @@ _ast_strerror(int err) { t = fmtbuf(z = strlen(s) + 1); strcpy(t, s); + ast.locale.set |= AST_LC_internal; p = setlocale(LC_MESSAGES, NiL); setlocale(LC_MESSAGES, "C"); sys = (s = strerror(1)) && strcmp(s, t) ? 1 : -1; setlocale(LC_MESSAGES, p); + ast.locale.set &= ~AST_LC_internal; } } if (sys > 0) diff --git a/usr/src/lib/libast/common/string/stresc.c b/usr/src/lib/libast/common/string/stresc.c index d911accaec..84cee6dd7a 100644 --- a/usr/src/lib/libast/common/string/stresc.c +++ b/usr/src/lib/libast/common/string/stresc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,7 @@ stresc(register char* s) s = e; if (c > UCHAR_MAX) { - t += wctomb(t, c); + t += mbconv(t, c); continue; } } diff --git a/usr/src/lib/libast/common/string/streval.c b/usr/src/lib/libast/common/string/streval.c index bfd26afcf4..d5c8ee7ba3 100644 --- a/usr/src/lib/libast/common/string/streval.c +++ b/usr/src/lib/libast/common/string/streval.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strexpr.c b/usr/src/lib/libast/common/string/strexpr.c index 8518916018..042ae380aa 100644 --- a/usr/src/lib/libast/common/string/strexpr.c +++ b/usr/src/lib/libast/common/string/strexpr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strgid.c b/usr/src/lib/libast/common/string/strgid.c index 18ec53d6f3..746d058930 100644 --- a/usr/src/lib/libast/common/string/strgid.c +++ b/usr/src/lib/libast/common/string/strgid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strlcat.c b/usr/src/lib/libast/common/string/strlcat.c index 6c7d4d909b..7a56c7540b 100644 --- a/usr/src/lib/libast/common/string/strlcat.c +++ b/usr/src/lib/libast/common/string/strlcat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strlcpy.c b/usr/src/lib/libast/common/string/strlcpy.c index b389a95fdb..e2fe9b7913 100644 --- a/usr/src/lib/libast/common/string/strlcpy.c +++ b/usr/src/lib/libast/common/string/strlcpy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strlook.c b/usr/src/lib/libast/common/string/strlook.c index a97ebe3205..386be714fa 100644 --- a/usr/src/lib/libast/common/string/strlook.c +++ b/usr/src/lib/libast/common/string/strlook.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strmatch.c b/usr/src/lib/libast/common/string/strmatch.c index d5811b98d9..9b6b7f2720 100644 --- a/usr/src/lib/libast/common/string/strmatch.c +++ b/usr/src/lib/libast/common/string/strmatch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strmode.c b/usr/src/lib/libast/common/string/strmode.c index 5c6d2d6c4c..205c09c5a5 100644 --- a/usr/src/lib/libast/common/string/strmode.c +++ b/usr/src/lib/libast/common/string/strmode.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strnacmp.c b/usr/src/lib/libast/common/string/strnacmp.c index 6813976786..8449959c09 100644 --- a/usr/src/lib/libast/common/string/strnacmp.c +++ b/usr/src/lib/libast/common/string/strnacmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strncopy.c b/usr/src/lib/libast/common/string/strncopy.c index 3db15a33d4..fa3b5e036d 100644 --- a/usr/src/lib/libast/common/string/strncopy.c +++ b/usr/src/lib/libast/common/string/strncopy.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strnpcmp.c b/usr/src/lib/libast/common/string/strnpcmp.c index a7344f063a..ab4ec0d5d9 100644 --- a/usr/src/lib/libast/common/string/strnpcmp.c +++ b/usr/src/lib/libast/common/string/strnpcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntod.c b/usr/src/lib/libast/common/string/strntod.c index a9d2dc8d18..94103313d0 100644 --- a/usr/src/lib/libast/common/string/strntod.c +++ b/usr/src/lib/libast/common/string/strntod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntol.c b/usr/src/lib/libast/common/string/strntol.c index 65d3e58cd1..66b3ca9295 100644 --- a/usr/src/lib/libast/common/string/strntol.c +++ b/usr/src/lib/libast/common/string/strntol.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntold.c b/usr/src/lib/libast/common/string/strntold.c index 53f320653b..76c2b3e697 100644 --- a/usr/src/lib/libast/common/string/strntold.c +++ b/usr/src/lib/libast/common/string/strntold.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntoll.c b/usr/src/lib/libast/common/string/strntoll.c index 08862f8798..81abcd0b0c 100644 --- a/usr/src/lib/libast/common/string/strntoll.c +++ b/usr/src/lib/libast/common/string/strntoll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strnton.c b/usr/src/lib/libast/common/string/strnton.c index 0466c79c6d..0bed3df738 100644 --- a/usr/src/lib/libast/common/string/strnton.c +++ b/usr/src/lib/libast/common/string/strnton.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntonll.c b/usr/src/lib/libast/common/string/strntonll.c index ed6010a9c6..bd466b9abc 100644 --- a/usr/src/lib/libast/common/string/strntonll.c +++ b/usr/src/lib/libast/common/string/strntonll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntoul.c b/usr/src/lib/libast/common/string/strntoul.c index 387c52c2e3..8b201f060c 100644 --- a/usr/src/lib/libast/common/string/strntoul.c +++ b/usr/src/lib/libast/common/string/strntoul.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strntoull.c b/usr/src/lib/libast/common/string/strntoull.c index 89b10593ee..0de71e2178 100644 --- a/usr/src/lib/libast/common/string/strntoull.c +++ b/usr/src/lib/libast/common/string/strntoull.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strnvcmp.c b/usr/src/lib/libast/common/string/strnvcmp.c index 7a6419d375..0ebba65de4 100644 --- a/usr/src/lib/libast/common/string/strnvcmp.c +++ b/usr/src/lib/libast/common/string/strnvcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/stropt.c b/usr/src/lib/libast/common/string/stropt.c index 7981345519..aff59e541b 100644 --- a/usr/src/lib/libast/common/string/stropt.c +++ b/usr/src/lib/libast/common/string/stropt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strpcmp.c b/usr/src/lib/libast/common/string/strpcmp.c index a6bcedb80d..17bb4384ed 100644 --- a/usr/src/lib/libast/common/string/strpcmp.c +++ b/usr/src/lib/libast/common/string/strpcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strperm.c b/usr/src/lib/libast/common/string/strperm.c index 84ba6498d0..ccb878d2c0 100644 --- a/usr/src/lib/libast/common/string/strperm.c +++ b/usr/src/lib/libast/common/string/strperm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strpsearch.c b/usr/src/lib/libast/common/string/strpsearch.c index fd7deaa5fc..e7ae3f3e69 100644 --- a/usr/src/lib/libast/common/string/strpsearch.c +++ b/usr/src/lib/libast/common/string/strpsearch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strsearch.c b/usr/src/lib/libast/common/string/strsearch.c index ffee3cbfd5..8e7b6a2bc5 100644 --- a/usr/src/lib/libast/common/string/strsearch.c +++ b/usr/src/lib/libast/common/string/strsearch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strsort.c b/usr/src/lib/libast/common/string/strsort.c index a34b36af2c..fd604ca261 100644 --- a/usr/src/lib/libast/common/string/strsort.c +++ b/usr/src/lib/libast/common/string/strsort.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strtape.c b/usr/src/lib/libast/common/string/strtape.c index d2f54c720b..00d40b701a 100644 --- a/usr/src/lib/libast/common/string/strtape.c +++ b/usr/src/lib/libast/common/string/strtape.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strtoi.h b/usr/src/lib/libast/common/string/strtoi.h index ed53ec520e..a13425e6d3 100644 --- a/usr/src/lib/libast/common/string/strtoi.h +++ b/usr/src/lib/libast/common/string/strtoi.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strtoip4.c b/usr/src/lib/libast/common/string/strtoip4.c index 5c36fb8443..19371369c3 100644 --- a/usr/src/lib/libast/common/string/strtoip4.c +++ b/usr/src/lib/libast/common/string/strtoip4.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strtoip6.c b/usr/src/lib/libast/common/string/strtoip6.c index 4372213a91..f4cf8dfbce 100644 --- a/usr/src/lib/libast/common/string/strtoip6.c +++ b/usr/src/lib/libast/common/string/strtoip6.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strton.c b/usr/src/lib/libast/common/string/strton.c index 17728d8216..dc48ae6202 100644 --- a/usr/src/lib/libast/common/string/strton.c +++ b/usr/src/lib/libast/common/string/strton.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strtonll.c b/usr/src/lib/libast/common/string/strtonll.c index abc3bcd7a0..01440a8a78 100644 --- a/usr/src/lib/libast/common/string/strtonll.c +++ b/usr/src/lib/libast/common/string/strtonll.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/struid.c b/usr/src/lib/libast/common/string/struid.c index 864a0fa759..6b614e878d 100644 --- a/usr/src/lib/libast/common/string/struid.c +++ b/usr/src/lib/libast/common/string/struid.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/struniq.c b/usr/src/lib/libast/common/string/struniq.c index 7a25d93a20..9f0ff50eeb 100644 --- a/usr/src/lib/libast/common/string/struniq.c +++ b/usr/src/lib/libast/common/string/struniq.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/strvcmp.c b/usr/src/lib/libast/common/string/strvcmp.c index 510daa2758..91a3ed12e7 100644 --- a/usr/src/lib/libast/common/string/strvcmp.c +++ b/usr/src/lib/libast/common/string/strvcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/swapget.c b/usr/src/lib/libast/common/string/swapget.c index 423d7e3e88..09ab1bcd95 100644 --- a/usr/src/lib/libast/common/string/swapget.c +++ b/usr/src/lib/libast/common/string/swapget.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/swapmem.c b/usr/src/lib/libast/common/string/swapmem.c index efd50f8502..72027dcb61 100644 --- a/usr/src/lib/libast/common/string/swapmem.c +++ b/usr/src/lib/libast/common/string/swapmem.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/swapop.c b/usr/src/lib/libast/common/string/swapop.c index 5d25e13ca0..f1c7a05055 100644 --- a/usr/src/lib/libast/common/string/swapop.c +++ b/usr/src/lib/libast/common/string/swapop.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/swapput.c b/usr/src/lib/libast/common/string/swapput.c index f91719dd8e..ff577e9df0 100644 --- a/usr/src/lib/libast/common/string/swapput.c +++ b/usr/src/lib/libast/common/string/swapput.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/tok.c b/usr/src/lib/libast/common/string/tok.c index bddee19a32..f5cfa4c66f 100644 --- a/usr/src/lib/libast/common/string/tok.c +++ b/usr/src/lib/libast/common/string/tok.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/tokline.c b/usr/src/lib/libast/common/string/tokline.c index 47391d4af1..e7b3024b9a 100644 --- a/usr/src/lib/libast/common/string/tokline.c +++ b/usr/src/lib/libast/common/string/tokline.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/string/tokscan.c b/usr/src/lib/libast/common/string/tokscan.c index ba4a455769..526c476f1b 100644 --- a/usr/src/lib/libast/common/string/tokscan.c +++ b/usr/src/lib/libast/common/string/tokscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmdata.c b/usr/src/lib/libast/common/tm/tmdata.c index a6ee4f6a1c..7b5943a3de 100644 --- a/usr/src/lib/libast/common/tm/tmdata.c +++ b/usr/src/lib/libast/common/tm/tmdata.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmdate.c b/usr/src/lib/libast/common/tm/tmdate.c index 6cc7cfe492..8596b15431 100644 --- a/usr/src/lib/libast/common/tm/tmdate.c +++ b/usr/src/lib/libast/common/tm/tmdate.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmequiv.c b/usr/src/lib/libast/common/tm/tmequiv.c index d1e02d1215..98d1a601ad 100644 --- a/usr/src/lib/libast/common/tm/tmequiv.c +++ b/usr/src/lib/libast/common/tm/tmequiv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmfix.c b/usr/src/lib/libast/common/tm/tmfix.c index 11ede9c817..6095b7ec6d 100644 --- a/usr/src/lib/libast/common/tm/tmfix.c +++ b/usr/src/lib/libast/common/tm/tmfix.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmfmt.c b/usr/src/lib/libast/common/tm/tmfmt.c index bfbc87c3e1..b8919e844e 100644 --- a/usr/src/lib/libast/common/tm/tmfmt.c +++ b/usr/src/lib/libast/common/tm/tmfmt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmform.c b/usr/src/lib/libast/common/tm/tmform.c index b486a91a57..252d0d0efa 100644 --- a/usr/src/lib/libast/common/tm/tmform.c +++ b/usr/src/lib/libast/common/tm/tmform.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmgoff.c b/usr/src/lib/libast/common/tm/tmgoff.c index 87ccbf001d..3a23f20a87 100644 --- a/usr/src/lib/libast/common/tm/tmgoff.c +++ b/usr/src/lib/libast/common/tm/tmgoff.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tminit.c b/usr/src/lib/libast/common/tm/tminit.c index 95c6da2775..26e870213f 100644 --- a/usr/src/lib/libast/common/tm/tminit.c +++ b/usr/src/lib/libast/common/tm/tminit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -95,6 +95,7 @@ _tm_localtime(const time_t* t) { struct tm* r; char* e; + char** v = environ; if (TZ[0]) { @@ -107,8 +108,8 @@ _tm_localtime(const time_t* t) r = localtime(t); if (TZ[0]) { - if (environ == TE) - environ = 0; + if (environ != v) + environ = v; else environ[0] = e; } @@ -217,30 +218,34 @@ tmlocal(void) static Tm_zone_t local; -#if _lib_tzset #if _tzset_environ - if (s = getenv("TZ")) { - sfsprintf(TZ, sizeof(TZ), "TZ=%s", s); - if (!environ || !*environ) - environ = TE; + char** v = environ; + + if (s = getenv("TZ")) + { + sfsprintf(TZ, sizeof(TZ), "TZ=%s", s); + if (!environ || !*environ) + environ = TE; + else + e = environ[0]; + environ[0] = TZ; + } else - e = environ[0]; - environ[0] = TZ; - } - else - { - TZ[0] = 0; - e = 0; - } + { + TZ[0] = 0; + e = 0; + } #endif - tzset(); -#if _tzset_environ - if (environ == TE) - environ = 0; - else if (e) - environ[0] = e; +#if _lib_tzset + tzset(); #endif +#if _tzset_environ + if (environ != v) + environ = v; + else if (e) + environ[0] = e; + } #endif #if _dat_tzname local.standard = strdup(tzname[0]); diff --git a/usr/src/lib/libast/common/tm/tmleap.c b/usr/src/lib/libast/common/tm/tmleap.c index 5738462a96..3de239a7e6 100644 --- a/usr/src/lib/libast/common/tm/tmleap.c +++ b/usr/src/lib/libast/common/tm/tmleap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmlex.c b/usr/src/lib/libast/common/tm/tmlex.c index f63630eb58..ffdafdaaf2 100644 --- a/usr/src/lib/libast/common/tm/tmlex.c +++ b/usr/src/lib/libast/common/tm/tmlex.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmlocale.c b/usr/src/lib/libast/common/tm/tmlocale.c index 7f52fc3f2c..09a4408249 100644 --- a/usr/src/lib/libast/common/tm/tmlocale.c +++ b/usr/src/lib/libast/common/tm/tmlocale.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -32,6 +32,7 @@ #include <iconv.h> #include <mc.h> #include <tm.h> +#include <ast_nl_types.h> #include "lclib.h" @@ -499,19 +500,23 @@ native_lc_time(Lc_info_t* li) register char* t; register char** b; register int n; - register int m; register int i; n = 0; for (i = 0; i < elementsof(map); i++) - n += strlen(nl_langinfo(map[i].native)) + 1; + { + if (!(t = nl_langinfo(map[i].native))) + t = tm_data.format[map[i].local]; + n += strlen(t) + 1; + } if (!(b = newof(0, char*, TM_NFORM, n))) return; s = (char*)(b + TM_NFORM); for (i = 0; i < elementsof(map); i++) { b[map[i].local] = s; - t = nl_langinfo(map[i].native); + if (!(t = nl_langinfo(map[i].native))) + t = tm_data.format[map[i].local]; while (*s++ = *t++); } fixup(li, b); diff --git a/usr/src/lib/libast/common/tm/tmmake.c b/usr/src/lib/libast/common/tm/tmmake.c index fd8a9ca646..a8cd21aefd 100644 --- a/usr/src/lib/libast/common/tm/tmmake.c +++ b/usr/src/lib/libast/common/tm/tmmake.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmpoff.c b/usr/src/lib/libast/common/tm/tmpoff.c index 6863b3924b..45f0b0c7d0 100644 --- a/usr/src/lib/libast/common/tm/tmpoff.c +++ b/usr/src/lib/libast/common/tm/tmpoff.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmscan.c b/usr/src/lib/libast/common/tm/tmscan.c index 2118076dd3..57c556ba1e 100644 --- a/usr/src/lib/libast/common/tm/tmscan.c +++ b/usr/src/lib/libast/common/tm/tmscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmsleep.c b/usr/src/lib/libast/common/tm/tmsleep.c index 1fb83075ea..046dc52100 100644 --- a/usr/src/lib/libast/common/tm/tmsleep.c +++ b/usr/src/lib/libast/common/tm/tmsleep.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmtime.c b/usr/src/lib/libast/common/tm/tmtime.c index 947fefb37a..764f5268b7 100644 --- a/usr/src/lib/libast/common/tm/tmtime.c +++ b/usr/src/lib/libast/common/tm/tmtime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmtype.c b/usr/src/lib/libast/common/tm/tmtype.c index 7a6ba38939..4be985f1f1 100644 --- a/usr/src/lib/libast/common/tm/tmtype.c +++ b/usr/src/lib/libast/common/tm/tmtype.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmweek.c b/usr/src/lib/libast/common/tm/tmweek.c index fdec924c51..26265d8ba1 100644 --- a/usr/src/lib/libast/common/tm/tmweek.c +++ b/usr/src/lib/libast/common/tm/tmweek.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmword.c b/usr/src/lib/libast/common/tm/tmword.c index 3453ac0f77..4ab0bedfd6 100644 --- a/usr/src/lib/libast/common/tm/tmword.c +++ b/usr/src/lib/libast/common/tm/tmword.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxdate.c b/usr/src/lib/libast/common/tm/tmxdate.c index 76e9cd71df..3be483572f 100644 --- a/usr/src/lib/libast/common/tm/tmxdate.c +++ b/usr/src/lib/libast/common/tm/tmxdate.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1686,6 +1686,7 @@ tmxdate(register const char* s, char** e, Time_t now) if (day >= 0 && !(state & (MDAY|WDAY))) { message((-1, "AHA#%d day=%d dir=%d state=" FFMT, __LINE__, day, dir, FLAGS(state))); + tmfix(tm); m = dir; if (state & MONTH) tm->tm_mday = 1; @@ -1700,7 +1701,10 @@ tmxdate(register const char* s, char** e, Time_t now) for (n = tm_data.days[tm->tm_mon] + (tm->tm_mon == 1 && tmisleapyear(tm->tm_year)); (tm->tm_mday + 7) <= n; tm->tm_mday += 7); } else if (day < 0 && (state & FINAL) && (set & DAY)) + { + tmfix(tm); tm->tm_mday = tm_data.days[tm->tm_mon] + (tm->tm_mon == 1 && tmisleapyear(tm->tm_year)); + } if (state & WORK) { tm->tm_mday = (set & FINAL) ? (tm_data.days[tm->tm_mon] + (tm->tm_mon == 1 && tmisleapyear(tm->tm_year))) : 1; diff --git a/usr/src/lib/libast/common/tm/tmxduration.c b/usr/src/lib/libast/common/tm/tmxduration.c index d69eaa7fb8..64483c4f0c 100644 --- a/usr/src/lib/libast/common/tm/tmxduration.c +++ b/usr/src/lib/libast/common/tm/tmxduration.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -33,7 +33,6 @@ Time_t tmxduration(const char* s, char** e) { - double d; Time_t ns; Time_t ts; Time_t now; diff --git a/usr/src/lib/libast/common/tm/tmxfmt.c b/usr/src/lib/libast/common/tm/tmxfmt.c index 03c16bebe2..25e283de26 100644 --- a/usr/src/lib/libast/common/tm/tmxfmt.c +++ b/usr/src/lib/libast/common/tm/tmxfmt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxgettime.c b/usr/src/lib/libast/common/tm/tmxgettime.c index dbe33c4380..f60ba74083 100644 --- a/usr/src/lib/libast/common/tm/tmxgettime.c +++ b/usr/src/lib/libast/common/tm/tmxgettime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxleap.c b/usr/src/lib/libast/common/tm/tmxleap.c index 80fd1c1cb4..fb4a9fcf96 100644 --- a/usr/src/lib/libast/common/tm/tmxleap.c +++ b/usr/src/lib/libast/common/tm/tmxleap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxmake.c b/usr/src/lib/libast/common/tm/tmxmake.c index f37db8a265..921994fcbe 100644 --- a/usr/src/lib/libast/common/tm/tmxmake.c +++ b/usr/src/lib/libast/common/tm/tmxmake.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxscan.c b/usr/src/lib/libast/common/tm/tmxscan.c index c35fd89061..43ddbd026b 100644 --- a/usr/src/lib/libast/common/tm/tmxscan.c +++ b/usr/src/lib/libast/common/tm/tmxscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxsettime.c b/usr/src/lib/libast/common/tm/tmxsettime.c index 46e93c5cd9..e8cede89d5 100644 --- a/usr/src/lib/libast/common/tm/tmxsettime.c +++ b/usr/src/lib/libast/common/tm/tmxsettime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxsleep.c b/usr/src/lib/libast/common/tm/tmxsleep.c index 5ad4282f75..fda46af055 100644 --- a/usr/src/lib/libast/common/tm/tmxsleep.c +++ b/usr/src/lib/libast/common/tm/tmxsleep.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxtime.c b/usr/src/lib/libast/common/tm/tmxtime.c index 93d0df36cc..fdbaed85e9 100644 --- a/usr/src/lib/libast/common/tm/tmxtime.c +++ b/usr/src/lib/libast/common/tm/tmxtime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmxtouch.c b/usr/src/lib/libast/common/tm/tmxtouch.c index aaedc8f53f..f1dfab1f81 100644 --- a/usr/src/lib/libast/common/tm/tmxtouch.c +++ b/usr/src/lib/libast/common/tm/tmxtouch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tmzone.c b/usr/src/lib/libast/common/tm/tmzone.c index 14af6ae194..30cac0e37e 100644 --- a/usr/src/lib/libast/common/tm/tmzone.c +++ b/usr/src/lib/libast/common/tm/tmzone.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tvcmp.c b/usr/src/lib/libast/common/tm/tvcmp.c index 2a00e21e39..c955e0f064 100644 --- a/usr/src/lib/libast/common/tm/tvcmp.c +++ b/usr/src/lib/libast/common/tm/tvcmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tvgettime.c b/usr/src/lib/libast/common/tm/tvgettime.c index 244f761d4c..dc6cfabefa 100644 --- a/usr/src/lib/libast/common/tm/tvgettime.c +++ b/usr/src/lib/libast/common/tm/tvgettime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tvsettime.c b/usr/src/lib/libast/common/tm/tvsettime.c index 14b3f3eef6..cff60a05b7 100644 --- a/usr/src/lib/libast/common/tm/tvsettime.c +++ b/usr/src/lib/libast/common/tm/tvsettime.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tvsleep.c b/usr/src/lib/libast/common/tm/tvsleep.c index ba5dbef422..46d3d6ac59 100644 --- a/usr/src/lib/libast/common/tm/tvsleep.c +++ b/usr/src/lib/libast/common/tm/tvsleep.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/tm/tvtouch.c b/usr/src/lib/libast/common/tm/tvtouch.c index 27533b26bf..58f6bcfc00 100644 --- a/usr/src/lib/libast/common/tm/tvtouch.c +++ b/usr/src/lib/libast/common/tm/tvtouch.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -70,13 +70,20 @@ extern int utime(const char*, const time_t*); * Tv_t==0 uses current time * Tv_t==TV_TOUCH_RETAIN retains path value if it exists, current time otherwise * otherwise it is exact time - * file created if it doesn't exist and (flags&1) - * symlink not followed if (flags&2) + * file created if it doesn't exist and (flags&TV_TOUCH_CREATE) + * symlink not followed if (flags&TV_TOUCH_PHYSICAL) * cv most likely ignored on most implementations * - * NOTE: when *at() calls are integrated we need macros for the flags! + * NOTE: when *at() calls are integrated TV_TOUCH_* should be advertized! */ +#define TV_TOUCH_CREATE 1 +#define TV_TOUCH_PHYSICAL 2 + +#if !defined(UTIME_NOW) || !defined(UTIME_OMIT) || defined(__stub_utimensat) +#undef _lib_utimensat +#endif + int tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, const Tv_t* cv, int flags) { @@ -84,11 +91,22 @@ tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, cons int mode; int oerrno; struct stat st; - -#if _lib_utimensat + Tv_t now; +#if _lib_utimets || _lib_utimensat struct timespec ts[2]; +#endif +#if _lib_utimes + struct timeval am[2]; +#else +#if _hdr_utime + struct utimbuf am; +#else + time_t am[2]; +#endif +#endif - errno = oerrno; + oerrno = errno; +#if _lib_utimensat if (!av) { ts[0].tv_sec = 0; @@ -121,36 +139,23 @@ tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, cons } if (!cv && av == TV_TOUCH_RETAIN && mv == TV_TOUCH_RETAIN && !stat(path, &st) && !chmod(path, st.st_mode & S_IPERM)) return 0; - if (!utimensat(AT_FDCWD, path, ts[0].tv_nsec == UTIME_NOW && ts[1].tv_nsec == UTIME_NOW ? (struct timespec*)0 : ts, (flags & 2) ? AT_SYMLINK_NOFOLLOW : 0)) + if (!utimensat(AT_FDCWD, path, ts[0].tv_nsec == UTIME_NOW && ts[1].tv_nsec == UTIME_NOW ? (struct timespec*)0 : ts, (flags & TV_TOUCH_PHYSICAL) ? AT_SYMLINK_NOFOLLOW : 0)) return 0; - if (errno != ENOENT || !(flags & 1)) - return -1; - umask(mode = umask(0)); - mode = (~mode) & (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); - if ((fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, mode)) < 0) - return -1; - close(fd); - errno = oerrno; - if ((ts[0].tv_nsec != UTIME_NOW || ts[1].tv_nsec != UTIME_NOW) && utimensat(AT_FDCWD, path, ts, (flags & 2) ? AT_SYMLINK_NOFOLLOW : 0)) - return -1; - return 0; -#else - Tv_t now; -#if _lib_utimets - struct timespec am[2]; -#else -#if _lib_utimes - struct timeval am[2]; -#else -#if _hdr_utime - struct utimbuf am; -#else - time_t am[2]; -#endif -#endif + if (errno != ENOSYS) + { + if (errno != ENOENT || !(flags & TV_TOUCH_CREATE)) + return -1; + umask(mode = umask(0)); + mode = (~mode) & (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); + if ((fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, mode)) < 0) + return -1; + close(fd); + errno = oerrno; + if ((ts[0].tv_nsec != UTIME_NOW || ts[1].tv_nsec != UTIME_NOW) && utimensat(AT_FDCWD, path, ts, (flags & TV_TOUCH_PHYSICAL) ? AT_SYMLINK_NOFOLLOW : 0)) + return -1; + return 0; + } #endif - - oerrno = errno; if ((av == TV_TOUCH_RETAIN || mv == TV_TOUCH_RETAIN) && stat(path, &st)) { errno = oerrno; @@ -170,25 +175,25 @@ tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, cons #if _lib_utimets if (av == TV_TOUCH_RETAIN) { - am[0].tv_sec = st.st_atime; - am[0].tv_nsec = ST_ATIME_NSEC_GET(&st); + ts[0].tv_sec = st.st_atime; + ts[0].tv_nsec = ST_ATIME_NSEC_GET(&st); } else { - am[0].tv_sec = av->tv_sec; - am[0].tv_nsec = NS(av->tv_nsec); + ts[0].tv_sec = av->tv_sec; + ts[0].tv_nsec = NS(av->tv_nsec); } if (mv == TV_TOUCH_RETAIN) { - am[1].tv_sec = st.st_mtime; - am[1].tv_nsec = ST_MTIME_NSEC_GET(&st); + ts[1].tv_sec = st.st_mtime; + ts[1].tv_nsec = ST_MTIME_NSEC_GET(&st); } else { - am[1].tv_sec = mv->tv_sec; - am[1].tv_nsec = NS(mv->tv_nsec); + ts[1].tv_sec = mv->tv_sec; + ts[1].tv_nsec = NS(mv->tv_nsec); } - if (!utimets(path, am)) + if (!utimets(path, ts)) return 0; if (errno != ENOENT && av == (const Tv_t*)&now && mv == (const Tv_t*)&now && !utimets(path, NiL)) { @@ -262,7 +267,7 @@ tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, cons } } #endif - if (errno != ENOENT || !(flags & 1)) + if (errno != ENOENT || !(flags & TV_TOUCH_CREATE)) return -1; umask(mode = umask(0)); mode = (~mode) & (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); @@ -286,6 +291,5 @@ tvtouch(const char* path, register const Tv_t* av, register const Tv_t* mv, cons #endif #endif #endif -#endif } diff --git a/usr/src/lib/libast/common/uwin/a64l.c b/usr/src/lib/libast/common/uwin/a64l.c index c2a8adbc85..dd6ea1da01 100644 --- a/usr/src/lib/libast/common/uwin/a64l.c +++ b/usr/src/lib/libast/common/uwin/a64l.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/uwin/cbrt.c b/usr/src/lib/libast/common/uwin/cbrt.c index 873e18694a..14f21b5868 100644 --- a/usr/src/lib/libast/common/uwin/cbrt.c +++ b/usr/src/lib/libast/common/uwin/cbrt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/uwin/err.c b/usr/src/lib/libast/common/uwin/err.c index e80007333e..dd972a7013 100644 --- a/usr/src/lib/libast/common/uwin/err.c +++ b/usr/src/lib/libast/common/uwin/err.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/uwin/getpass.c b/usr/src/lib/libast/common/uwin/getpass.c index 7a961f7dc1..06179793e6 100644 --- a/usr/src/lib/libast/common/uwin/getpass.c +++ b/usr/src/lib/libast/common/uwin/getpass.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/uwin/rand48.c b/usr/src/lib/libast/common/uwin/rand48.c index 82ee3d1d3d..e0d96254a2 100644 --- a/usr/src/lib/libast/common/uwin/rand48.c +++ b/usr/src/lib/libast/common/uwin/rand48.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/uwin/rint.c b/usr/src/lib/libast/common/uwin/rint.c index 87d28d4f0f..f883f794e8 100644 --- a/usr/src/lib/libast/common/uwin/rint.c +++ b/usr/src/lib/libast/common/uwin/rint.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vec/vecargs.c b/usr/src/lib/libast/common/vec/vecargs.c index 974da9f577..25bf6fc286 100644 --- a/usr/src/lib/libast/common/vec/vecargs.c +++ b/usr/src/lib/libast/common/vec/vecargs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vec/vecfile.c b/usr/src/lib/libast/common/vec/vecfile.c index 77f17f52ef..9b8492d030 100644 --- a/usr/src/lib/libast/common/vec/vecfile.c +++ b/usr/src/lib/libast/common/vec/vecfile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vec/vecfree.c b/usr/src/lib/libast/common/vec/vecfree.c index f1dfb659ff..46a6e793a8 100644 --- a/usr/src/lib/libast/common/vec/vecfree.c +++ b/usr/src/lib/libast/common/vec/vecfree.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vec/vecload.c b/usr/src/lib/libast/common/vec/vecload.c index a12702cb99..bdb3fffe8e 100644 --- a/usr/src/lib/libast/common/vec/vecload.c +++ b/usr/src/lib/libast/common/vec/vecload.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vec/vecstring.c b/usr/src/lib/libast/common/vec/vecstring.c index f9cc749c1c..9489d18c65 100644 --- a/usr/src/lib/libast/common/vec/vecstring.c +++ b/usr/src/lib/libast/common/vec/vecstring.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/malloc.c b/usr/src/lib/libast/common/vmalloc/malloc.c index da4a839ecd..84f61120ad 100644 --- a/usr/src/lib/libast/common/vmalloc/malloc.c +++ b/usr/src/lib/libast/common/vmalloc/malloc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -88,21 +88,39 @@ typedef struct ______mstats Mstats_t; #define _AST_std_malloc 1 #endif -#if ( !_std_malloc || !_BLD_ast ) && !_AST_std_malloc - -/* malloc compatibility functions. -** These are aware of debugging/profiling and driven by the environment variables: -** VMETHOD: select an allocation method by name. +/* malloc compatibility functions +** +** These are aware of debugging/profiling and are driven by the +** VMALLOC_OPTIONS environment variable which is a space-separated +** list of [no]name[=value] options: ** -** VMPROFILE: if is a file name, write profile data to it. -** VMTRACE: if is a file name, write trace data to it. -** The pattern %p in a file name will be replaced by the process ID. +** abort if Vmregion==Vmdebug then VM_DBABORT is set, +** otherwise _BLD_debug enabled assertions abort() +** on failure +** check if Vmregion==Vmbest then the region is checked every op +** method=m sets Vmregion=m if not defined, m (Vm prefix optional) +** may be one of { best debug last profile } +** mmap prefer mmap() over brk() for region allocation +** period=n sets Vmregion=Vmdebug if not defined, if +** Vmregion==Vmdebug the region is checked every n ops +** profile=f sets Vmregion=Vmprofile if not set, if +** Vmregion==Vmprofile then profile info printed to file f +** region if Vmregion==Vmbest then block free verifies +** that the block belongs to the region +** start=n sets Vmregion=Vmdebug if not defined, if +** Vmregion==Vmdebug region checking starts after n ops +** trace=f enables tracing to file f +** warn=f sets Vmregion=Vmdebug if not defined, if +** Vmregion==Vmdebug then warnings printed to file f +** watch=a sets Vmregion=Vmdebug if not defined, if +** Vmregion==Vmdebug then address a is watched ** -** VMDEBUG: -** a: abort on any warning. -** w[decimal]: file descriptor for warnings. -** [decimal]: period to check arena. -** 0x[hexadecimal]: address to watch. +** Output files are created if they don't exist. &n and /dev/fd/n name +** the file descriptor n which must be open for writing. The pattern %p +** in a file name is replaced by the process ID. +** +** VMALLOC_OPTIONS combines the features of these previously used env vars: +** { VMDEBUG VMETHOD VMPROFILE VMTRACE } ** ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ @@ -118,6 +136,13 @@ typedef struct ______mstats Mstats_t; #define CREAT_MODE 0644 #endif +static Vmulong_t _Vmdbstart = 0; +static Vmulong_t _Vmdbcheck = 0; +static Vmulong_t _Vmdbtime = 0; +static int _Vmpffd = -1; + +#if ( !_std_malloc || !_BLD_ast ) && !_AST_std_malloc + #if !_map_malloc #undef calloc #undef cfree @@ -182,44 +207,7 @@ lcl_getenv(const char* s) #define extern extern __EXPORT__ #endif -#if __STD_C -static Vmulong_t atou(char** sp) -#else -static Vmulong_t atou(sp) -char** sp; -#endif -{ - char* s = *sp; - Vmulong_t v = 0; - - if(s[0] == '0' && (s[1] == 'x' || s[1] == 'X') ) - { for(s += 2; *s; ++s) - { if(*s >= '0' && *s <= '9') - v = (v << 4) + (*s - '0'); - else if(*s >= 'a' && *s <= 'f') - v = (v << 4) + (*s - 'a') + 10; - else if(*s >= 'A' && *s <= 'F') - v = (v << 4) + (*s - 'A') + 10; - else break; - } - } - else - { for(; *s; ++s) - { if(*s >= '0' && *s <= '9') - v = v*10 + (*s - '0'); - else break; - } - } - - *sp = s; - return v; -} - static int _Vmflinit = 0; -static Vmulong_t _Vmdbstart = 0; -static Vmulong_t _Vmdbcheck = 0; -static Vmulong_t _Vmdbtime = 0; -static int _Vmpffd = -1; #define VMFLINIT() \ { if(!_Vmflinit) vmflinit(); \ if(_Vmdbcheck) \ @@ -232,99 +220,11 @@ static int _Vmpffd = -1; } #if __STD_C -static char* insertpid(char* begs, char* ends) -#else -static char* insertpid(begs,ends) -char* begs; -char* ends; -#endif -{ int pid; - char* s; - - if((pid = getpid()) < 0) - return NIL(char*); - - s = ends; - do - { if(s == begs) - return NIL(char*); - *--s = '0' + pid%10; - } while((pid /= 10) > 0); - while(s < ends) - *begs++ = *s++; - - return begs; -} - -#if __STD_C -static int createfile(char* file) -#else -static int createfile(file) -char* file; -#endif -{ - char buf[1024]; - char *next, *endb; - - next = buf; - endb = buf + sizeof(buf); - while(*file) - { if(*file == '%') - { switch(file[1]) - { - case 'p' : - if(!(next = insertpid(next,endb)) ) - return -1; - file += 2; - break; - default : - goto copy; - } - } - else - { copy: - *next++ = *file++; - } - - if(next >= endb) - return -1; - } - - *next = '\0'; -#if _PACKAGE_ast - { int fd; - fd = open(buf,O_WRONLY|O_CREAT|O_TRUNC,CREAT_MODE); -#ifdef FD_CLOEXEC - if (fd >= 0) - fcntl(fd, F_SETFD, FD_CLOEXEC); -#endif - return fd; - } -#else - return creat(buf,CREAT_MODE); -#endif -} - -#if __STD_C -static void pfprint(void) -#else -static void pfprint() -#endif -{ - if(Vmregion->meth.meth == VM_MTPROFILE) - vmprofile(Vmregion,_Vmpffd); -} - -#if __STD_C static int vmflinit(void) #else static int vmflinit() #endif { - char* env; - Vmalloc_t* vm; - int fd; - Vmulong_t addr; char* file; int line; Void_t* func; @@ -333,82 +233,8 @@ static int vmflinit() _Vmflinit = 1; VMFLF(Vmregion,file,line,func); - /* if getenv() calls malloc(), the eventual region may not see this */ - vm = NIL(Vmalloc_t*); - if((env = getenv("VMETHOD")) ) - { if(strcmp(env,"Vmdebug") == 0 || strcmp(env,"vmdebug") == 0) - vm = vmopen(Vmdcsbrk,Vmdebug,0); - else if(strcmp(env,"Vmprofile") == 0 || strcmp(env,"vmprofile") == 0 ) - vm = vmopen(Vmdcsbrk,Vmprofile,0); - else if(strcmp(env,"Vmlast") == 0 || strcmp(env,"vmlast") == 0 ) - vm = vmopen(Vmdcsbrk,Vmlast,0); - else if(strcmp(env,"Vmbest") == 0 || strcmp(env,"vmbest") == 0 ) - vm = Vmheap; - } - - if((!vm || vm->meth.meth == VM_MTDEBUG) && - (env = getenv("VMDEBUG")) && env[0] ) - { if(vm || (vm = vmopen(Vmdcsbrk,Vmdebug,0)) ) - { reg int setcheck = 0; - - while(*env) - { if(*env == 'a') - { vmset(vm,VM_DBABORT,1); - env += 1; - } - else if(*env =='w') - { env += 1; - if((fd = atou(&env)) >= 0 ) - vmdebug(fd); - } - else if(*env < '0' || *env > '9') - env += 1; - else if(env[0] == '0' && (env[1] == 'x' || env[1] == 'X') ) - { if((addr = atou(&env)) != 0) - vmdbwatch((Void_t*)addr); - } - else - { _Vmdbcheck = atou(&env); - setcheck = 1; - if(*env == ',') - { env += 1; - _Vmdbstart = atou(&env); - } - } - } - if(!setcheck) - _Vmdbcheck = 1; - } - } - - if((!vm || vm->meth.meth == VM_MTPROFILE) && - (env = getenv("VMPROFILE")) && env[0] ) - { _Vmpffd = createfile(env); - if(!vm) - vm = vmopen(Vmdcsbrk,Vmprofile,0); - } - - /* slip in the new region now so that malloc() will work fine */ - if(vm) - Vmregion = vm; - - /* turn on tracing if requested */ - if((env = getenv("VMTRACE")) && env[0] && (fd = createfile(env)) >= 0) - { vmset(Vmregion,VM_TRACE,1); - vmtrace(fd); - } - - /* make sure that profile data is output upon exiting */ - if(vm && vm->meth.meth == VM_MTPROFILE) - { if(_Vmpffd < 0) - _Vmpffd = 2; - /* this may wind up calling malloc(), but region is ok now */ - atexit(pfprint); - } - else if(_Vmpffd >= 0) - { close(_Vmpffd); - _Vmpffd = -1; - } + /* if getenv() calls malloc(), the options may not affect the eventual region */ + VMOPTIONS(); /* reset file and line number to correct values for the call */ Vmregion->file = file; @@ -938,4 +764,359 @@ extern Mstats_t F0(_ast_mstats, void) { return mstats(); } #endif /*!_std_malloc*/ +#if __STD_C +static Vmulong_t atou(char** sp) +#else +static Vmulong_t atou(sp) +char** sp; +#endif +{ + char* s = *sp; + Vmulong_t v = 0; + + if(s[0] == '0' && (s[1] == 'x' || s[1] == 'X') ) + { for(s += 2; *s; ++s) + { if(*s >= '0' && *s <= '9') + v = (v << 4) + (*s - '0'); + else if(*s >= 'a' && *s <= 'f') + v = (v << 4) + (*s - 'a') + 10; + else if(*s >= 'A' && *s <= 'F') + v = (v << 4) + (*s - 'A') + 10; + else break; + } + } + else + { for(; *s; ++s) + { if(*s >= '0' && *s <= '9') + v = v*10 + (*s - '0'); + else break; + } + } + + *sp = s; + return v; +} + +#if __STD_C +static char* insertpid(char* begs, char* ends) +#else +static char* insertpid(begs,ends) +char* begs; +char* ends; +#endif +{ int pid; + char* s; + + if((pid = getpid()) < 0) + return NIL(char*); + + s = ends; + do + { if(s == begs) + return NIL(char*); + *--s = '0' + pid%10; + } while((pid /= 10) > 0); + while(s < ends) + *begs++ = *s++; + + return begs; +} + +#if __STD_C +static int createfile(char* file) +#else +static int createfile(file) +char* file; +#endif +{ + char buf[1024]; + char *next, *endb; + int fd; + + next = buf; + endb = buf + sizeof(buf); + while(*file) + { if(*file == '%') + { switch(file[1]) + { + case 'p' : + if(!(next = insertpid(next,endb)) ) + return -1; + file += 2; + break; + default : + goto copy; + } + } + else + { copy: + *next++ = *file++; + } + + if(next >= endb) + return -1; + } + + *next = '\0'; + file = buf; + if (*file == '&' && *(file += 1) || strncmp(file, "/dev/fd/", 8) == 0 && *(file += 8)) + fd = dup((int)atou(&file)); + else if (*file) +#if _PACKAGE_ast + fd = open(file, O_WRONLY|O_CREAT|O_TRUNC, CREAT_MODE); +#else + fd = creat(file, CREAT_MODE); +#endif + else + return -1; +#if _PACKAGE_ast +#ifdef FD_CLOEXEC + if (fd >= 0) + fcntl(fd, F_SETFD, FD_CLOEXEC); +#endif +#endif + return fd; +} + +#if __STD_C +static void pfprint(void) +#else +static void pfprint() +#endif +{ + if(Vmregion->meth.meth == VM_MTPROFILE) + vmprofile(Vmregion,_Vmpffd); +} + +/* + * initialize runtime options from the VMALLOC_OPTIONS env var + */ + +#define COPY(t,e,f) while ((*t = *f++) && t < e) t++ + +#if __STD_C +void _vmoptions(void) +#else +void _vmoptions() +#endif +{ + Vmalloc_t* vm = 0; + char* trace = 0; + char* s; + char* t; + char* v; + Vmulong_t n; + int fd; + char buf[1024]; + + _Vmoptions = 1; + t = buf; + v = &buf[sizeof(buf)-1]; + if (s = getenv("VMALLOC_OPTIONS")) + COPY(t, v, s); +#if 1 /* backwards compatibility until 2011 */ + else + { + char* p; + + if (s = getenv("VMDEBUG")) + { + switch (*s++) + { + case 0: + break; + case 'a': + p = " abort"; + COPY(t, v, p); + break; + case 'w': + p = " warn"; + COPY(t, v, p); + break; + case '0': + if (*s-- == 'x') + { + p = " watch="; + COPY(t, v, p); + COPY(t, v, s); + break; + } + /*FALLTHROUGH*/ + default: + p = " period="; + COPY(t, v, p); + COPY(t, v, s); + break; + } + } + if ((s = getenv("VMETHOD")) && *s) + { + p = " method="; + COPY(t, v, p); + COPY(t, v, s); + } + if ((s = getenv("VMPROFILE")) && *s) + { + p = " profile="; + COPY(t, v, p); + COPY(t, v, s); + } + if ((s = getenv("VMTRACE")) && *s) + { + p = " trace="; + COPY(t, v, p); + COPY(t, v, s); + } + } +#endif + if (t > buf) + { + *t = 0; + s = buf; + for (;;) + { + while (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') + s++; + if (!*(t = s)) + break; + v = 0; + while (*s) + if (*s == ' ' || *s == '\t' || *s == '\r' || *s == '\n') + { + *s++ = 0; + break; + } + else if (!v && *s == '=') + { + *s++ = 0; + if (!*(v = s)) + v = 0; + } + else + s++; + if (t[0] == 'n' && t[1] == 'o') + continue; + switch (t[0]) + { + case 'a': /* abort */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + if (vm && vm->meth.meth == VM_MTDEBUG) + vmset(vm, VM_DBABORT, 1); + else + _Vmassert |= VM_abort; + break; + case 'c': /* check */ + _Vmassert |= VM_check; + break; + case 'm': + switch (t[1]) + { + case 'e': /* method=<method> */ + if (v && !vm) + { + if ((v[0] == 'V' || v[0] == 'v') && (v[1] == 'M' || v[1] == 'm')) + v += 2; + if (strcmp(v, "debug") == 0) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + else if (strcmp(v, "profile") == 0) + vm = vmopen(Vmdcsbrk, Vmprofile, 0); + else if (strcmp(v, "last") == 0) + vm = vmopen(Vmdcsbrk, Vmlast, 0); + else if (strcmp(v, "best") == 0) + vm = Vmheap; + } + break; + case 'm': /* mmap */ +#if _mem_mmap_anon || _mem_mmap_zero + _Vmassert |= VM_mmap; +#endif + break; + } + break; + case 'p': + if (v) + switch (t[1]) + { + case 'e': /* period=<count> */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + if (vm && vm->meth.meth == VM_MTDEBUG) + _Vmdbcheck = atou(&v); + break; + case 'r': /* profile=<path> */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmprofile, 0); + if (v && vm && vm->meth.meth == VM_MTPROFILE) + _Vmpffd = createfile(v); + break; + } + break; + case 'r': /* region */ + _Vmassert |= VM_region; + break; + case 's': /* start=<count> */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + if (v && vm && vm->meth.meth == VM_MTDEBUG) + _Vmdbstart = atou(&v); + break; + case 't': /* trace=<path> */ + trace = v; + break; + case 'w': + if (t[1] == 'a') + switch (t[2]) + { + case 'r': /* warn=<path> */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + if (v && vm && vm->meth.meth == VM_MTDEBUG && (fd = createfile(v)) >= 0) + vmdebug(fd); + break; + case 't': /* watch=<addr> */ + if (!vm) + vm = vmopen(Vmdcsbrk, Vmdebug, 0); + if (v && vm && vm->meth.meth == VM_MTDEBUG && (n = atou(&v)) >= 0) + vmdbwatch((Void_t*)n); + break; + } + break; + } + } + } + + /* slip in the new region now so that malloc() will work fine */ + + if (vm) + { + if (vm->meth.meth == VM_MTDEBUG) + _Vmdbcheck = 1; + Vmregion = vm; + } + + /* enable tracing */ + + if (trace && (fd = createfile(trace)) >= 0) + { + vmset(Vmregion, VM_TRACE, 1); + vmtrace(fd); + } + + /* make sure that profile data is output upon exiting */ + + if (vm && vm->meth.meth == VM_MTPROFILE) + { + if (_Vmpffd < 0) + _Vmpffd = 2; + /* this may wind up calling malloc(), but region is ok now */ + atexit(pfprint); + } + else if (_Vmpffd >= 0) + { + close(_Vmpffd); + _Vmpffd = -1; + } +} + #endif /*_UWIN*/ diff --git a/usr/src/lib/libast/common/vmalloc/vmbest.c b/usr/src/lib/libast/common/vmalloc/vmbest.c index 35b24fa678..a9c622d2ad 100644 --- a/usr/src/lib/libast/common/vmalloc/vmbest.c +++ b/usr/src/lib/libast/common/vmalloc/vmbest.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -46,6 +46,12 @@ static int N_reclaim; /* # of bestreclaim calls */ #define VM_TRUST 0 #endif /*DEBUG*/ +#if _BLD_posix +#define logmsg(d,a ...) logsrc(d,__FILE__,__LINE__,a) + +extern int logsrc(int, const char*, int, const char*, ...); +#endif /*_BLD_posix*/ + #define COMPACT 8 /* factor to decide when to compact */ /* Check to see if a block is in the free tree */ @@ -421,6 +427,13 @@ int c; if(ISPFREE(size)) /* backward merge */ { fp = LAST(fp); +#if _BLD_posix + if (fp < (Block_t*)0x00120000) + { + logmsg(0, "bestreclaim fp=%p", fp); + ASSERT(!fp); + } +#endif s = SIZE(fp); /**/ASSERT(!(s&BITS)); REMOVE(vd,fp,INDEX(s),t,bestsearch); size = (size&~BITS) + s + sizeof(Head_t); @@ -429,6 +442,13 @@ int c; for(;;) /* forward merge */ { np = (Block_t*)((Vmuchar_t*)fp+size+sizeof(Head_t)); +#if _BLD_posix + if (np < (Block_t*)0x00120000) + { + logmsg(0, "bestreclaim np=%p", np); + ASSERT(!np); + } +#endif s = SIZE(np); /**/ASSERT(s > 0); if(!ISBUSY(s)) { /**/ASSERT((s&BITS) == 0); @@ -641,61 +661,8 @@ reg size_t size; /* desired block size */ reg int local, inuse; size_t orgsize = 0; - if(!(_Vmassert & VM_init)) - { char *chk = getenv("VMCHECK"); - _Vmassert = VM_init; - if(chk) - { int set = 1; - for(;; set ? (_Vmassert |= n) : (_Vmassert &= ~n)) - { - switch (*chk++) - { - case 0: - break; - case '-': - case '!': - set = 0; - n = 0; - continue; - case '+': - set = 1; - n = 0; - continue; - case '1': - n = VM_check; - continue; - case '2': - n = VM_abort; - continue; - case '3': - n = VM_check|VM_abort; - continue; - case 'a': - case 'A': - n = VM_abort; - continue; - case 'c': - case 'C': - n = VM_check; - continue; -#if _mem_mmap_anon || _mem_mmap_zero - case 'm': - case 'M': - n = VM_mmap; -#endif - continue; - case 'r': - case 'R': - n = VM_region; - continue; - default: - n = 0; - continue; - } - break; - } - } - } + VMOPTIONS(); + /**/COUNT(N_alloc); SETINUSE(vd, inuse); @@ -1386,72 +1353,66 @@ Vmdisc_t* disc; /* discipline structure */ #endif /* _mem_sbrk */ #if _mem_mmap_anon /* anonymous mmap */ - { - addr = (Vmuchar_t*)mmap(0, nsize, PROT_READ|PROT_WRITE, - MAP_ANON|MAP_PRIVATE, -1, 0); - if(addr && addr != (Vmuchar_t*)MAP_FAILED) - { if(okaddr(addr,nsize) >= 0) - return addr; - (void)munmap(addr, nsize); /* release reserved address */ - } + addr = (Vmuchar_t*)mmap(0, nsize, PROT_READ|PROT_WRITE, + MAP_ANON|MAP_PRIVATE, -1, 0); + if(addr && addr != (Vmuchar_t*)MAP_FAILED) + { if(okaddr(addr,nsize) >= 0) + return addr; + (void)munmap((char*)addr, nsize); /* release reserved address */ } #endif /* _mem_mmap_anon */ #if _mem_mmap_zero /* mmap from /dev/zero */ - { - if(mmdc->fd < 0) - { int fd; - if(mmdc->fd != -1) - return NIL(Void_t*); - if((fd = open("/dev/zero", O_RDONLY)) < 0 ) - { mmdc->fd = -2; - return NIL(Void_t*); - } - if(fd >= OPEN_PRIVATE || (mmdc->fd = dup2(fd,OPEN_PRIVATE)) < 0 ) - mmdc->fd = fd; - else close(fd); + if(mmdc->fd < 0) + { int fd; + if(mmdc->fd != -1) + return NIL(Void_t*); + if((fd = open("/dev/zero", O_RDONLY)) < 0 ) + { mmdc->fd = -2; + return NIL(Void_t*); + } + if(fd >= OPEN_PRIVATE || (mmdc->fd = dup2(fd,OPEN_PRIVATE)) < 0 ) + mmdc->fd = fd; + else close(fd); #ifdef FD_CLOEXEC - fcntl(mmdc->fd, F_SETFD, FD_CLOEXEC); + fcntl(mmdc->fd, F_SETFD, FD_CLOEXEC); #endif + } + addr = (Vmuchar_t*)mmap(0, nsize, PROT_READ|PROT_WRITE, + MAP_PRIVATE, mmdc->fd, mmdc->offset); + if(addr && addr != (Vmuchar_t*)MAP_FAILED) + { if(okaddr(addr, nsize) >= 0) + { mmdc->offset += nsize; + return addr; } - addr = (Vmuchar_t*)mmap(0, nsize, PROT_READ|PROT_WRITE, - MAP_PRIVATE, mmdc->fd, mmdc->offset); - if(addr && addr != (Vmuchar_t*)MAP_FAILED) - { if(okaddr(addr, nsize) >= 0) - { mmdc->offset += nsize; - return addr; - } - (void)munmap(addr, nsize); /* release reserved address */ - } + (void)munmap((char*)addr, nsize); /* release reserved address */ } #endif /* _mem_mmap_zero */ return NIL(Void_t*); } else - { addr = caddr; /* in case !_mem_sbrk */ + { #if _mem_sbrk - { - addr = (Vmuchar_t*)sbrk(0); - if(!addr || addr == (Vmuchar_t*)BRK_FAILED) - addr = caddr; - else if(((Vmuchar_t*)caddr+csize) == addr) /* in sbrk-space */ - { if(nsize <= csize) - addr -= csize-nsize; - else if((addr += nsize-csize) < (Vmuchar_t*)caddr) - return NIL(Void_t*); /* wrapped around address */ - else return brk(addr) == 0 ? caddr : NIL(Void_t*); - } + addr = (Vmuchar_t*)sbrk(0); + if(!addr || addr == (Vmuchar_t*)BRK_FAILED) + addr = caddr; + else if(((Vmuchar_t*)caddr+csize) == addr) /* in sbrk-space */ + { if(nsize <= csize) + addr -= csize-nsize; + else if((addr += nsize-csize) < (Vmuchar_t*)caddr) + return NIL(Void_t*); /* wrapped around address */ + else return brk(addr) == 0 ? caddr : NIL(Void_t*); } +#else + addr = caddr; #endif /* _mem_sbrk */ #if _mem_mmap_zero || _mem_mmap_anon - { - if(((Vmuchar_t*)caddr+csize) > addr) /* in mmap-space */ - if(nsize == 0 && munmap(caddr,csize) == 0) - return caddr; - } + if(((Vmuchar_t*)caddr+csize) > addr) /* in mmap-space */ + if(nsize == 0 && munmap(caddr,csize) == 0) + return caddr; #endif /* _mem_mmap_zero || _mem_mmap_anon */ return NIL(Void_t*); diff --git a/usr/src/lib/libast/common/vmalloc/vmclear.c b/usr/src/lib/libast/common/vmalloc/vmclear.c index bca98e669a..fd3f17f8f4 100644 --- a/usr/src/lib/libast/common/vmalloc/vmclear.c +++ b/usr/src/lib/libast/common/vmalloc/vmclear.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmclose.c b/usr/src/lib/libast/common/vmalloc/vmclose.c index 67b63c7723..39ff5dc603 100644 --- a/usr/src/lib/libast/common/vmalloc/vmclose.c +++ b/usr/src/lib/libast/common/vmalloc/vmclose.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmdcheap.c b/usr/src/lib/libast/common/vmalloc/vmdcheap.c index 892de4ae18..59ed6bfed1 100644 --- a/usr/src/lib/libast/common/vmalloc/vmdcheap.c +++ b/usr/src/lib/libast/common/vmalloc/vmdcheap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmdebug.c b/usr/src/lib/libast/common/vmalloc/vmdebug.c index dede7d0469..3cb1e3963e 100644 --- a/usr/src/lib/libast/common/vmalloc/vmdebug.c +++ b/usr/src/lib/libast/common/vmalloc/vmdebug.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -177,7 +177,7 @@ int type; /* operation being done */ bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(func),-1), ':'); } - *bufp++ = '\n'; + *(bufp - 1) = '\n'; *bufp = '\0'; vmdbwarn(vm,buf,(bufp-buf)); @@ -463,9 +463,9 @@ Void_t* data; vmdbcheck(vm); if((offset = KPVADDR(vm,data,dbaddr)) != 0) - { if(vm->disc->exceptf) + { dbwarn(vm,(Vmuchar_t*)data,offset == -1L ? 0 : 1,file,line,func,DB_FREE); + if(vm->disc->exceptf) (void)(*vm->disc->exceptf)(vm,VM_BADADDR,data,vm->disc); - dbwarn(vm,(Vmuchar_t*)data,offset == -1L ? 0 : 1,file,line,func,DB_FREE); CLRLOCK(vd,0); CLRINUSE(vd, inuse); return -1; @@ -537,9 +537,9 @@ int type; /* !=0 for movable, >0 for copy */ vmdbcheck(vm); if((offset = KPVADDR(vm,addr,dbaddr)) != 0) - { if(vm->disc->exceptf) + { dbwarn(vm,(Vmuchar_t*)addr,offset == -1L ? 0 : 1,file,line,func,DB_RESIZE); + if(vm->disc->exceptf) (void)(*vm->disc->exceptf)(vm,VM_BADADDR,addr,vm->disc); - dbwarn(vm,(Vmuchar_t*)addr,offset == -1L ? 0 : 1,file,line,func,DB_RESIZE); CLRLOCK(vd,0); CLRINUSE(vd, inuse); return NIL(Void_t*); @@ -744,6 +744,39 @@ done: return (Void_t*)data; } +/* print statistics of region vm. If vm is NULL, use Vmregion */ +#if __STD_C +ssize_t vmdbstat(Vmalloc_t* vm) +#else +ssize_t vmdbstat(vm) +Vmalloc_t* vm; +#endif +{ Vmstat_t st; + char buf[1024], *bufp; + + vmstat(vm ? vm : Vmregion, &st); + bufp = buf; + bufp = (*_Vmstrcpy)(bufp, "n_busy", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)((Vmulong_t)st.n_busy,-1), ','); + bufp = (*_Vmstrcpy)(bufp, " s_busy", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(st.s_busy),-1), '\n'); + bufp = (*_Vmstrcpy)(bufp, "n_free", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)((Vmulong_t)st.n_free,-1), ','); + bufp = (*_Vmstrcpy)(bufp, " s_free", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(st.s_free),-1), '\n'); + bufp = (*_Vmstrcpy)(bufp, "m_busy", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(st.m_busy),-1), ','); + bufp = (*_Vmstrcpy)(bufp, " m_free", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(st.m_free),-1), '\n'); + bufp = (*_Vmstrcpy)(bufp, "n_segment", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)((Vmulong_t)st.n_seg,-1), ','); + bufp = (*_Vmstrcpy)(bufp, " extent", '='); + bufp = (*_Vmstrcpy)(bufp, (*_Vmitoa)(VLONG(st.extent),-1), '\n'); + *bufp = 0; + write(Dbfd, buf, strlen(buf)); + return strlen(buf); +} + static Vmethod_t _Vmdebug = { dballoc, diff --git a/usr/src/lib/libast/common/vmalloc/vmdisc.c b/usr/src/lib/libast/common/vmalloc/vmdisc.c index 719d2c4194..139b34b423 100644 --- a/usr/src/lib/libast/common/vmalloc/vmdisc.c +++ b/usr/src/lib/libast/common/vmalloc/vmdisc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmexit.c b/usr/src/lib/libast/common/vmalloc/vmexit.c index 946a2f9519..ea81177546 100644 --- a/usr/src/lib/libast/common/vmalloc/vmexit.c +++ b/usr/src/lib/libast/common/vmalloc/vmexit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmgetmem.c b/usr/src/lib/libast/common/vmalloc/vmgetmem.c index e7a66f740b..607c10f280 100644 --- a/usr/src/lib/libast/common/vmalloc/vmgetmem.c +++ b/usr/src/lib/libast/common/vmalloc/vmgetmem.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmhdr.h b/usr/src/lib/libast/common/vmalloc/vmhdr.h index 7fe3d64917..d1b04f7505 100644 --- a/usr/src/lib/libast/common/vmalloc/vmhdr.h +++ b/usr/src/lib/libast/common/vmalloc/vmhdr.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -71,6 +71,10 @@ #define _npt_sbrk 1 #endif +#ifndef integralof +#define integralof(x) (((char*)(x))-((char*)0)) +#endif + #endif /*_PACKAGE_ast*/ #include "FEATURE/vmalloc" @@ -130,7 +134,6 @@ typedef int ssize_t; #define VM_abort 0x0002 /* abort() on assertion failure */ #define VM_region 0x0004 /* enable region segment checks */ #define VM_mmap 0x0010 /* favor mmap allocation */ -#define VM_init 0x8000 /* VMCHECK env var checked */ #if _UWIN #include <ast_windows.h> @@ -334,7 +337,7 @@ struct _tiny_s #define TINY(vd) ((vd)->tiny) #define CACHE(vd) ((vd)->cache) -typedef struct _vmdata_s +struct _vmdata_s { int mode; /* current mode for region */ size_t incr; /* allocate in multiple of this */ size_t pool; /* size of an elt in a Vmpool region */ @@ -344,13 +347,8 @@ typedef struct _vmdata_s Block_t* root; /* root of free tree */ Block_t* tiny[S_TINY]; /* small blocks */ Block_t* cache[S_CACHE+1]; /* delayed free blocks */ -} Vmdata_t; - -/* private parts of Vmalloc_t */ -#define _VM_PRIVATE_ \ - Vmdisc_t* disc; /* discipline to get space */ \ - Vmdata_t* data; /* the real region data */ \ - Vmalloc_t* next; /* linked list of regions */ +}; +/* Vmdata_t typedef in <vmalloc.h> */ #include "vmalloc.h" @@ -363,7 +361,7 @@ typedef struct _vmdata_s /* segment structure */ struct _seg_s -{ Vmalloc_t* vm; /* the region that holds this */ +{ Vmdata_t* vmdt; /* the data region holding this */ Seg_t* next; /* next segment */ Void_t* addr; /* starting segment address */ size_t extent; /* extent of segment */ @@ -492,6 +490,7 @@ typedef struct _vmextern_ Vmuchar_t*, Vmuchar_t*, size_t, size_t)); void (*vm_pfclose)_ARG_((Vmalloc_t*)); int vm_assert; + int vm_options; } Vmextern_t; #define _Vmextend (_Vmextern.vm_extend) @@ -502,7 +501,11 @@ typedef struct _vmextern_ #define _Vmtrace (_Vmextern.vm_trace) #define _Vmpfclose (_Vmextern.vm_pfclose) #define _Vmassert (_Vmextern.vm_assert) +#define _Vmoptions (_Vmextern.vm_options) + +#define VMOPTIONS() do { if (!_Vmoptions) { _vmoptions(); } } while (0) +extern void _vmoptions _ARG_((void)); extern int _vmbestcheck _ARG_((Vmdata_t*, Block_t*)); _BEGIN_EXTERNS_ diff --git a/usr/src/lib/libast/common/vmalloc/vmlast.c b/usr/src/lib/libast/common/vmalloc/vmlast.c index 2463f24e09..a9c5e2171a 100644 --- a/usr/src/lib/libast/common/vmalloc/vmlast.c +++ b/usr/src/lib/libast/common/vmalloc/vmlast.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmmopen.c b/usr/src/lib/libast/common/vmalloc/vmmopen.c index b5ccff821c..1f1653da23 100644 --- a/usr/src/lib/libast/common/vmalloc/vmmopen.c +++ b/usr/src/lib/libast/common/vmalloc/vmmopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmopen.c b/usr/src/lib/libast/common/vmalloc/vmopen.c index 0e92089ddf..d0ce57987d 100644 --- a/usr/src/lib/libast/common/vmalloc/vmopen.c +++ b/usr/src/lib/libast/common/vmalloc/vmopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -90,7 +90,7 @@ int mode; /* type of region */ vd = (Vmdata_t*)addr; if((vd->mode&meth->meth) != 0) { vm->data = vd; - return vm; + goto done; } else { open_error: @@ -140,7 +140,7 @@ int mode; /* type of region */ seg = vd->seg; seg->next = NIL(Seg_t*); - seg->vm = vm; + seg->vmdt = vd; seg->addr = (Void_t*)(addr - (a ? ALIGN-a : 0)); seg->extent = s; seg->baddr = addr + s - (a ? ALIGN : 0); @@ -166,7 +166,7 @@ int mode; /* type of region */ vm->data = vd; - /* put into linked list of regions */ +done: /* add to the linked list of regions */ vm->next = Vmheap->next; Vmheap->next = vm; diff --git a/usr/src/lib/libast/common/vmalloc/vmpool.c b/usr/src/lib/libast/common/vmalloc/vmpool.c index 3195a03e65..965712cf9b 100644 --- a/usr/src/lib/libast/common/vmalloc/vmpool.c +++ b/usr/src/lib/libast/common/vmalloc/vmpool.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -54,7 +54,7 @@ reg size_t size; if(size <= 0) return NIL(Void_t*); - else if(size != vd->pool) + if(size != vd->pool) { if(vd->pool <= 0) vd->pool = size; else return NIL(Void_t*); diff --git a/usr/src/lib/libast/common/vmalloc/vmprivate.c b/usr/src/lib/libast/common/vmalloc/vmprivate.c index d1dd774442..96d93d75c6 100644 --- a/usr/src/lib/libast/common/vmalloc/vmprivate.c +++ b/usr/src/lib/libast/common/vmalloc/vmprivate.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,18 +27,7 @@ void _STUB_vmprivate(){} #include "vmhdr.h" -static char* Version = "\n@(#)$Id: Vmalloc (AT&T Research) 2009-06-19 $\0\n"; - -#if _sys_stat -#include <sys/stat.h> -#endif -#include <fcntl.h> - -#ifdef S_IRUSR -#define CREAT_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH) -#else -#define CREAT_MODE 0644 -#endif +static char* Version = "\n@(#)$Id: Vmalloc (AT&T Research) 2010-01-01 $\0\n"; /* Private code used in the vmalloc library ** @@ -67,13 +56,7 @@ Vmsearch_f searchf; /* tree search function */ #if DEBUG /* trace all allocation calls through the heap */ if(!_Vmtrace && vm == Vmheap && (vd->mode&VM_TRUST) ) - { char *env; - int fd; - vd->mode = (vd->mode&~VM_TRUST)|VM_TRACE; - if((fd = vmtrace(-1)) >= 0 || - ((env = getenv("VMTRACE")) && (fd = creat(env, CREAT_MODE)) >= 0 ) ) - vmtrace(fd); - } + VMOPTIONS(); #endif if(vd->incr <= 0) /* this is just _Vmheap on the first call */ @@ -135,11 +118,12 @@ Vmsearch_f searchf; /* tree search function */ if(seg) { /* extending current segment */ - bp = BLOCK(seg->baddr); /**/ ASSERT((SIZE(bp)&~BITS) == 0); - /**/ ASSERT(SEG(bp) == seg); + bp = BLOCK(seg->baddr); if(vd->mode&(VM_MTBEST|VM_MTDEBUG|VM_MTPROFILE) ) - { if(!ISPFREE(SIZE(bp)) ) + { /**/ ASSERT((SIZE(bp)&~BITS) == 0); + /**/ ASSERT(SEG(bp) == seg); + if(!ISPFREE(SIZE(bp)) ) SIZE(bp) = size - sizeof(Head_t); else { /**/ ASSERT(searchf); @@ -156,7 +140,10 @@ Vmsearch_f searchf; /* tree search function */ seg->free = NIL(Block_t*); SIZE(bp) += size; } - else SIZE(bp) = size - sizeof(Head_t); + else + { SEG(bp) = seg; + SIZE(bp) = size - sizeof(Head_t); + } } seg->size += size; @@ -171,7 +158,7 @@ Vmsearch_f searchf; /* tree search function */ addr += ALIGN-s; seg = (Seg_t*)addr; - seg->vm = vm; + seg->vmdt = vd; seg->addr = (Void_t*)(addr - (s ? ALIGN-s : 0)); seg->extent = size; seg->baddr = addr + size - (s ? 2*ALIGN : 0); @@ -247,8 +234,8 @@ int exact; less = _Vmpagesize; less = (size/less)*less; less = (less/vd->incr)*vd->incr; - if(less > 0 && size > less && (size-less) < sizeof(Block_t) ) - less = less <= vd->incr ? 0 : less - vd->incr; + if(less > 0 && size > (size_t)less && (size-(size_t)less) < sizeof(Block_t) ) + less = (size_t)less <= vd->incr ? 0 : (size_t)less - vd->incr; } if(less <= 0 || diff --git a/usr/src/lib/libast/common/vmalloc/vmprofile.c b/usr/src/lib/libast/common/vmalloc/vmprofile.c index c8381e1913..6651865844 100644 --- a/usr/src/lib/libast/common/vmalloc/vmprofile.c +++ b/usr/src/lib/libast/common/vmalloc/vmprofile.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmregion.c b/usr/src/lib/libast/common/vmalloc/vmregion.c index ad468388b0..cfdbb67016 100644 --- a/usr/src/lib/libast/common/vmalloc/vmregion.c +++ b/usr/src/lib/libast/common/vmalloc/vmregion.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -28,17 +28,31 @@ void _STUB_vmregion(){} #include "vmhdr.h" /* Return the containing region of an allocated piece of memory. -** Beware: this only works with Vmbest and Vmtrace. +** Beware: this only works with Vmbest, Vmdebug and Vmprofile. +** +** 10/31/2009: Add handling of shared/persistent memory regions. ** ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ #if __STD_C -Vmalloc_t* vmregion(reg Void_t* addr) +Vmalloc_t* vmregion(Void_t* addr) #else Vmalloc_t* vmregion(addr) -reg Void_t* addr; +Void_t* addr; #endif -{ return addr ? VM(BLOCK(addr)) : NIL(Vmalloc_t*); +{ + Vmalloc_t *vm; + Vmdata_t *vd; + + if(!addr) + return NIL(Vmalloc_t*); + + vd = SEG(BLOCK(addr))->vmdt; + for(vm = Vmheap; vm; vm = vm->next) + if(vm->data == vd) + break; + + return vm; } #endif diff --git a/usr/src/lib/libast/common/vmalloc/vmsegment.c b/usr/src/lib/libast/common/vmalloc/vmsegment.c index b5fca2d604..7d7dbad275 100644 --- a/usr/src/lib/libast/common/vmalloc/vmsegment.c +++ b/usr/src/lib/libast/common/vmalloc/vmsegment.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmset.c b/usr/src/lib/libast/common/vmalloc/vmset.c index de80405e8e..7997f8e1e3 100644 --- a/usr/src/lib/libast/common/vmalloc/vmset.c +++ b/usr/src/lib/libast/common/vmalloc/vmset.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmstat.c b/usr/src/lib/libast/common/vmalloc/vmstat.c index 6ee4de7e3c..9693c460b3 100644 --- a/usr/src/lib/libast/common/vmalloc/vmstat.c +++ b/usr/src/lib/libast/common/vmalloc/vmstat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmstrdup.c b/usr/src/lib/libast/common/vmalloc/vmstrdup.c index e5c0d4a5ef..211666621a 100644 --- a/usr/src/lib/libast/common/vmalloc/vmstrdup.c +++ b/usr/src/lib/libast/common/vmalloc/vmstrdup.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/common/vmalloc/vmtrace.c b/usr/src/lib/libast/common/vmalloc/vmtrace.c index 2e18ede92f..7ecbb5490f 100644 --- a/usr/src/lib/libast/common/vmalloc/vmtrace.c +++ b/usr/src/lib/libast/common/vmalloc/vmtrace.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -219,6 +219,7 @@ long n2; if (n2) bufp = trstrcpy(bufp, tritoa(n2, 0), ':'); } + bufp = trstrcpy(bufp, tritoa((long)getpid(), 1), ':'); *bufp++ = '\n'; write(2,buf,(bufp-buf)); } diff --git a/usr/src/lib/libast/common/vmalloc/vmwalk.c b/usr/src/lib/libast/common/vmalloc/vmwalk.c index f2628a4594..7336d65589 100644 --- a/usr/src/lib/libast/common/vmalloc/vmwalk.c +++ b/usr/src/lib/libast/common/vmalloc/vmwalk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -33,11 +33,12 @@ void _STUB_vmwalk(){} */ #if __STD_C -int vmwalk(Vmalloc_t* vm, int(*segf)(Vmalloc_t*, Void_t*, size_t, Vmdisc_t*) ) +int vmwalk(Vmalloc_t* vm, int(*segf)(Vmalloc_t*, Void_t*, size_t, Vmdisc_t*, Void_t*), Void_t* handle ) #else -int vmwalk(vm, segf) +int vmwalk(vm, segf, handle) Vmalloc_t* vm; int(* segf)(/* Vmalloc_t*, Void_t*, size_t, Vmdisc_t* */); +Void_t* handle; #endif { reg Seg_t* seg; @@ -50,7 +51,7 @@ int(* segf)(/* Vmalloc_t*, Void_t*, size_t, Vmdisc_t* */); SETLOCK(vm->data,0); for(seg = vm->data->seg; seg; seg = seg->next) - { rv = (*segf)(vm, seg->addr, seg->extent, vm->disc); + { rv = (*segf)(vm, seg->addr, seg->extent, vm->disc, handle); if(rv < 0) return rv; } @@ -63,7 +64,7 @@ int(* segf)(/* Vmalloc_t*, Void_t*, size_t, Vmdisc_t* */); SETLOCK(vm->data,0); for(seg = vm->data->seg; seg; seg = seg->next) - { rv = (*segf)(vm, seg->addr, seg->extent, vm->disc); + { rv = (*segf)(vm, seg->addr, seg->extent, vm->disc, handle); if(rv < 0) return rv; } diff --git a/usr/src/lib/libast/i386/include/ast/align.h b/usr/src/lib/libast/i386/include/ast/align.h index 24f8bf15f4..ec5ed75a77 100644 --- a/usr/src/lib/libast/i386/include/ast/align.h +++ b/usr/src/lib/libast/i386/include/ast/align.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast.h b/usr/src/lib/libast/i386/include/ast/ast.h index f1dff0cf6a..5c0d5dcd30 100644 --- a/usr/src/lib/libast/i386/include/ast/ast.h +++ b/usr/src/lib/libast/i386/include/ast/ast.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/ast_botch.h b/usr/src/lib/libast/i386/include/ast/ast_botch.h index 4b5ef40291..78b2b31a5a 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_botch.h +++ b/usr/src/lib/libast/i386/include/ast/ast_botch.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_ccode.h b/usr/src/lib/libast/i386/include/ast/ast_ccode.h index c62b58b6bf..1f82f1c28a 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_ccode.h +++ b/usr/src/lib/libast/i386/include/ast/ast_ccode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_common.h b/usr/src/lib/libast/i386/include/ast/ast_common.h index dcad835b59..aa16d54d99 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_common.h +++ b/usr/src/lib/libast/i386/include/ast/ast_common.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_dir.h b/usr/src/lib/libast/i386/include/ast/ast_dir.h index 8d801aa72c..c873ed3253 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_dir.h +++ b/usr/src/lib/libast/i386/include/ast/ast_dir.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/ast_dirent.h b/usr/src/lib/libast/i386/include/ast/ast_dirent.h index b5af5057a1..a1a3db0aca 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_dirent.h +++ b/usr/src/lib/libast/i386/include/ast/ast_dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_fcntl.h b/usr/src/lib/libast/i386/include/ast/ast_fcntl.h index 00bcfa8fb6..aca708d860 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_fcntl.h +++ b/usr/src/lib/libast/i386/include/ast/ast_fcntl.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/include/ast/ast_float.h b/usr/src/lib/libast/i386/include/ast/ast_float.h index f1e82608fc..c6eaf9b7e6 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_float.h +++ b/usr/src/lib/libast/i386/include/ast/ast_float.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_fs.h b/usr/src/lib/libast/i386/include/ast/ast_fs.h index bd1b4b8c3e..a9855675c1 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_fs.h +++ b/usr/src/lib/libast/i386/include/ast/ast_fs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -100,15 +100,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_getopt.h b/usr/src/lib/libast/i386/include/ast/ast_getopt.h index 060c18a246..c86d826a72 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_getopt.h +++ b/usr/src/lib/libast/i386/include/ast/ast_getopt.h @@ -19,11 +19,7 @@ extern __MANGLE__ int optind; extern __MANGLE__ int optopt; extern __MANGLE__ char* optarg; -#ifndef NULL /* in case <stdlib.h> or <stdio.h> got here first */ - extern __MANGLE__ int getopt __PROTO__((int, char* const*, const char*)); extern __MANGLE__ int getsubopt __PROTO__((char**, char* const*, char**)); #endif - -#endif diff --git a/usr/src/lib/libast/i386/include/ast/ast_iconv.h b/usr/src/lib/libast/i386/include/ast/ast_iconv.h index 01e60bd046..f17ec0140a 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_iconv.h +++ b/usr/src/lib/libast/i386/include/ast/ast_iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_lib.h b/usr/src/lib/libast/i386/include/ast/ast_lib.h index 0ae2eec0fe..c05dcf1693 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_lib.h +++ b/usr/src/lib/libast/i386/include/ast/ast_lib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -145,6 +145,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -176,7 +179,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_limits.h b/usr/src/lib/libast/i386/include/ast/ast_limits.h index 83c102d1f8..c7e6db0e98 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_limits.h +++ b/usr/src/lib/libast/i386/include/ast/ast_limits.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_map.h b/usr/src/lib/libast/i386/include/ast/ast_map.h index 18772a201a..3c3056c636 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_map.h +++ b/usr/src/lib/libast/i386/include/ast/ast_map.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/include/ast/ast_mmap.h b/usr/src/lib/libast/i386/include/ast/ast_mmap.h index db4b9daa7c..9a8b69d2de 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_mmap.h +++ b/usr/src/lib/libast/i386/include/ast/ast_mmap.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_mode.h b/usr/src/lib/libast/i386/include/ast/ast_mode.h index 86480ac738..f9fdb04f02 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_mode.h +++ b/usr/src/lib/libast/i386/include/ast/ast_mode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_namval.h b/usr/src/lib/libast/i386/include/ast/ast_namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_namval.h +++ b/usr/src/lib/libast/i386/include/ast/ast_namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/ast_ndbm.h b/usr/src/lib/libast/i386/include/ast/ast_ndbm.h index 84d720a257..bdb7770692 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_ndbm.h +++ b/usr/src/lib/libast/i386/include/ast/ast_ndbm.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_nl_types.h b/usr/src/lib/libast/i386/include/ast/ast_nl_types.h index a3f0e08cf3..d3eadf94ef 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_nl_types.h +++ b/usr/src/lib/libast/i386/include/ast/ast_nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_param.h b/usr/src/lib/libast/i386/include/ast/ast_param.h index 0a9ed88045..3e4296bdf7 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_param.h +++ b/usr/src/lib/libast/i386/include/ast/ast_param.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_standards.h b/usr/src/lib/libast/i386/include/ast/ast_standards.h index 8f7b5d4093..e8a8b9bc50 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_standards.h +++ b/usr/src/lib/libast/i386/include/ast/ast_standards.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_std.h b/usr/src/lib/libast/i386/include/ast/ast_std.h index e734c74dbd..f98d1861b9 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_std.h +++ b/usr/src/lib/libast/i386/include/ast/ast_std.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -166,6 +166,8 @@ extern __MANGLE__ char* strerror __PROTO__((int)); #define AST_LC_COUNT 14 #define AST_LC_LANG 255 +#define AST_LC_internal 1 +#define AST_LC_setenv (1L<<27) #define AST_LC_find (1L<<28) #define AST_LC_debug (1L<<29) #define AST_LC_setlocale (1L<<30) @@ -258,8 +260,9 @@ typedef struct uint32_t env_serial; uint32_t mb_sync; + uint32_t version; - char pad[940]; + char pad[936]; } _Ast_info_t; @@ -346,7 +349,7 @@ extern __MANGLE__ int _ast_getpgrp __PROTO__((void)); /* * and finally, standard interfaces hijacked by ast - * _ATS_STD_I delays headers that require <ast_map.h> + * _AST_STD_I delays headers that require <ast_map.h> */ #include <ast_map.h> diff --git a/usr/src/lib/libast/i386/include/ast/ast_stdio.h b/usr/src/lib/libast/i386/include/ast/ast_stdio.h index bf2c08fb73..26b817d52e 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_stdio.h +++ b/usr/src/lib/libast/i386/include/ast/ast_stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_sys.h b/usr/src/lib/libast/i386/include/ast/ast_sys.h index 3b63c47b46..5f92fe45d5 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_sys.h +++ b/usr/src/lib/libast/i386/include/ast/ast_sys.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_time.h b/usr/src/lib/libast/i386/include/ast/ast_time.h index 377f747a0e..dd3f95e537 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_time.h +++ b/usr/src/lib/libast/i386/include/ast/ast_time.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_tty.h b/usr/src/lib/libast/i386/include/ast/ast_tty.h index 25660744e1..f3433c6fec 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_tty.h +++ b/usr/src/lib/libast/i386/include/ast/ast_tty.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_version.h b/usr/src/lib/libast/i386/include/ast/ast_version.h index af5756d02b..b3ba546e3a 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_version.h +++ b/usr/src/lib/libast/i386/include/ast/ast_version.h @@ -7,4 +7,4 @@ #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif -#define _AST_VERSION 20090202L +#define _AST_VERSION 20100102L diff --git a/usr/src/lib/libast/i386/include/ast/ast_vfork.h b/usr/src/lib/libast/i386/include/ast/ast_vfork.h index e65f4c0438..ad29d2b7cf 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_vfork.h +++ b/usr/src/lib/libast/i386/include/ast/ast_vfork.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -85,4 +85,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/i386/include/ast/ast_wait.h b/usr/src/lib/libast/i386/include/ast/ast_wait.h index f11358a087..f73ccf11b7 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_wait.h +++ b/usr/src/lib/libast/i386/include/ast/ast_wait.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/ast_wchar.h b/usr/src/lib/libast/i386/include/ast/ast_wchar.h index c84a745fab..baa224dfea 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_wchar.h +++ b/usr/src/lib/libast/i386/include/ast/ast_wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/ast_windows.h b/usr/src/lib/libast/i386/include/ast/ast_windows.h index e02d2aaeb9..65590c17b4 100644 --- a/usr/src/lib/libast/i386/include/ast/ast_windows.h +++ b/usr/src/lib/libast/i386/include/ast/ast_windows.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/bytesex.h b/usr/src/lib/libast/i386/include/ast/bytesex.h index e105fc5f58..1f78d13287 100644 --- a/usr/src/lib/libast/i386/include/ast/bytesex.h +++ b/usr/src/lib/libast/i386/include/ast/bytesex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/ccode.h b/usr/src/lib/libast/i386/include/ast/ccode.h index a7a43aecbe..ae50c63b16 100644 --- a/usr/src/lib/libast/i386/include/ast/ccode.h +++ b/usr/src/lib/libast/i386/include/ast/ccode.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -43,7 +43,7 @@ #define _CHARCODE_H 1 -#include <ast.h> +#include <ast_common.h> #include <ast_ccode.h> typedef struct Ccmap_s diff --git a/usr/src/lib/libast/i386/include/ast/cdt.h b/usr/src/lib/libast/i386/include/ast/cdt.h index f2f0389296..1044207b76 100644 --- a/usr/src/lib/libast/i386/include/ast/cdt.h +++ b/usr/src/lib/libast/i386/include/ast/cdt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/debug.h b/usr/src/lib/libast/i386/include/ast/debug.h index 8f0ec6a257..6dfee2254a 100644 --- a/usr/src/lib/libast/i386/include/ast/debug.h +++ b/usr/src/lib/libast/i386/include/ast/debug.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/dirent.h b/usr/src/lib/libast/i386/include/ast/dirent.h index ea81d037a5..05e76cadae 100644 --- a/usr/src/lib/libast/i386/include/ast/dirent.h +++ b/usr/src/lib/libast/i386/include/ast/dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/dt.h b/usr/src/lib/libast/i386/include/ast/dt.h index 6fcc20c42e..b6b356aee7 100644 --- a/usr/src/lib/libast/i386/include/ast/dt.h +++ b/usr/src/lib/libast/i386/include/ast/dt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/endian.h b/usr/src/lib/libast/i386/include/ast/endian.h index 6ad7ddcaad..1c992dd490 100644 --- a/usr/src/lib/libast/i386/include/ast/endian.h +++ b/usr/src/lib/libast/i386/include/ast/endian.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/error.h b/usr/src/lib/libast/i386/include/ast/error.h index 10d919a93a..c0e21dadd7 100644 --- a/usr/src/lib/libast/i386/include/ast/error.h +++ b/usr/src/lib/libast/i386/include/ast/error.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -64,7 +64,7 @@ #ifndef ERROR_translate #define ERROR_translating() (error_info.translate&&(ast.locale.set&(1<<AST_LC_MESSAGES))) -#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)l,(const char*)i,(const char*)d,(const char*)m):(m)) +#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)(l),(const char*)(i),(const char*)(d),(const char*)(m)):(char*)(m)) #endif #define ERROR_INFO 0 /* info message -- no err_id */ diff --git a/usr/src/lib/libast/i386/include/ast/find.h b/usr/src/lib/libast/i386/include/ast/find.h index 9ed4227d03..374858aced 100644 --- a/usr/src/lib/libast/i386/include/ast/find.h +++ b/usr/src/lib/libast/i386/include/ast/find.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/fnmatch.h b/usr/src/lib/libast/i386/include/ast/fnmatch.h index ba357d9585..764009c3b7 100644 --- a/usr/src/lib/libast/i386/include/ast/fnmatch.h +++ b/usr/src/lib/libast/i386/include/ast/fnmatch.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/fnv.h b/usr/src/lib/libast/i386/include/ast/fnv.h index f4caaee97f..2312a20118 100644 --- a/usr/src/lib/libast/i386/include/ast/fnv.h +++ b/usr/src/lib/libast/i386/include/ast/fnv.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/fs3d.h b/usr/src/lib/libast/i386/include/ast/fs3d.h index 50795c98b0..bae8dde927 100644 --- a/usr/src/lib/libast/i386/include/ast/fs3d.h +++ b/usr/src/lib/libast/i386/include/ast/fs3d.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/fts.h b/usr/src/lib/libast/i386/include/ast/fts.h index 09420af481..1bf72a114d 100644 --- a/usr/src/lib/libast/i386/include/ast/fts.h +++ b/usr/src/lib/libast/i386/include/ast/fts.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -41,7 +41,9 @@ #define _FTS_H -#include <ls.h> +#include <ast_std.h> +#include <ast_fs.h> +#include <ast_mode.h> /* * fts_open flags diff --git a/usr/src/lib/libast/i386/include/ast/ftw.h b/usr/src/lib/libast/i386/include/ast/ftw.h index 49040cf863..68feb09bb3 100644 --- a/usr/src/lib/libast/i386/include/ast/ftw.h +++ b/usr/src/lib/libast/i386/include/ast/ftw.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/ftwalk.h b/usr/src/lib/libast/i386/include/ast/ftwalk.h index 29e1693959..673b1c2824 100644 --- a/usr/src/lib/libast/i386/include/ast/ftwalk.h +++ b/usr/src/lib/libast/i386/include/ast/ftwalk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/getopt.h b/usr/src/lib/libast/i386/include/ast/getopt.h index 4ad28bbb01..c0679a7e53 100644 --- a/usr/src/lib/libast/i386/include/ast/getopt.h +++ b/usr/src/lib/libast/i386/include/ast/getopt.h @@ -1,17 +1,42 @@ /* : : generated by proto : : */ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1985-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* Phong Vo <kpv@research.att.com> * +* * +***********************************************************************/ + +/* + * gnu getopt interface + */ +#ifndef _GETOPT_H #if !defined(__PROTO__) #include <prototyped.h> #endif #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif + #ifdef _AST_STD_I #define _GETOPT_H -1 -#endif - -#ifndef _GETOPT_H +#else #define _GETOPT_H 1 #include <ast_getopt.h> @@ -32,3 +57,4 @@ extern __MANGLE__ int getopt_long __PROTO__((int, char* const*, const char*, con extern __MANGLE__ int getopt_long_only __PROTO__((int, char* const*, const char*, const struct option*, int*)); #endif +#endif diff --git a/usr/src/lib/libast/i386/include/ast/glob.h b/usr/src/lib/libast/i386/include/ast/glob.h index 93e202a5f9..e2708229c7 100644 --- a/usr/src/lib/libast/i386/include/ast/glob.h +++ b/usr/src/lib/libast/i386/include/ast/glob.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/hash.h b/usr/src/lib/libast/i386/include/ast/hash.h index a524737ccc..0023ea06f5 100644 --- a/usr/src/lib/libast/i386/include/ast/hash.h +++ b/usr/src/lib/libast/i386/include/ast/hash.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/hashkey.h b/usr/src/lib/libast/i386/include/ast/hashkey.h index 525434e369..84be9113a1 100644 --- a/usr/src/lib/libast/i386/include/ast/hashkey.h +++ b/usr/src/lib/libast/i386/include/ast/hashkey.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/hashpart.h b/usr/src/lib/libast/i386/include/ast/hashpart.h index cfe3666777..5d33aac61d 100644 --- a/usr/src/lib/libast/i386/include/ast/hashpart.h +++ b/usr/src/lib/libast/i386/include/ast/hashpart.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/iconv.h b/usr/src/lib/libast/i386/include/ast/iconv.h index 5b02759721..e65540c075 100644 --- a/usr/src/lib/libast/i386/include/ast/iconv.h +++ b/usr/src/lib/libast/i386/include/ast/iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/lc.h b/usr/src/lib/libast/i386/include/ast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/i386/include/ast/lc.h +++ b/usr/src/lib/libast/i386/include/ast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/i386/include/ast/ls.h b/usr/src/lib/libast/i386/include/ast/ls.h index 70a8dc88ba..a8a5fcb0e0 100644 --- a/usr/src/lib/libast/i386/include/ast/ls.h +++ b/usr/src/lib/libast/i386/include/ast/ls.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/magic.h b/usr/src/lib/libast/i386/include/ast/magic.h index 53d632c721..8683016e80 100644 --- a/usr/src/lib/libast/i386/include/ast/magic.h +++ b/usr/src/lib/libast/i386/include/ast/magic.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/magicid.h b/usr/src/lib/libast/i386/include/ast/magicid.h index e31c80f288..1dca0c1e42 100644 --- a/usr/src/lib/libast/i386/include/ast/magicid.h +++ b/usr/src/lib/libast/i386/include/ast/magicid.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/mc.h b/usr/src/lib/libast/i386/include/ast/mc.h index 75b4308360..b84df7239e 100644 --- a/usr/src/lib/libast/i386/include/ast/mc.h +++ b/usr/src/lib/libast/i386/include/ast/mc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/mime.h b/usr/src/lib/libast/i386/include/ast/mime.h index 6d662d29e5..5943b58eaa 100644 --- a/usr/src/lib/libast/i386/include/ast/mime.h +++ b/usr/src/lib/libast/i386/include/ast/mime.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/mnt.h b/usr/src/lib/libast/i386/include/ast/mnt.h index 62815d19e7..8bf8c12814 100644 --- a/usr/src/lib/libast/i386/include/ast/mnt.h +++ b/usr/src/lib/libast/i386/include/ast/mnt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/modecanon.h b/usr/src/lib/libast/i386/include/ast/modecanon.h index 3357d3ec75..3fa425af8f 100644 --- a/usr/src/lib/libast/i386/include/ast/modecanon.h +++ b/usr/src/lib/libast/i386/include/ast/modecanon.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/modex.h b/usr/src/lib/libast/i386/include/ast/modex.h index 1f00578a00..4b73e19ffe 100644 --- a/usr/src/lib/libast/i386/include/ast/modex.h +++ b/usr/src/lib/libast/i386/include/ast/modex.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/namval.h b/usr/src/lib/libast/i386/include/ast/namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/i386/include/ast/namval.h +++ b/usr/src/lib/libast/i386/include/ast/namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/nl_types.h b/usr/src/lib/libast/i386/include/ast/nl_types.h index e71605ff40..581cc13a81 100644 --- a/usr/src/lib/libast/i386/include/ast/nl_types.h +++ b/usr/src/lib/libast/i386/include/ast/nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/option.h b/usr/src/lib/libast/i386/include/ast/option.h index 39207fcc4c..5439707f8e 100644 --- a/usr/src/lib/libast/i386/include/ast/option.h +++ b/usr/src/lib/libast/i386/include/ast/option.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/preroot.h b/usr/src/lib/libast/i386/include/ast/preroot.h index 4e31cf12bf..c46fdcbbc8 100644 --- a/usr/src/lib/libast/i386/include/ast/preroot.h +++ b/usr/src/lib/libast/i386/include/ast/preroot.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/include/ast/proc.h b/usr/src/lib/libast/i386/include/ast/proc.h index 219f0d5884..4161e1a385 100644 --- a/usr/src/lib/libast/i386/include/ast/proc.h +++ b/usr/src/lib/libast/i386/include/ast/proc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/re_comp.h b/usr/src/lib/libast/i386/include/ast/re_comp.h index e8d425d1c0..ec1d512e40 100644 --- a/usr/src/lib/libast/i386/include/ast/re_comp.h +++ b/usr/src/lib/libast/i386/include/ast/re_comp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/recfmt.h b/usr/src/lib/libast/i386/include/ast/recfmt.h index acdb18df36..fcd56de020 100644 --- a/usr/src/lib/libast/i386/include/ast/recfmt.h +++ b/usr/src/lib/libast/i386/include/ast/recfmt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/regex.h b/usr/src/lib/libast/i386/include/ast/regex.h index 1fcd12d298..9b7299c814 100644 --- a/usr/src/lib/libast/i386/include/ast/regex.h +++ b/usr/src/lib/libast/i386/include/ast/regex.h @@ -47,10 +47,11 @@ #define REG_MULTIREF 0x00100000 /* multiple digit backrefs */ #define REG_MUSTDELIM 0x08000000 /* all delimiters required */ #define REG_DELIMITED 0x10000000 /* pattern[0] is delimiter */ -#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ +#define REG_CLASS_ESCAPE 0x80000000 /* \ escapes in [...] */ #define REG_SHELL_DOT 0x00200000 /* explicit leading . match */ #define REG_SHELL_ESCAPED 0x00400000 /* \ not special */ +#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ #define REG_SHELL_PATH 0x00800000 /* explicit / match */ #define REG_REGEXP 0x40000000 /* <regexp.h> compatibility */ @@ -98,7 +99,7 @@ #define REG_BADBR 10 /* invalid {...} digits */ #define REG_ERANGE 11 /* invalid [...] range endpoint */ #define REG_ESPACE 12 /* out of space */ -#define REG_BADRPT 13 /* unary op not preceeded by re */ +#define REG_BADRPT 13 /* unary op not preceded by re */ #define REG_ENULL 14 /* empty subexpr in pattern */ #define REG_ECOUNT 15 /* re component count overflow */ #define REG_BADESC 16 /* invalid \char escape */ @@ -111,7 +112,7 @@ struct regex_s; typedef struct regex_s regex_t; struct regdisc_s; typedef struct regdisc_s regdisc_t; typedef int (*regclass_t) __PROTO__((int)); -typedef int32_t regflags_t; +typedef uint32_t regflags_t; typedef int regoff_t; typedef int (*regerror_t) __PROTO__((const regex_t*, regdisc_t*, int, ...)); typedef __V_* (*regcomp_t) __PROTO__((const regex_t*, const char*, size_t, regdisc_t*)); diff --git a/usr/src/lib/libast/i386/include/ast/regexp.h b/usr/src/lib/libast/i386/include/ast/regexp.h index 89e0d3a875..ea2df629b5 100644 --- a/usr/src/lib/libast/i386/include/ast/regexp.h +++ b/usr/src/lib/libast/i386/include/ast/regexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/sfdisc.h b/usr/src/lib/libast/i386/include/ast/sfdisc.h index ce1ed6e052..bc6e00b335 100644 --- a/usr/src/lib/libast/i386/include/ast/sfdisc.h +++ b/usr/src/lib/libast/i386/include/ast/sfdisc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/sfio.h b/usr/src/lib/libast/i386/include/ast/sfio.h index 3506f5c955..da6ebfd9f2 100644 --- a/usr/src/lib/libast/i386/include/ast/sfio.h +++ b/usr/src/lib/libast/i386/include/ast/sfio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/sfio_s.h b/usr/src/lib/libast/i386/include/ast/sfio_s.h index 46b2348b9c..7f7483cc79 100644 --- a/usr/src/lib/libast/i386/include/ast/sfio_s.h +++ b/usr/src/lib/libast/i386/include/ast/sfio_s.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/sfio_t.h b/usr/src/lib/libast/i386/include/ast/sfio_t.h index 5c819865c8..4240316aef 100644 --- a/usr/src/lib/libast/i386/include/ast/sfio_t.h +++ b/usr/src/lib/libast/i386/include/ast/sfio_t.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/shcmd.h b/usr/src/lib/libast/i386/include/ast/shcmd.h index f59834ad80..2b7a3ce486 100644 --- a/usr/src/lib/libast/i386/include/ast/shcmd.h +++ b/usr/src/lib/libast/i386/include/ast/shcmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/sig.h b/usr/src/lib/libast/i386/include/ast/sig.h index e5da3b46c4..6bb667b2bf 100644 --- a/usr/src/lib/libast/i386/include/ast/sig.h +++ b/usr/src/lib/libast/i386/include/ast/sig.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -139,11 +139,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/i386/include/ast/stack.h b/usr/src/lib/libast/i386/include/ast/stack.h index 64bda47ad0..8a7f954797 100644 --- a/usr/src/lib/libast/i386/include/ast/stack.h +++ b/usr/src/lib/libast/i386/include/ast/stack.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/stak.h b/usr/src/lib/libast/i386/include/ast/stak.h index 3e867b0b7d..4396bdf02b 100644 --- a/usr/src/lib/libast/i386/include/ast/stak.h +++ b/usr/src/lib/libast/i386/include/ast/stak.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/stdio.h b/usr/src/lib/libast/i386/include/ast/stdio.h index 2053ba8b27..0d9876a250 100644 --- a/usr/src/lib/libast/i386/include/ast/stdio.h +++ b/usr/src/lib/libast/i386/include/ast/stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/stk.h b/usr/src/lib/libast/i386/include/ast/stk.h index ae2684f36d..7a226b0e98 100644 --- a/usr/src/lib/libast/i386/include/ast/stk.h +++ b/usr/src/lib/libast/i386/include/ast/stk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/swap.h b/usr/src/lib/libast/i386/include/ast/swap.h index 96c2f79d74..d214ece1e6 100644 --- a/usr/src/lib/libast/i386/include/ast/swap.h +++ b/usr/src/lib/libast/i386/include/ast/swap.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/tar.h b/usr/src/lib/libast/i386/include/ast/tar.h index 04f5586481..8e8af49bb2 100644 --- a/usr/src/lib/libast/i386/include/ast/tar.h +++ b/usr/src/lib/libast/i386/include/ast/tar.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/times.h b/usr/src/lib/libast/i386/include/ast/times.h index db0725a35c..1dbd3ee60a 100644 --- a/usr/src/lib/libast/i386/include/ast/times.h +++ b/usr/src/lib/libast/i386/include/ast/times.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/tm.h b/usr/src/lib/libast/i386/include/ast/tm.h index 154615088f..d8eb357c20 100644 --- a/usr/src/lib/libast/i386/include/ast/tm.h +++ b/usr/src/lib/libast/i386/include/ast/tm.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/tmx.h b/usr/src/lib/libast/i386/include/ast/tmx.h index 9628931c54..1839aaaa58 100644 --- a/usr/src/lib/libast/i386/include/ast/tmx.h +++ b/usr/src/lib/libast/i386/include/ast/tmx.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/tok.h b/usr/src/lib/libast/i386/include/ast/tok.h index 8850458e9a..5e07aa302d 100644 --- a/usr/src/lib/libast/i386/include/ast/tok.h +++ b/usr/src/lib/libast/i386/include/ast/tok.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/tv.h b/usr/src/lib/libast/i386/include/ast/tv.h index 13839caf62..5496075cb0 100644 --- a/usr/src/lib/libast/i386/include/ast/tv.h +++ b/usr/src/lib/libast/i386/include/ast/tv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/include/ast/usage.h b/usr/src/lib/libast/i386/include/ast/usage.h index e2bea60f9c..19d2b0fc14 100644 --- a/usr/src/lib/libast/i386/include/ast/usage.h +++ b/usr/src/lib/libast/i386/include/ast/usage.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/vdb.h b/usr/src/lib/libast/i386/include/ast/vdb.h index f800446d5f..a44d0c6132 100644 --- a/usr/src/lib/libast/i386/include/ast/vdb.h +++ b/usr/src/lib/libast/i386/include/ast/vdb.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/vecargs.h b/usr/src/lib/libast/i386/include/ast/vecargs.h index 8b567d5d5d..900e13d8b0 100644 --- a/usr/src/lib/libast/i386/include/ast/vecargs.h +++ b/usr/src/lib/libast/i386/include/ast/vecargs.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/vmalloc.h b/usr/src/lib/libast/i386/include/ast/vmalloc.h index 0115078cf5..f13cc58879 100644 --- a/usr/src/lib/libast/i386/include/ast/vmalloc.h +++ b/usr/src/lib/libast/i386/include/ast/vmalloc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ -#define VMALLOC_VERSION 20070911L +#define VMALLOC_VERSION 20100101L #if _PACKAGE_ast #include <ast_std.h> @@ -39,6 +39,7 @@ typedef struct _vmalloc_s Vmalloc_t; typedef struct _vmstat_s Vmstat_t; typedef struct _vmdisc_s Vmdisc_t; typedef struct _vmethod_s Vmethod_t; +typedef struct _vmdata_s Vmdata_t; typedef Void_t* (*Vmemory_f)_ARG_((Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*)); typedef int (*Vmexcept_f)_ARG_((Vmalloc_t*, int, Void_t*, Vmdisc_t*)); @@ -75,6 +76,9 @@ struct _vmalloc_s char* file; /* file name */ int line; /* line number */ Void_t* func; /* calling function */ + Vmdisc_t* disc; /* discipline to get space */ + Vmdata_t* data; /* the real region data */ + Vmalloc_t* next; /* linked list of regions */ #ifdef _VM_PRIVATE_ _VM_PRIVATE_ #endif @@ -172,7 +176,8 @@ extern int vmtrbusy _ARG_((Vmalloc_t*)); extern int vmstat _ARG_((Vmalloc_t*, Vmstat_t*)); extern int vmwalk _ARG_((Vmalloc_t*, - int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*))); + int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*,Void_t*), + Void_t*)); extern char* vmstrdup _ARG_((Vmalloc_t*, const char*)); #if !defined(_BLD_vmalloc) && !defined(_AST_STD_H) && \ @@ -311,5 +316,6 @@ _END_EXTERNS_ (VM_RSMOVE) ) #define vmnewof(v,p,t,n,x) (t*)vmresize((v), (p), sizeof(t)*(n)+(x), \ (VM_RSMOVE|VM_RSCOPY|VM_RSZERO) ) +#define vmdata(vm) ((Void_t*)(_VM_(vm)->data)) #endif /* _VMALLOC_H */ diff --git a/usr/src/lib/libast/i386/include/ast/wait.h b/usr/src/lib/libast/i386/include/ast/wait.h index bb690a2ee4..c4e3b8f2a0 100644 --- a/usr/src/lib/libast/i386/include/ast/wait.h +++ b/usr/src/lib/libast/i386/include/ast/wait.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/wchar.h b/usr/src/lib/libast/i386/include/ast/wchar.h index 5bd6aa3ba8..43c5ef1e98 100644 --- a/usr/src/lib/libast/i386/include/ast/wchar.h +++ b/usr/src/lib/libast/i386/include/ast/wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/include/ast/wordexp.h b/usr/src/lib/libast/i386/include/ast/wordexp.h index 0ae7e93e99..af3169962b 100644 --- a/usr/src/lib/libast/i386/include/ast/wordexp.h +++ b/usr/src/lib/libast/i386/include/ast/wordexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/align b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/align index 3750e7e44b..fe2bdd2795 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/align +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/align @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/botch b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/botch index ed69c2e4b0..74b8267f7a 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/botch +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/botch @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ccode b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ccode index 3d39dd3273..6872a9fb50 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ccode +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ccode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/common b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/common index 874c5bcc98..27dc6b2ddf 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/common +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/common @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/dirent b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/dirent index 2edcceeed2..b44b2b3890 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/dirent +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/dirent @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/eaccess b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/eaccess index 3559cc8008..eabeb5c607 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/eaccess +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/eaccess @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/eaccess by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/eaccess by iffe version 2009-12-04 : : */ #ifndef _def_eaccess_ast #define _def_eaccess_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/errno b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/errno index 69d3fbeace..a8d761409d 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/errno +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/errno @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/errno by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/errno by iffe version 2009-12-04 : : */ #ifndef _def_errno_ast #define _def_errno_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fcntl b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fcntl index 8baac5a21e..a69d3aaeb6 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fcntl +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fcntl @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/float b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/float index 4bf68ca64c..16c8246ded 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/float +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/float @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fs b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fs index 924bf7dae5..5aad327b05 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fs +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/fs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -79,15 +79,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/hack b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/hack index 07686b31dc..0b16242eaf 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/hack +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/hack @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/hack by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/hack by iffe version 2009-12-04 : : */ #ifndef _def_hack_ast #define _def_hack_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/iconv b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/iconv index a1540a7138..d1d76b26c2 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/iconv +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/iconv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/isoc99 b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/isoc99 index 8524187db3..2a1f5f510a 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/isoc99 +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/isoc99 @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/isoc99 by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/isoc99 by iffe version 2009-12-04 : : */ #ifndef _def_isoc99_ast #define _def_isoc99_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/lib b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/lib index 517b907aca..b0e8a8d8cf 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/lib +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/lib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -124,6 +124,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -155,7 +158,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/libpath b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/libpath index 790df03b16..27eed5297d 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/libpath +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/libpath @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/libpath.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/libpath.sh by iffe version 2009-12-04 : : */ #ifndef _def_libpath_ast #define _def_libpath_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/limits b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/limits index 2453905aca..9638e84398 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/limits +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/limits @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/map b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/map index b9088a2c91..a4ba960bec 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/map +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/map @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mmap b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mmap index f4d39abcf5..78c444078c 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mmap +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mmap @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mode b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mode index 31ba6eef6d..0aac69f173 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mode +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/mode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ndbm b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ndbm index a145e764da..a699c646cd 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ndbm +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/ndbm @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/nl_types b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/nl_types index d439a1c608..7202d7a419 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/nl_types +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/nl_types @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/omitted b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/omitted index 26d4e7ab65..7ba887d617 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/omitted +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/omitted @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/omitted by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/omitted by iffe version 2009-12-04 : : */ #ifndef _def_omitted_ast #define _def_omitted_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/options b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/options new file mode 100644 index 0000000000..0d274e1f80 --- /dev/null +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/options @@ -0,0 +1,5 @@ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/options by iffe version 2009-12-04 : : */ +#ifndef _def_options_ast +#define _def_options_ast 1 +#define _sys_types 1 /* #include <sys/types.h> ok */ +#endif diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/param b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/param index 2427aa29bf..f8f80fe873 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/param +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/param @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/preroot b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/preroot index 61ff583a6f..aa448b50fb 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/preroot +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/preroot @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/prog b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/prog index a8d762af33..c8c170822d 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/prog +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/prog @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/prog by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/prog by iffe version 2009-12-04 : : */ #ifndef _def_prog_ast #define _def_prog_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfinit b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfinit index 2b3903fc0d..5e84018b57 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfinit +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfinit @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sfinit.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sfinit.c by iffe version 2009-12-04 : : */ #ifndef _def_sfinit_ast #define _def_sfinit_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfio b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfio index b75267e31b..7f2bb58493 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfio +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sfio @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sfio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sfio by iffe version 2009-12-04 : : */ #ifndef _def_sfio_ast #define _def_sfio_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sig b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sig index b926f3799c..9504537d08 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sig +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sig @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/siglist b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/siglist index 6fcb000cb2..271e57ef64 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/siglist +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/siglist @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/siglist by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/siglist by iffe version 2009-12-04 : : */ #ifndef _def_siglist_ast #define _def_siglist_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/signal b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/signal index f3ba78b6ca..613664d33b 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/signal +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/signal @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/signal.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/signal.c by iffe version 2009-12-04 : : */ #ifndef _def_signal_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/standards b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/standards index 5f95685de4..c231e269ee 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/standards +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/standards @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/stdio b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/stdio index 3e7776ae7a..a7530763bd 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/stdio +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/stdio @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sys b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sys index 0307c7da37..79554b0821 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sys +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/sys @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/time b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/time index bac9e4aeb4..24059bcd77 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/time +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/time @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmlib b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmlib index fa1f078f2f..c7672ac288 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmlib +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmlib @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tmlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tmlib by iffe version 2009-12-04 : : */ #ifndef _def_tmlib_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmx b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmx index 076e1c3594..55bc45db88 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmx +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tmx @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tty b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tty index 8ade1d6d9e..88985d2ab6 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tty +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tty @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tv b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tv index b7e1c55981..0865fd4c4f 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tv +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tvlib b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tvlib index e379433f61..e92d465929 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tvlib +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/tvlib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tvlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tvlib by iffe version 2009-12-04 : : */ #ifndef _def_tvlib_ast #define _def_tvlib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -11,6 +11,7 @@ #define _lib_nanosleep 1 /* nanosleep() in default lib(s) */ #define _lib_usleep 1 /* usleep() in default lib(s) */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ +#define _lib_utimensat 1 /* complete utimensat implementation */ #define _sys_time 1 /* #include <sys/time.h> ok */ #define _lib_clock_gettime 1 /* execute{\ passed */ #define tmgettimeofday(p) gettimeofday(p,(struct timezone*)0) diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/uwin b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/uwin index a399a15c93..521f137e48 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/uwin +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/uwin @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/uwin by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/uwin by iffe version 2009-12-04 : : */ #ifndef _def_uwin_ast #define _def_uwin_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vfork b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vfork index f1848017d7..df49937dbb 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vfork +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vfork @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -64,4 +64,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vmalloc b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vmalloc index a142225766..c233a981dd 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vmalloc +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/vmalloc @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/vmalloc by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/vmalloc by iffe version 2009-12-04 : : */ #ifndef _def_vmalloc_ast #define _def_vmalloc_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wait b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wait index c3c160bf45..952ec382ee 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wait +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wait @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wchar b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wchar index ab4944ad8a..83865979fc 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wchar +++ b/usr/src/lib/libast/i386/src/lib/libast/FEATURE/wchar @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/align.h b/usr/src/lib/libast/i386/src/lib/libast/align.h index 3750e7e44b..fe2bdd2795 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/align.h +++ b/usr/src/lib/libast/i386/src/lib/libast/align.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_botch.h b/usr/src/lib/libast/i386/src/lib/libast/ast_botch.h index ed69c2e4b0..74b8267f7a 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_botch.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_botch.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_ccode.h b/usr/src/lib/libast/i386/src/lib/libast/ast_ccode.h index 3d39dd3273..6872a9fb50 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_ccode.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_ccode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_common.h b/usr/src/lib/libast/i386/src/lib/libast/ast_common.h index 4e2dd10b82..ac7149ee1a 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_common.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_common.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_dirent.h b/usr/src/lib/libast/i386/src/lib/libast/ast_dirent.h index 2edcceeed2..b44b2b3890 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_dirent.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_dirent.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_fcntl.h b/usr/src/lib/libast/i386/src/lib/libast/ast_fcntl.h index 8baac5a21e..a69d3aaeb6 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_fcntl.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_fcntl.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_float.h b/usr/src/lib/libast/i386/src/lib/libast/ast_float.h index 4bf68ca64c..16c8246ded 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_float.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_float.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_fs.h b/usr/src/lib/libast/i386/src/lib/libast/ast_fs.h index 924bf7dae5..5aad327b05 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_fs.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_fs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -79,15 +79,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_iconv.h b/usr/src/lib/libast/i386/src/lib/libast/ast_iconv.h index a1540a7138..d1d76b26c2 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_iconv.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_iconv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_lib.h b/usr/src/lib/libast/i386/src/lib/libast/ast_lib.h index 517b907aca..b0e8a8d8cf 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_lib.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_lib.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -124,6 +124,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -155,7 +158,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_limits.h b/usr/src/lib/libast/i386/src/lib/libast/ast_limits.h index 2453905aca..9638e84398 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_limits.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_limits.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_map.h b/usr/src/lib/libast/i386/src/lib/libast/ast_map.h index b9088a2c91..a4ba960bec 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_map.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_map.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_mmap.h b/usr/src/lib/libast/i386/src/lib/libast/ast_mmap.h index f4d39abcf5..78c444078c 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_mmap.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_mmap.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_mode.h b/usr/src/lib/libast/i386/src/lib/libast/ast_mode.h index 31ba6eef6d..0aac69f173 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_mode.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_mode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_namval.h b/usr/src/lib/libast/i386/src/lib/libast/ast_namval.h index f8f65ab2cb..49e777be1d 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_namval.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_namval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_ndbm.h b/usr/src/lib/libast/i386/src/lib/libast/ast_ndbm.h index a145e764da..a699c646cd 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_ndbm.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_ndbm.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_nl_types.h b/usr/src/lib/libast/i386/src/lib/libast/ast_nl_types.h index d439a1c608..7202d7a419 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_nl_types.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_nl_types.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_param.h b/usr/src/lib/libast/i386/src/lib/libast/ast_param.h index 2427aa29bf..f8f80fe873 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_param.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_param.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_standards.h b/usr/src/lib/libast/i386/src/lib/libast/ast_standards.h index 5f95685de4..c231e269ee 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_standards.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_standards.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_stdio.h b/usr/src/lib/libast/i386/src/lib/libast/ast_stdio.h index 3e7776ae7a..a7530763bd 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_stdio.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_stdio.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_sys.h b/usr/src/lib/libast/i386/src/lib/libast/ast_sys.h index 0307c7da37..79554b0821 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_sys.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_sys.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_time.h b/usr/src/lib/libast/i386/src/lib/libast/ast_time.h index bac9e4aeb4..24059bcd77 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_time.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_time.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_tty.h b/usr/src/lib/libast/i386/src/lib/libast/ast_tty.h index 8ade1d6d9e..88985d2ab6 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_tty.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_tty.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_vfork.h b/usr/src/lib/libast/i386/src/lib/libast/ast_vfork.h index f1848017d7..df49937dbb 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_vfork.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_vfork.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) @@ -64,4 +64,5 @@ #define _def_vfork_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ extern __MANGLE__ pid_t vfork __PROTO__((void)); +#pragma unknown_control_flow(vfork) #endif diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_wait.h b/usr/src/lib/libast/i386/src/lib/libast/ast_wait.h index c3c160bf45..952ec382ee 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_wait.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_wait.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/ast_wchar.h b/usr/src/lib/libast/i386/src/lib/libast/ast_wchar.h index ab4944ad8a..83865979fc 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/ast_wchar.h +++ b/usr/src/lib/libast/i386/src/lib/libast/ast_wchar.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/conftab.c b/usr/src/lib/libast/i386/src/lib/libast/conftab.c index 38e9c18c64..376d87d022 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/conftab.c +++ b/usr/src/lib/libast/i386/src/lib/libast/conftab.c @@ -10,7 +10,7 @@ #include "FEATURE/param" #include "conftab.h" -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/comp/conf.tab : : */ /* * prefix strings -- the first few are indexed by Conf_t.standard diff --git a/usr/src/lib/libast/i386/src/lib/libast/conftab.h b/usr/src/lib/libast/i386/src/lib/libast/conftab.h index b5e17192c3..3806d2c70d 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/conftab.h +++ b/usr/src/lib/libast/i386/src/lib/libast/conftab.h @@ -6,7 +6,7 @@ #endif #include <sys/systeminfo.h> -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/comp/conf.tab : : */ #if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus) #define const diff --git a/usr/src/lib/libast/i386/src/lib/libast/lc.h b/usr/src/lib/libast/i386/src/lib/libast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/lc.h +++ b/usr/src/lib/libast/i386/src/lib/libast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/preroot.h b/usr/src/lib/libast/i386/src/lib/libast/preroot.h index 61ff583a6f..aa448b50fb 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/preroot.h +++ b/usr/src/lib/libast/i386/src/lib/libast/preroot.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/i386/src/lib/libast/sig.h b/usr/src/lib/libast/i386/src/lib/libast/sig.h index b926f3799c..9504537d08 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/sig.h +++ b/usr/src/lib/libast/i386/src/lib/libast/sig.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/i386/src/lib/libast/tmx.h b/usr/src/lib/libast/i386/src/lib/libast/tmx.h index 076e1c3594..55bc45db88 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/tmx.h +++ b/usr/src/lib/libast/i386/src/lib/libast/tmx.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/i386/src/lib/libast/tv.h b/usr/src/lib/libast/i386/src/lib/libast/tv.h index b7e1c55981..0865fd4c4f 100644 --- a/usr/src/lib/libast/i386/src/lib/libast/tv.h +++ b/usr/src/lib/libast/i386/src/lib/libast/tv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/mapfile-vers b/usr/src/lib/libast/mapfile-vers index e1c3b35bb2..7917043319 100644 --- a/usr/src/lib/libast/mapfile-vers +++ b/usr/src/lib/libast/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -481,8 +480,6 @@ SUNWprivate_1.1 { lcinfo; lcmake; lcscan; - liberror; - libevent; magicclose; magiclist; magicload; diff --git a/usr/src/lib/libast/sparc/include/ast/align.h b/usr/src/lib/libast/sparc/include/ast/align.h index 6907841d79..a28e9b7ae3 100644 --- a/usr/src/lib/libast/sparc/include/ast/align.h +++ b/usr/src/lib/libast/sparc/include/ast/align.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast.h b/usr/src/lib/libast/sparc/include/ast/ast.h index f1dff0cf6a..5c0d5dcd30 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast.h +++ b/usr/src/lib/libast/sparc/include/ast/ast.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/ast_botch.h b/usr/src/lib/libast/sparc/include/ast/ast_botch.h index b9332f4905..1fd7e259fa 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_botch.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_botch.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_ccode.h b/usr/src/lib/libast/sparc/include/ast/ast_ccode.h index a62f64644b..e9b0989f40 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_ccode.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_ccode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_common.h b/usr/src/lib/libast/sparc/include/ast/ast_common.h index b73507418a..053f63fd0e 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_common.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_common.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_dir.h b/usr/src/lib/libast/sparc/include/ast/ast_dir.h index 8d801aa72c..c873ed3253 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_dir.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_dir.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/ast_dirent.h b/usr/src/lib/libast/sparc/include/ast/ast_dirent.h index 8953febca5..cf636547bc 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_dirent.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_fcntl.h b/usr/src/lib/libast/sparc/include/ast/ast_fcntl.h index 79cc353af2..89054d693d 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_fcntl.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_fcntl.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_float.h b/usr/src/lib/libast/sparc/include/ast/ast_float.h index 91ba8915aa..9daf7507af 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_float.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_float.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_fs.h b/usr/src/lib/libast/sparc/include/ast/ast_fs.h index 35237f0bb9..9aff8a5b64 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_fs.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_fs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -96,15 +96,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_getopt.h b/usr/src/lib/libast/sparc/include/ast/ast_getopt.h index 060c18a246..c86d826a72 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_getopt.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_getopt.h @@ -19,11 +19,7 @@ extern __MANGLE__ int optind; extern __MANGLE__ int optopt; extern __MANGLE__ char* optarg; -#ifndef NULL /* in case <stdlib.h> or <stdio.h> got here first */ - extern __MANGLE__ int getopt __PROTO__((int, char* const*, const char*)); extern __MANGLE__ int getsubopt __PROTO__((char**, char* const*, char**)); #endif - -#endif diff --git a/usr/src/lib/libast/sparc/include/ast/ast_iconv.h b/usr/src/lib/libast/sparc/include/ast/ast_iconv.h index df659ec3c9..96c4aa39d6 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_iconv.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_lib.h b/usr/src/lib/libast/sparc/include/ast/ast_lib.h index 1af9045750..46518ebc9d 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_lib.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_lib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -145,6 +145,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -176,7 +179,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_limits.h b/usr/src/lib/libast/sparc/include/ast/ast_limits.h index b311d668de..d6ad199375 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_limits.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_limits.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_map.h b/usr/src/lib/libast/sparc/include/ast/ast_map.h index ca6f1c1622..07c119c7a0 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_map.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_map.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_mmap.h b/usr/src/lib/libast/sparc/include/ast/ast_mmap.h index 835a61f69c..175445348e 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_mmap.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_mmap.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_mode.h b/usr/src/lib/libast/sparc/include/ast/ast_mode.h index 1e5fbbc62f..b4c78825fa 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_mode.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_mode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_namval.h b/usr/src/lib/libast/sparc/include/ast/ast_namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_namval.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/ast_ndbm.h b/usr/src/lib/libast/sparc/include/ast/ast_ndbm.h index 82a68ae1a5..d303afa8d4 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_ndbm.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_ndbm.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_nl_types.h b/usr/src/lib/libast/sparc/include/ast/ast_nl_types.h index 406e82b8b0..28f69c7212 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_nl_types.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_param.h b/usr/src/lib/libast/sparc/include/ast/ast_param.h index 4caf9ce185..b09325b155 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_param.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_param.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_standards.h b/usr/src/lib/libast/sparc/include/ast/ast_standards.h index ce15af2cf6..2be04b2a12 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_standards.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_standards.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_std.h b/usr/src/lib/libast/sparc/include/ast/ast_std.h index e734c74dbd..f98d1861b9 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_std.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_std.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -166,6 +166,8 @@ extern __MANGLE__ char* strerror __PROTO__((int)); #define AST_LC_COUNT 14 #define AST_LC_LANG 255 +#define AST_LC_internal 1 +#define AST_LC_setenv (1L<<27) #define AST_LC_find (1L<<28) #define AST_LC_debug (1L<<29) #define AST_LC_setlocale (1L<<30) @@ -258,8 +260,9 @@ typedef struct uint32_t env_serial; uint32_t mb_sync; + uint32_t version; - char pad[940]; + char pad[936]; } _Ast_info_t; @@ -346,7 +349,7 @@ extern __MANGLE__ int _ast_getpgrp __PROTO__((void)); /* * and finally, standard interfaces hijacked by ast - * _ATS_STD_I delays headers that require <ast_map.h> + * _AST_STD_I delays headers that require <ast_map.h> */ #include <ast_map.h> diff --git a/usr/src/lib/libast/sparc/include/ast/ast_stdio.h b/usr/src/lib/libast/sparc/include/ast/ast_stdio.h index cffbe94ad4..3d39d1a8a3 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_stdio.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_sys.h b/usr/src/lib/libast/sparc/include/ast/ast_sys.h index f3dccadae2..6c70a3a9a9 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_sys.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_sys.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_time.h b/usr/src/lib/libast/sparc/include/ast/ast_time.h index e768dd3b4f..ece6f26e66 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_time.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_time.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_tty.h b/usr/src/lib/libast/sparc/include/ast/ast_tty.h index 846dae59a5..f174dab6e7 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_tty.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_tty.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_version.h b/usr/src/lib/libast/sparc/include/ast/ast_version.h index af5756d02b..b3ba546e3a 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_version.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_version.h @@ -7,4 +7,4 @@ #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif -#define _AST_VERSION 20090202L +#define _AST_VERSION 20100102L diff --git a/usr/src/lib/libast/sparc/include/ast/ast_vfork.h b/usr/src/lib/libast/sparc/include/ast/ast_vfork.h index 452495056d..1585b13cc9 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_vfork.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_vfork.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_wait.h b/usr/src/lib/libast/sparc/include/ast/ast_wait.h index dddd375b1f..c02a19ccee 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_wait.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_wait.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/ast_wchar.h b/usr/src/lib/libast/sparc/include/ast/ast_wchar.h index b1f01c441a..0d7e2ee77d 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_wchar.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/ast_windows.h b/usr/src/lib/libast/sparc/include/ast/ast_windows.h index e02d2aaeb9..65590c17b4 100644 --- a/usr/src/lib/libast/sparc/include/ast/ast_windows.h +++ b/usr/src/lib/libast/sparc/include/ast/ast_windows.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/bytesex.h b/usr/src/lib/libast/sparc/include/ast/bytesex.h index e105fc5f58..1f78d13287 100644 --- a/usr/src/lib/libast/sparc/include/ast/bytesex.h +++ b/usr/src/lib/libast/sparc/include/ast/bytesex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/ccode.h b/usr/src/lib/libast/sparc/include/ast/ccode.h index a7a43aecbe..ae50c63b16 100644 --- a/usr/src/lib/libast/sparc/include/ast/ccode.h +++ b/usr/src/lib/libast/sparc/include/ast/ccode.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -43,7 +43,7 @@ #define _CHARCODE_H 1 -#include <ast.h> +#include <ast_common.h> #include <ast_ccode.h> typedef struct Ccmap_s diff --git a/usr/src/lib/libast/sparc/include/ast/cdt.h b/usr/src/lib/libast/sparc/include/ast/cdt.h index f2f0389296..1044207b76 100644 --- a/usr/src/lib/libast/sparc/include/ast/cdt.h +++ b/usr/src/lib/libast/sparc/include/ast/cdt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/debug.h b/usr/src/lib/libast/sparc/include/ast/debug.h index 8f0ec6a257..6dfee2254a 100644 --- a/usr/src/lib/libast/sparc/include/ast/debug.h +++ b/usr/src/lib/libast/sparc/include/ast/debug.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/dirent.h b/usr/src/lib/libast/sparc/include/ast/dirent.h index ea81d037a5..05e76cadae 100644 --- a/usr/src/lib/libast/sparc/include/ast/dirent.h +++ b/usr/src/lib/libast/sparc/include/ast/dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/dt.h b/usr/src/lib/libast/sparc/include/ast/dt.h index 6fcc20c42e..b6b356aee7 100644 --- a/usr/src/lib/libast/sparc/include/ast/dt.h +++ b/usr/src/lib/libast/sparc/include/ast/dt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/endian.h b/usr/src/lib/libast/sparc/include/ast/endian.h index 6ad7ddcaad..1c992dd490 100644 --- a/usr/src/lib/libast/sparc/include/ast/endian.h +++ b/usr/src/lib/libast/sparc/include/ast/endian.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/error.h b/usr/src/lib/libast/sparc/include/ast/error.h index 10d919a93a..c0e21dadd7 100644 --- a/usr/src/lib/libast/sparc/include/ast/error.h +++ b/usr/src/lib/libast/sparc/include/ast/error.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -64,7 +64,7 @@ #ifndef ERROR_translate #define ERROR_translating() (error_info.translate&&(ast.locale.set&(1<<AST_LC_MESSAGES))) -#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)l,(const char*)i,(const char*)d,(const char*)m):(m)) +#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)(l),(const char*)(i),(const char*)(d),(const char*)(m)):(char*)(m)) #endif #define ERROR_INFO 0 /* info message -- no err_id */ diff --git a/usr/src/lib/libast/sparc/include/ast/find.h b/usr/src/lib/libast/sparc/include/ast/find.h index 9ed4227d03..374858aced 100644 --- a/usr/src/lib/libast/sparc/include/ast/find.h +++ b/usr/src/lib/libast/sparc/include/ast/find.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/fnmatch.h b/usr/src/lib/libast/sparc/include/ast/fnmatch.h index ba357d9585..764009c3b7 100644 --- a/usr/src/lib/libast/sparc/include/ast/fnmatch.h +++ b/usr/src/lib/libast/sparc/include/ast/fnmatch.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/fnv.h b/usr/src/lib/libast/sparc/include/ast/fnv.h index f4caaee97f..2312a20118 100644 --- a/usr/src/lib/libast/sparc/include/ast/fnv.h +++ b/usr/src/lib/libast/sparc/include/ast/fnv.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/fs3d.h b/usr/src/lib/libast/sparc/include/ast/fs3d.h index 50795c98b0..bae8dde927 100644 --- a/usr/src/lib/libast/sparc/include/ast/fs3d.h +++ b/usr/src/lib/libast/sparc/include/ast/fs3d.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/fts.h b/usr/src/lib/libast/sparc/include/ast/fts.h index 09420af481..1bf72a114d 100644 --- a/usr/src/lib/libast/sparc/include/ast/fts.h +++ b/usr/src/lib/libast/sparc/include/ast/fts.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -41,7 +41,9 @@ #define _FTS_H -#include <ls.h> +#include <ast_std.h> +#include <ast_fs.h> +#include <ast_mode.h> /* * fts_open flags diff --git a/usr/src/lib/libast/sparc/include/ast/ftw.h b/usr/src/lib/libast/sparc/include/ast/ftw.h index 49040cf863..68feb09bb3 100644 --- a/usr/src/lib/libast/sparc/include/ast/ftw.h +++ b/usr/src/lib/libast/sparc/include/ast/ftw.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/ftwalk.h b/usr/src/lib/libast/sparc/include/ast/ftwalk.h index 29e1693959..673b1c2824 100644 --- a/usr/src/lib/libast/sparc/include/ast/ftwalk.h +++ b/usr/src/lib/libast/sparc/include/ast/ftwalk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/getopt.h b/usr/src/lib/libast/sparc/include/ast/getopt.h index 4ad28bbb01..c0679a7e53 100644 --- a/usr/src/lib/libast/sparc/include/ast/getopt.h +++ b/usr/src/lib/libast/sparc/include/ast/getopt.h @@ -1,17 +1,42 @@ /* : : generated by proto : : */ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1985-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* Phong Vo <kpv@research.att.com> * +* * +***********************************************************************/ + +/* + * gnu getopt interface + */ +#ifndef _GETOPT_H #if !defined(__PROTO__) #include <prototyped.h> #endif #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif + #ifdef _AST_STD_I #define _GETOPT_H -1 -#endif - -#ifndef _GETOPT_H +#else #define _GETOPT_H 1 #include <ast_getopt.h> @@ -32,3 +57,4 @@ extern __MANGLE__ int getopt_long __PROTO__((int, char* const*, const char*, con extern __MANGLE__ int getopt_long_only __PROTO__((int, char* const*, const char*, const struct option*, int*)); #endif +#endif diff --git a/usr/src/lib/libast/sparc/include/ast/glob.h b/usr/src/lib/libast/sparc/include/ast/glob.h index 93e202a5f9..e2708229c7 100644 --- a/usr/src/lib/libast/sparc/include/ast/glob.h +++ b/usr/src/lib/libast/sparc/include/ast/glob.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/hash.h b/usr/src/lib/libast/sparc/include/ast/hash.h index a524737ccc..0023ea06f5 100644 --- a/usr/src/lib/libast/sparc/include/ast/hash.h +++ b/usr/src/lib/libast/sparc/include/ast/hash.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/hashkey.h b/usr/src/lib/libast/sparc/include/ast/hashkey.h index 525434e369..84be9113a1 100644 --- a/usr/src/lib/libast/sparc/include/ast/hashkey.h +++ b/usr/src/lib/libast/sparc/include/ast/hashkey.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/hashpart.h b/usr/src/lib/libast/sparc/include/ast/hashpart.h index cfe3666777..5d33aac61d 100644 --- a/usr/src/lib/libast/sparc/include/ast/hashpart.h +++ b/usr/src/lib/libast/sparc/include/ast/hashpart.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/iconv.h b/usr/src/lib/libast/sparc/include/ast/iconv.h index 5b02759721..e65540c075 100644 --- a/usr/src/lib/libast/sparc/include/ast/iconv.h +++ b/usr/src/lib/libast/sparc/include/ast/iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/lc.h b/usr/src/lib/libast/sparc/include/ast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/sparc/include/ast/lc.h +++ b/usr/src/lib/libast/sparc/include/ast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/sparc/include/ast/ls.h b/usr/src/lib/libast/sparc/include/ast/ls.h index 70a8dc88ba..a8a5fcb0e0 100644 --- a/usr/src/lib/libast/sparc/include/ast/ls.h +++ b/usr/src/lib/libast/sparc/include/ast/ls.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/magic.h b/usr/src/lib/libast/sparc/include/ast/magic.h index 53d632c721..8683016e80 100644 --- a/usr/src/lib/libast/sparc/include/ast/magic.h +++ b/usr/src/lib/libast/sparc/include/ast/magic.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/magicid.h b/usr/src/lib/libast/sparc/include/ast/magicid.h index e31c80f288..1dca0c1e42 100644 --- a/usr/src/lib/libast/sparc/include/ast/magicid.h +++ b/usr/src/lib/libast/sparc/include/ast/magicid.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/mc.h b/usr/src/lib/libast/sparc/include/ast/mc.h index 75b4308360..b84df7239e 100644 --- a/usr/src/lib/libast/sparc/include/ast/mc.h +++ b/usr/src/lib/libast/sparc/include/ast/mc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/mime.h b/usr/src/lib/libast/sparc/include/ast/mime.h index 6d662d29e5..5943b58eaa 100644 --- a/usr/src/lib/libast/sparc/include/ast/mime.h +++ b/usr/src/lib/libast/sparc/include/ast/mime.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/mnt.h b/usr/src/lib/libast/sparc/include/ast/mnt.h index 62815d19e7..8bf8c12814 100644 --- a/usr/src/lib/libast/sparc/include/ast/mnt.h +++ b/usr/src/lib/libast/sparc/include/ast/mnt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/modecanon.h b/usr/src/lib/libast/sparc/include/ast/modecanon.h index 3357d3ec75..3fa425af8f 100644 --- a/usr/src/lib/libast/sparc/include/ast/modecanon.h +++ b/usr/src/lib/libast/sparc/include/ast/modecanon.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/modex.h b/usr/src/lib/libast/sparc/include/ast/modex.h index 1f00578a00..4b73e19ffe 100644 --- a/usr/src/lib/libast/sparc/include/ast/modex.h +++ b/usr/src/lib/libast/sparc/include/ast/modex.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/namval.h b/usr/src/lib/libast/sparc/include/ast/namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/sparc/include/ast/namval.h +++ b/usr/src/lib/libast/sparc/include/ast/namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/nl_types.h b/usr/src/lib/libast/sparc/include/ast/nl_types.h index e71605ff40..581cc13a81 100644 --- a/usr/src/lib/libast/sparc/include/ast/nl_types.h +++ b/usr/src/lib/libast/sparc/include/ast/nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/option.h b/usr/src/lib/libast/sparc/include/ast/option.h index 39207fcc4c..5439707f8e 100644 --- a/usr/src/lib/libast/sparc/include/ast/option.h +++ b/usr/src/lib/libast/sparc/include/ast/option.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/preroot.h b/usr/src/lib/libast/sparc/include/ast/preroot.h index 40df78ea73..309ee416bd 100644 --- a/usr/src/lib/libast/sparc/include/ast/preroot.h +++ b/usr/src/lib/libast/sparc/include/ast/preroot.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/include/ast/proc.h b/usr/src/lib/libast/sparc/include/ast/proc.h index 219f0d5884..4161e1a385 100644 --- a/usr/src/lib/libast/sparc/include/ast/proc.h +++ b/usr/src/lib/libast/sparc/include/ast/proc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/re_comp.h b/usr/src/lib/libast/sparc/include/ast/re_comp.h index e8d425d1c0..ec1d512e40 100644 --- a/usr/src/lib/libast/sparc/include/ast/re_comp.h +++ b/usr/src/lib/libast/sparc/include/ast/re_comp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/recfmt.h b/usr/src/lib/libast/sparc/include/ast/recfmt.h index acdb18df36..fcd56de020 100644 --- a/usr/src/lib/libast/sparc/include/ast/recfmt.h +++ b/usr/src/lib/libast/sparc/include/ast/recfmt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/regex.h b/usr/src/lib/libast/sparc/include/ast/regex.h index 1fcd12d298..9b7299c814 100644 --- a/usr/src/lib/libast/sparc/include/ast/regex.h +++ b/usr/src/lib/libast/sparc/include/ast/regex.h @@ -47,10 +47,11 @@ #define REG_MULTIREF 0x00100000 /* multiple digit backrefs */ #define REG_MUSTDELIM 0x08000000 /* all delimiters required */ #define REG_DELIMITED 0x10000000 /* pattern[0] is delimiter */ -#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ +#define REG_CLASS_ESCAPE 0x80000000 /* \ escapes in [...] */ #define REG_SHELL_DOT 0x00200000 /* explicit leading . match */ #define REG_SHELL_ESCAPED 0x00400000 /* \ not special */ +#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ #define REG_SHELL_PATH 0x00800000 /* explicit / match */ #define REG_REGEXP 0x40000000 /* <regexp.h> compatibility */ @@ -98,7 +99,7 @@ #define REG_BADBR 10 /* invalid {...} digits */ #define REG_ERANGE 11 /* invalid [...] range endpoint */ #define REG_ESPACE 12 /* out of space */ -#define REG_BADRPT 13 /* unary op not preceeded by re */ +#define REG_BADRPT 13 /* unary op not preceded by re */ #define REG_ENULL 14 /* empty subexpr in pattern */ #define REG_ECOUNT 15 /* re component count overflow */ #define REG_BADESC 16 /* invalid \char escape */ @@ -111,7 +112,7 @@ struct regex_s; typedef struct regex_s regex_t; struct regdisc_s; typedef struct regdisc_s regdisc_t; typedef int (*regclass_t) __PROTO__((int)); -typedef int32_t regflags_t; +typedef uint32_t regflags_t; typedef int regoff_t; typedef int (*regerror_t) __PROTO__((const regex_t*, regdisc_t*, int, ...)); typedef __V_* (*regcomp_t) __PROTO__((const regex_t*, const char*, size_t, regdisc_t*)); diff --git a/usr/src/lib/libast/sparc/include/ast/regexp.h b/usr/src/lib/libast/sparc/include/ast/regexp.h index 89e0d3a875..ea2df629b5 100644 --- a/usr/src/lib/libast/sparc/include/ast/regexp.h +++ b/usr/src/lib/libast/sparc/include/ast/regexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/sfdisc.h b/usr/src/lib/libast/sparc/include/ast/sfdisc.h index ce1ed6e052..bc6e00b335 100644 --- a/usr/src/lib/libast/sparc/include/ast/sfdisc.h +++ b/usr/src/lib/libast/sparc/include/ast/sfdisc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/sfio.h b/usr/src/lib/libast/sparc/include/ast/sfio.h index 3506f5c955..da6ebfd9f2 100644 --- a/usr/src/lib/libast/sparc/include/ast/sfio.h +++ b/usr/src/lib/libast/sparc/include/ast/sfio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/sfio_s.h b/usr/src/lib/libast/sparc/include/ast/sfio_s.h index 46b2348b9c..7f7483cc79 100644 --- a/usr/src/lib/libast/sparc/include/ast/sfio_s.h +++ b/usr/src/lib/libast/sparc/include/ast/sfio_s.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/sfio_t.h b/usr/src/lib/libast/sparc/include/ast/sfio_t.h index 5c819865c8..4240316aef 100644 --- a/usr/src/lib/libast/sparc/include/ast/sfio_t.h +++ b/usr/src/lib/libast/sparc/include/ast/sfio_t.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/shcmd.h b/usr/src/lib/libast/sparc/include/ast/shcmd.h index f59834ad80..2b7a3ce486 100644 --- a/usr/src/lib/libast/sparc/include/ast/shcmd.h +++ b/usr/src/lib/libast/sparc/include/ast/shcmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/sig.h b/usr/src/lib/libast/sparc/include/ast/sig.h index aebf3eb6df..31d2be6dfc 100644 --- a/usr/src/lib/libast/sparc/include/ast/sig.h +++ b/usr/src/lib/libast/sparc/include/ast/sig.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -139,11 +139,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparc/include/ast/stack.h b/usr/src/lib/libast/sparc/include/ast/stack.h index 64bda47ad0..8a7f954797 100644 --- a/usr/src/lib/libast/sparc/include/ast/stack.h +++ b/usr/src/lib/libast/sparc/include/ast/stack.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/stak.h b/usr/src/lib/libast/sparc/include/ast/stak.h index 3e867b0b7d..4396bdf02b 100644 --- a/usr/src/lib/libast/sparc/include/ast/stak.h +++ b/usr/src/lib/libast/sparc/include/ast/stak.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/stdio.h b/usr/src/lib/libast/sparc/include/ast/stdio.h index 2053ba8b27..0d9876a250 100644 --- a/usr/src/lib/libast/sparc/include/ast/stdio.h +++ b/usr/src/lib/libast/sparc/include/ast/stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/stk.h b/usr/src/lib/libast/sparc/include/ast/stk.h index ae2684f36d..7a226b0e98 100644 --- a/usr/src/lib/libast/sparc/include/ast/stk.h +++ b/usr/src/lib/libast/sparc/include/ast/stk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/swap.h b/usr/src/lib/libast/sparc/include/ast/swap.h index 96c2f79d74..d214ece1e6 100644 --- a/usr/src/lib/libast/sparc/include/ast/swap.h +++ b/usr/src/lib/libast/sparc/include/ast/swap.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/tar.h b/usr/src/lib/libast/sparc/include/ast/tar.h index 04f5586481..8e8af49bb2 100644 --- a/usr/src/lib/libast/sparc/include/ast/tar.h +++ b/usr/src/lib/libast/sparc/include/ast/tar.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/times.h b/usr/src/lib/libast/sparc/include/ast/times.h index db0725a35c..1dbd3ee60a 100644 --- a/usr/src/lib/libast/sparc/include/ast/times.h +++ b/usr/src/lib/libast/sparc/include/ast/times.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/tm.h b/usr/src/lib/libast/sparc/include/ast/tm.h index 154615088f..d8eb357c20 100644 --- a/usr/src/lib/libast/sparc/include/ast/tm.h +++ b/usr/src/lib/libast/sparc/include/ast/tm.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/tmx.h b/usr/src/lib/libast/sparc/include/ast/tmx.h index a911d9b697..9287945351 100644 --- a/usr/src/lib/libast/sparc/include/ast/tmx.h +++ b/usr/src/lib/libast/sparc/include/ast/tmx.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/tok.h b/usr/src/lib/libast/sparc/include/ast/tok.h index 8850458e9a..5e07aa302d 100644 --- a/usr/src/lib/libast/sparc/include/ast/tok.h +++ b/usr/src/lib/libast/sparc/include/ast/tok.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/tv.h b/usr/src/lib/libast/sparc/include/ast/tv.h index e18f74dc3c..6ed915f2b1 100644 --- a/usr/src/lib/libast/sparc/include/ast/tv.h +++ b/usr/src/lib/libast/sparc/include/ast/tv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/include/ast/usage.h b/usr/src/lib/libast/sparc/include/ast/usage.h index e2bea60f9c..19d2b0fc14 100644 --- a/usr/src/lib/libast/sparc/include/ast/usage.h +++ b/usr/src/lib/libast/sparc/include/ast/usage.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/vdb.h b/usr/src/lib/libast/sparc/include/ast/vdb.h index f800446d5f..a44d0c6132 100644 --- a/usr/src/lib/libast/sparc/include/ast/vdb.h +++ b/usr/src/lib/libast/sparc/include/ast/vdb.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/vecargs.h b/usr/src/lib/libast/sparc/include/ast/vecargs.h index 8b567d5d5d..900e13d8b0 100644 --- a/usr/src/lib/libast/sparc/include/ast/vecargs.h +++ b/usr/src/lib/libast/sparc/include/ast/vecargs.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/vmalloc.h b/usr/src/lib/libast/sparc/include/ast/vmalloc.h index 0115078cf5..f13cc58879 100644 --- a/usr/src/lib/libast/sparc/include/ast/vmalloc.h +++ b/usr/src/lib/libast/sparc/include/ast/vmalloc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ -#define VMALLOC_VERSION 20070911L +#define VMALLOC_VERSION 20100101L #if _PACKAGE_ast #include <ast_std.h> @@ -39,6 +39,7 @@ typedef struct _vmalloc_s Vmalloc_t; typedef struct _vmstat_s Vmstat_t; typedef struct _vmdisc_s Vmdisc_t; typedef struct _vmethod_s Vmethod_t; +typedef struct _vmdata_s Vmdata_t; typedef Void_t* (*Vmemory_f)_ARG_((Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*)); typedef int (*Vmexcept_f)_ARG_((Vmalloc_t*, int, Void_t*, Vmdisc_t*)); @@ -75,6 +76,9 @@ struct _vmalloc_s char* file; /* file name */ int line; /* line number */ Void_t* func; /* calling function */ + Vmdisc_t* disc; /* discipline to get space */ + Vmdata_t* data; /* the real region data */ + Vmalloc_t* next; /* linked list of regions */ #ifdef _VM_PRIVATE_ _VM_PRIVATE_ #endif @@ -172,7 +176,8 @@ extern int vmtrbusy _ARG_((Vmalloc_t*)); extern int vmstat _ARG_((Vmalloc_t*, Vmstat_t*)); extern int vmwalk _ARG_((Vmalloc_t*, - int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*))); + int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*,Void_t*), + Void_t*)); extern char* vmstrdup _ARG_((Vmalloc_t*, const char*)); #if !defined(_BLD_vmalloc) && !defined(_AST_STD_H) && \ @@ -311,5 +316,6 @@ _END_EXTERNS_ (VM_RSMOVE) ) #define vmnewof(v,p,t,n,x) (t*)vmresize((v), (p), sizeof(t)*(n)+(x), \ (VM_RSMOVE|VM_RSCOPY|VM_RSZERO) ) +#define vmdata(vm) ((Void_t*)(_VM_(vm)->data)) #endif /* _VMALLOC_H */ diff --git a/usr/src/lib/libast/sparc/include/ast/wait.h b/usr/src/lib/libast/sparc/include/ast/wait.h index bb690a2ee4..c4e3b8f2a0 100644 --- a/usr/src/lib/libast/sparc/include/ast/wait.h +++ b/usr/src/lib/libast/sparc/include/ast/wait.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/wchar.h b/usr/src/lib/libast/sparc/include/ast/wchar.h index 5bd6aa3ba8..43c5ef1e98 100644 --- a/usr/src/lib/libast/sparc/include/ast/wchar.h +++ b/usr/src/lib/libast/sparc/include/ast/wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/include/ast/wordexp.h b/usr/src/lib/libast/sparc/include/ast/wordexp.h index 0ae7e93e99..af3169962b 100644 --- a/usr/src/lib/libast/sparc/include/ast/wordexp.h +++ b/usr/src/lib/libast/sparc/include/ast/wordexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/align b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/align index 98bedb9f54..36b279e5aa 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/align +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/align @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/botch b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/botch index a0760dfb3a..866d12a961 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/botch +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/botch @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ccode b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ccode index d85e09ed74..aedd14fe86 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ccode +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ccode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/common b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/common index 656f34ec3b..295e05d946 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/common +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/common @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/dirent b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/dirent index 738c2ec46e..f0d8b7dfb0 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/dirent +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/dirent @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/eaccess b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/eaccess index 4368037fb9..3dae8546af 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/eaccess +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/eaccess @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/eaccess by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/eaccess by iffe version 2009-12-04 : : */ #ifndef _def_eaccess_ast #define _def_eaccess_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/errno b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/errno index bb9c1ea4b0..1bd932ec6a 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/errno +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/errno @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/errno by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/errno by iffe version 2009-12-04 : : */ #ifndef _def_errno_ast #define _def_errno_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fcntl b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fcntl index 7d86da86b5..ed6d4d0237 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fcntl +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fcntl @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/float b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/float index 6788a72a32..9500cc2eaf 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/float +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/float @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fs b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fs index 8544e82ffa..31611c188e 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fs +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/fs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/hack b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/hack index 0fffc88bd9..8a76a23871 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/hack +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/hack @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/hack by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/hack by iffe version 2009-12-04 : : */ #ifndef _def_hack_ast #define _def_hack_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/iconv b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/iconv index 73e67a6cc5..29a13b5a0d 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/iconv +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/iconv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/isoc99 b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/isoc99 index 9fe968c42c..56b53d6232 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/isoc99 +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/isoc99 @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/isoc99 by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/isoc99 by iffe version 2009-12-04 : : */ #ifndef _def_isoc99_ast #define _def_isoc99_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/lib b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/lib index c0a95868d0..83be163f9f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/lib +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/lib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -124,6 +124,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -155,7 +158,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/libpath b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/libpath index 31faafef26..106ab7d172 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/libpath +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/libpath @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/libpath.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/libpath.sh by iffe version 2009-12-04 : : */ #ifndef _def_libpath_ast #define _def_libpath_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/limits b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/limits index ef995653b9..c0f88cd5f3 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/limits +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/limits @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/map b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/map index d039c336a9..101b9a4a6f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/map +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/map @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mmap b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mmap index f381a9f394..d74f1a3d13 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mmap +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mmap @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mode b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mode index 43dca228f4..0037c2c82f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mode +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/mode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ndbm b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ndbm index d9eb9cc239..cfbe9ab040 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ndbm +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/ndbm @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/nl_types b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/nl_types index ac8e8d8ef8..8e51cb12d2 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/nl_types +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/nl_types @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/omitted b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/omitted index 05c8c85c57..ba1ba1aaaa 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/omitted +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/omitted @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/omitted by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/omitted by iffe version 2009-12-04 : : */ #ifndef _def_omitted_ast #define _def_omitted_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/options b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/options new file mode 100644 index 0000000000..0255d138a6 --- /dev/null +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/options @@ -0,0 +1,5 @@ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/options by iffe version 2009-12-04 : : */ +#ifndef _def_options_ast +#define _def_options_ast 1 +#define _sys_types 1 /* #include <sys/types.h> ok */ +#endif diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/param b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/param index 69ae2644c7..868aaf6b44 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/param +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/param @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/preroot b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/preroot index 756b78a37f..001d3c0fd2 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/preroot +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/preroot @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/prog b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/prog index ba1115cdb1..928ecd4ea0 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/prog +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/prog @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/prog by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/prog by iffe version 2009-12-04 : : */ #ifndef _def_prog_ast #define _def_prog_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfinit b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfinit index 6d31652693..ded1b0e153 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfinit +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfinit @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sfinit.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sfinit.c by iffe version 2009-12-04 : : */ #ifndef _def_sfinit_ast #define _def_sfinit_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfio b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfio index 7f15af3b14..6ef937735f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfio +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sfio @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sfio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sfio by iffe version 2009-12-04 : : */ #ifndef _def_sfio_ast #define _def_sfio_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sig b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sig index 4a05425f62..07c291565c 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sig +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sig @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/siglist b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/siglist index c99c89509b..5fc9bcbbbc 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/siglist +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/siglist @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/siglist by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/siglist by iffe version 2009-12-04 : : */ #ifndef _def_siglist_ast #define _def_siglist_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/signal b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/signal index 2bb0880240..6ab7d11b56 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/signal +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/signal @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/signal.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/signal.c by iffe version 2009-12-04 : : */ #ifndef _def_signal_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/standards b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/standards index 562e8b6650..4121a87ab4 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/standards +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/standards @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/stdio b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/stdio index b89ea30d69..c1c31497f3 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/stdio +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/stdio @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sys b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sys index c4231a6042..9f2a84fb13 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sys +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/sys @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/time b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/time index 2a4bd3dbb7..4bcafd05c0 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/time +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/time @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmlib b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmlib index a92e195a08..591ced792c 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmlib +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmlib @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tmlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tmlib by iffe version 2009-12-04 : : */ #ifndef _def_tmlib_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmx b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmx index 5c84ca22cb..a3e19d83fb 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmx +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tmx @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tty b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tty index 2c48057ed3..d67cc25293 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tty +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tty @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tv b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tv index 289ea145de..9e59290657 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tv +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tvlib b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tvlib index 0b217f8c3f..dced222619 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tvlib +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/tvlib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tvlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tvlib by iffe version 2009-12-04 : : */ #ifndef _def_tvlib_ast #define _def_tvlib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -11,6 +11,7 @@ #define _lib_nanosleep 1 /* nanosleep() in default lib(s) */ #define _lib_usleep 1 /* usleep() in default lib(s) */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ +#define _lib_utimensat 1 /* complete utimensat implementation */ #define _sys_time 1 /* #include <sys/time.h> ok */ #define _lib_clock_gettime 1 /* execute{\ passed */ #define tmgettimeofday(p) gettimeofday(p,(struct timezone*)0) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/uwin b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/uwin index a5e25c14f3..1ca4ebb903 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/uwin +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/uwin @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/uwin by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/uwin by iffe version 2009-12-04 : : */ #ifndef _def_uwin_ast #define _def_uwin_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vfork b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vfork index 7f64bc5c1c..ea9446da11 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vfork +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vfork @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vmalloc b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vmalloc index b0c7f6d891..f2fd994c52 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vmalloc +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/vmalloc @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/vmalloc by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/vmalloc by iffe version 2009-12-04 : : */ #ifndef _def_vmalloc_ast #define _def_vmalloc_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wait b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wait index 4f48b8ccd4..cd24b64d92 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wait +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wait @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wchar b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wchar index aa52f40fd2..17177484e4 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wchar +++ b/usr/src/lib/libast/sparc/src/lib/libast/FEATURE/wchar @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/align.h b/usr/src/lib/libast/sparc/src/lib/libast/align.h index 98bedb9f54..36b279e5aa 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/align.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/align.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_botch.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_botch.h index a0760dfb3a..866d12a961 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_botch.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_botch.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_ccode.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_ccode.h index d85e09ed74..aedd14fe86 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_ccode.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_ccode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_common.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_common.h index 9cccc65817..b5fab1088b 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_common.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_common.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_dirent.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_dirent.h index 738c2ec46e..f0d8b7dfb0 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_dirent.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_dirent.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_fcntl.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_fcntl.h index 7d86da86b5..ed6d4d0237 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_fcntl.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_fcntl.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_float.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_float.h index 6788a72a32..9500cc2eaf 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_float.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_float.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_fs.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_fs.h index 8544e82ffa..31611c188e 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_fs.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_fs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_iconv.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_iconv.h index 73e67a6cc5..29a13b5a0d 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_iconv.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_iconv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_lib.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_lib.h index c0a95868d0..83be163f9f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_lib.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_lib.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -124,6 +124,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -155,7 +158,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_limits.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_limits.h index ef995653b9..c0f88cd5f3 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_limits.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_limits.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_map.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_map.h index d039c336a9..101b9a4a6f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_map.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_map.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_mmap.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_mmap.h index f381a9f394..d74f1a3d13 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_mmap.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_mmap.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_mode.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_mode.h index 43dca228f4..0037c2c82f 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_mode.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_mode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_namval.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_namval.h index f8f65ab2cb..49e777be1d 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_namval.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_namval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_ndbm.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_ndbm.h index d9eb9cc239..cfbe9ab040 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_ndbm.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_ndbm.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_nl_types.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_nl_types.h index ac8e8d8ef8..8e51cb12d2 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_nl_types.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_nl_types.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_param.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_param.h index 69ae2644c7..868aaf6b44 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_param.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_param.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_standards.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_standards.h index 562e8b6650..4121a87ab4 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_standards.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_standards.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_stdio.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_stdio.h index b89ea30d69..c1c31497f3 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_stdio.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_stdio.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_sys.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_sys.h index c4231a6042..9f2a84fb13 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_sys.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_sys.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_time.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_time.h index 2a4bd3dbb7..4bcafd05c0 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_time.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_time.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_tty.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_tty.h index 2c48057ed3..d67cc25293 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_tty.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_tty.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_vfork.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_vfork.h index 7f64bc5c1c..ea9446da11 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_vfork.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_vfork.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_wait.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_wait.h index 4f48b8ccd4..cd24b64d92 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_wait.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_wait.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/ast_wchar.h b/usr/src/lib/libast/sparc/src/lib/libast/ast_wchar.h index aa52f40fd2..17177484e4 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/ast_wchar.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/ast_wchar.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/conftab.c b/usr/src/lib/libast/sparc/src/lib/libast/conftab.c index ac3ae6bca7..32880808b8 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/conftab.c +++ b/usr/src/lib/libast/sparc/src/lib/libast/conftab.c @@ -10,7 +10,7 @@ #include "FEATURE/param" #include "conftab.h" -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/comp/conf.tab : : */ /* * prefix strings -- the first few are indexed by Conf_t.standard diff --git a/usr/src/lib/libast/sparc/src/lib/libast/conftab.h b/usr/src/lib/libast/sparc/src/lib/libast/conftab.h index e8d3f27f82..05124ead5b 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/conftab.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/conftab.h @@ -6,7 +6,7 @@ #endif #include <sys/systeminfo.h> -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/comp/conf.tab : : */ #if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus) #define const diff --git a/usr/src/lib/libast/sparc/src/lib/libast/lc.h b/usr/src/lib/libast/sparc/src/lib/libast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/lc.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/preroot.h b/usr/src/lib/libast/sparc/src/lib/libast/preroot.h index 756b78a37f..001d3c0fd2 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/preroot.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/preroot.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparc/src/lib/libast/sig.h b/usr/src/lib/libast/sparc/src/lib/libast/sig.h index 4a05425f62..07c291565c 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/sig.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/sig.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparc/src/lib/libast/tmx.h b/usr/src/lib/libast/sparc/src/lib/libast/tmx.h index 5c84ca22cb..a3e19d83fb 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/tmx.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/tmx.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparc/src/lib/libast/tv.h b/usr/src/lib/libast/sparc/src/lib/libast/tv.h index 289ea145de..9e59290657 100644 --- a/usr/src/lib/libast/sparc/src/lib/libast/tv.h +++ b/usr/src/lib/libast/sparc/src/lib/libast/tv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/align.h b/usr/src/lib/libast/sparcv9/include/ast/align.h index 825809c3af..34ebf9bcfb 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/align.h +++ b/usr/src/lib/libast/sparcv9/include/ast/align.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast.h b/usr/src/lib/libast/sparcv9/include/ast/ast.h index f1dff0cf6a..5c0d5dcd30 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_botch.h b/usr/src/lib/libast/sparcv9/include/ast/ast_botch.h index c734b79be1..aeeb0c2d77 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_botch.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_botch.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_ccode.h b/usr/src/lib/libast/sparcv9/include/ast/ast_ccode.h index 8c8ecd553e..6b6de1f2a8 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_ccode.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_ccode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_common.h b/usr/src/lib/libast/sparcv9/include/ast/ast_common.h index 8cda3ef0fe..a893ef8068 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_common.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_common.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_dir.h b/usr/src/lib/libast/sparcv9/include/ast/ast_dir.h index 8d801aa72c..c873ed3253 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_dir.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_dir.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_dirent.h b/usr/src/lib/libast/sparcv9/include/ast/ast_dirent.h index 7ed2922b70..d0b47e0129 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_dirent.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_fcntl.h b/usr/src/lib/libast/sparcv9/include/ast/ast_fcntl.h index 15816246b8..85d1adce75 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_fcntl.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_fcntl.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_float.h b/usr/src/lib/libast/sparcv9/include/ast/ast_float.h index bd76a64a1c..5848cc91af 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_float.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_float.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_fs.h b/usr/src/lib/libast/sparcv9/include/ast/ast_fs.h index 0420a9311d..00de1af89a 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_fs.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_fs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -96,15 +96,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_getopt.h b/usr/src/lib/libast/sparcv9/include/ast/ast_getopt.h index 060c18a246..c86d826a72 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_getopt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_getopt.h @@ -19,11 +19,7 @@ extern __MANGLE__ int optind; extern __MANGLE__ int optopt; extern __MANGLE__ char* optarg; -#ifndef NULL /* in case <stdlib.h> or <stdio.h> got here first */ - extern __MANGLE__ int getopt __PROTO__((int, char* const*, const char*)); extern __MANGLE__ int getsubopt __PROTO__((char**, char* const*, char**)); #endif - -#endif diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_iconv.h b/usr/src/lib/libast/sparcv9/include/ast/ast_iconv.h index c0e6a25dd3..ad8c67afd4 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_iconv.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_lib.h b/usr/src/lib/libast/sparcv9/include/ast/ast_lib.h index 3bfcec14ec..fa59597ffc 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_lib.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_lib.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -134,6 +134,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -165,7 +168,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_limits.h b/usr/src/lib/libast/sparcv9/include/ast/ast_limits.h index ab89acd722..38ebc94588 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_limits.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_limits.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_map.h b/usr/src/lib/libast/sparcv9/include/ast/ast_map.h index 3a512b6ece..098eec109f 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_map.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_map.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_mmap.h b/usr/src/lib/libast/sparcv9/include/ast/ast_mmap.h index 9261494c4b..f40fe38bf5 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_mmap.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_mmap.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_mode.h b/usr/src/lib/libast/sparcv9/include/ast/ast_mode.h index f9caab398c..3bf4ae7b5d 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_mode.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_mode.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_namval.h b/usr/src/lib/libast/sparcv9/include/ast/ast_namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_namval.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_ndbm.h b/usr/src/lib/libast/sparcv9/include/ast/ast_ndbm.h index f63856aeb6..1c9cedb019 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_ndbm.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_ndbm.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_nl_types.h b/usr/src/lib/libast/sparcv9/include/ast/ast_nl_types.h index 988f320b52..9ae905cbca 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_nl_types.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_param.h b/usr/src/lib/libast/sparcv9/include/ast/ast_param.h index 326200af6a..b45bd19a06 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_param.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_param.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_standards.h b/usr/src/lib/libast/sparcv9/include/ast/ast_standards.h index cd18f087a6..e4ba7cee74 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_standards.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_standards.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_std.h b/usr/src/lib/libast/sparcv9/include/ast/ast_std.h index e734c74dbd..f98d1861b9 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_std.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_std.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -166,6 +166,8 @@ extern __MANGLE__ char* strerror __PROTO__((int)); #define AST_LC_COUNT 14 #define AST_LC_LANG 255 +#define AST_LC_internal 1 +#define AST_LC_setenv (1L<<27) #define AST_LC_find (1L<<28) #define AST_LC_debug (1L<<29) #define AST_LC_setlocale (1L<<30) @@ -258,8 +260,9 @@ typedef struct uint32_t env_serial; uint32_t mb_sync; + uint32_t version; - char pad[940]; + char pad[936]; } _Ast_info_t; @@ -346,7 +349,7 @@ extern __MANGLE__ int _ast_getpgrp __PROTO__((void)); /* * and finally, standard interfaces hijacked by ast - * _ATS_STD_I delays headers that require <ast_map.h> + * _AST_STD_I delays headers that require <ast_map.h> */ #include <ast_map.h> diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_stdio.h b/usr/src/lib/libast/sparcv9/include/ast/ast_stdio.h index 7c7f05a381..452b524320 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_stdio.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_sys.h b/usr/src/lib/libast/sparcv9/include/ast/ast_sys.h index 3659647fa2..48325698c8 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_sys.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_sys.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_time.h b/usr/src/lib/libast/sparcv9/include/ast/ast_time.h index 0507482344..b28079deb7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_time.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_time.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_tty.h b/usr/src/lib/libast/sparcv9/include/ast/ast_tty.h index 9e0af86eb6..4570336b1d 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_tty.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_tty.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_version.h b/usr/src/lib/libast/sparcv9/include/ast/ast_version.h index af5756d02b..b3ba546e3a 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_version.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_version.h @@ -7,4 +7,4 @@ #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif -#define _AST_VERSION 20090202L +#define _AST_VERSION 20100102L diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_vfork.h b/usr/src/lib/libast/sparcv9/include/ast/ast_vfork.h index ebf40888ed..2701ef429b 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_vfork.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_vfork.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_wait.h b/usr/src/lib/libast/sparcv9/include/ast/ast_wait.h index becfa490b0..792608c906 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_wait.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_wait.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_wchar.h b/usr/src/lib/libast/sparcv9/include/ast/ast_wchar.h index 2ad80cca1b..bdbcdc16da 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_wchar.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ast_windows.h b/usr/src/lib/libast/sparcv9/include/ast/ast_windows.h index e02d2aaeb9..65590c17b4 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ast_windows.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ast_windows.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/bytesex.h b/usr/src/lib/libast/sparcv9/include/ast/bytesex.h index e105fc5f58..1f78d13287 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/bytesex.h +++ b/usr/src/lib/libast/sparcv9/include/ast/bytesex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/ccode.h b/usr/src/lib/libast/sparcv9/include/ast/ccode.h index a7a43aecbe..ae50c63b16 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ccode.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ccode.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -43,7 +43,7 @@ #define _CHARCODE_H 1 -#include <ast.h> +#include <ast_common.h> #include <ast_ccode.h> typedef struct Ccmap_s diff --git a/usr/src/lib/libast/sparcv9/include/ast/cdt.h b/usr/src/lib/libast/sparcv9/include/ast/cdt.h index f2f0389296..1044207b76 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/cdt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/cdt.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/debug.h b/usr/src/lib/libast/sparcv9/include/ast/debug.h index 8f0ec6a257..6dfee2254a 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/debug.h +++ b/usr/src/lib/libast/sparcv9/include/ast/debug.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/dirent.h b/usr/src/lib/libast/sparcv9/include/ast/dirent.h index ea81d037a5..05e76cadae 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/dirent.h +++ b/usr/src/lib/libast/sparcv9/include/ast/dirent.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/dt.h b/usr/src/lib/libast/sparcv9/include/ast/dt.h index 6fcc20c42e..b6b356aee7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/dt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/dt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/endian.h b/usr/src/lib/libast/sparcv9/include/ast/endian.h index 6ad7ddcaad..1c992dd490 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/endian.h +++ b/usr/src/lib/libast/sparcv9/include/ast/endian.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/error.h b/usr/src/lib/libast/sparcv9/include/ast/error.h index 10d919a93a..c0e21dadd7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/error.h +++ b/usr/src/lib/libast/sparcv9/include/ast/error.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -64,7 +64,7 @@ #ifndef ERROR_translate #define ERROR_translating() (error_info.translate&&(ast.locale.set&(1<<AST_LC_MESSAGES))) -#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)l,(const char*)i,(const char*)d,(const char*)m):(m)) +#define ERROR_translate(l,i,d,m) (ERROR_translating()?errorx((const char*)(l),(const char*)(i),(const char*)(d),(const char*)(m)):(char*)(m)) #endif #define ERROR_INFO 0 /* info message -- no err_id */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/find.h b/usr/src/lib/libast/sparcv9/include/ast/find.h index 9ed4227d03..374858aced 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/find.h +++ b/usr/src/lib/libast/sparcv9/include/ast/find.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/fnmatch.h b/usr/src/lib/libast/sparcv9/include/ast/fnmatch.h index ba357d9585..764009c3b7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/fnmatch.h +++ b/usr/src/lib/libast/sparcv9/include/ast/fnmatch.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/fnv.h b/usr/src/lib/libast/sparcv9/include/ast/fnv.h index f4caaee97f..2312a20118 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/fnv.h +++ b/usr/src/lib/libast/sparcv9/include/ast/fnv.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/fs3d.h b/usr/src/lib/libast/sparcv9/include/ast/fs3d.h index 50795c98b0..bae8dde927 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/fs3d.h +++ b/usr/src/lib/libast/sparcv9/include/ast/fs3d.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/fts.h b/usr/src/lib/libast/sparcv9/include/ast/fts.h index 09420af481..1bf72a114d 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/fts.h +++ b/usr/src/lib/libast/sparcv9/include/ast/fts.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -41,7 +41,9 @@ #define _FTS_H -#include <ls.h> +#include <ast_std.h> +#include <ast_fs.h> +#include <ast_mode.h> /* * fts_open flags diff --git a/usr/src/lib/libast/sparcv9/include/ast/ftw.h b/usr/src/lib/libast/sparcv9/include/ast/ftw.h index 49040cf863..68feb09bb3 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ftw.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ftw.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/ftwalk.h b/usr/src/lib/libast/sparcv9/include/ast/ftwalk.h index 29e1693959..673b1c2824 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ftwalk.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ftwalk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/getopt.h b/usr/src/lib/libast/sparcv9/include/ast/getopt.h index 4ad28bbb01..c0679a7e53 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/getopt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/getopt.h @@ -1,17 +1,42 @@ /* : : generated by proto : : */ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1985-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* Phong Vo <kpv@research.att.com> * +* * +***********************************************************************/ + +/* + * gnu getopt interface + */ +#ifndef _GETOPT_H #if !defined(__PROTO__) #include <prototyped.h> #endif #if !defined(__LINKAGE__) #define __LINKAGE__ /* 2004-08-11 transition */ #endif + #ifdef _AST_STD_I #define _GETOPT_H -1 -#endif - -#ifndef _GETOPT_H +#else #define _GETOPT_H 1 #include <ast_getopt.h> @@ -32,3 +57,4 @@ extern __MANGLE__ int getopt_long __PROTO__((int, char* const*, const char*, con extern __MANGLE__ int getopt_long_only __PROTO__((int, char* const*, const char*, const struct option*, int*)); #endif +#endif diff --git a/usr/src/lib/libast/sparcv9/include/ast/glob.h b/usr/src/lib/libast/sparcv9/include/ast/glob.h index 93e202a5f9..e2708229c7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/glob.h +++ b/usr/src/lib/libast/sparcv9/include/ast/glob.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/hash.h b/usr/src/lib/libast/sparcv9/include/ast/hash.h index a524737ccc..0023ea06f5 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/hash.h +++ b/usr/src/lib/libast/sparcv9/include/ast/hash.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/hashkey.h b/usr/src/lib/libast/sparcv9/include/ast/hashkey.h index 525434e369..84be9113a1 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/hashkey.h +++ b/usr/src/lib/libast/sparcv9/include/ast/hashkey.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/hashpart.h b/usr/src/lib/libast/sparcv9/include/ast/hashpart.h index cfe3666777..5d33aac61d 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/hashpart.h +++ b/usr/src/lib/libast/sparcv9/include/ast/hashpart.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/iconv.h b/usr/src/lib/libast/sparcv9/include/ast/iconv.h index 5b02759721..e65540c075 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/iconv.h +++ b/usr/src/lib/libast/sparcv9/include/ast/iconv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/lc.h b/usr/src/lib/libast/sparcv9/include/ast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/lc.h +++ b/usr/src/lib/libast/sparcv9/include/ast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/ls.h b/usr/src/lib/libast/sparcv9/include/ast/ls.h index 70a8dc88ba..a8a5fcb0e0 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/ls.h +++ b/usr/src/lib/libast/sparcv9/include/ast/ls.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/magic.h b/usr/src/lib/libast/sparcv9/include/ast/magic.h index 53d632c721..8683016e80 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/magic.h +++ b/usr/src/lib/libast/sparcv9/include/ast/magic.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/magicid.h b/usr/src/lib/libast/sparcv9/include/ast/magicid.h index e31c80f288..1dca0c1e42 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/magicid.h +++ b/usr/src/lib/libast/sparcv9/include/ast/magicid.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/mc.h b/usr/src/lib/libast/sparcv9/include/ast/mc.h index 75b4308360..b84df7239e 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/mc.h +++ b/usr/src/lib/libast/sparcv9/include/ast/mc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/mime.h b/usr/src/lib/libast/sparcv9/include/ast/mime.h index 6d662d29e5..5943b58eaa 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/mime.h +++ b/usr/src/lib/libast/sparcv9/include/ast/mime.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/mnt.h b/usr/src/lib/libast/sparcv9/include/ast/mnt.h index 62815d19e7..8bf8c12814 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/mnt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/mnt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/modecanon.h b/usr/src/lib/libast/sparcv9/include/ast/modecanon.h index 3357d3ec75..3fa425af8f 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/modecanon.h +++ b/usr/src/lib/libast/sparcv9/include/ast/modecanon.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/modex.h b/usr/src/lib/libast/sparcv9/include/ast/modex.h index 1f00578a00..4b73e19ffe 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/modex.h +++ b/usr/src/lib/libast/sparcv9/include/ast/modex.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/namval.h b/usr/src/lib/libast/sparcv9/include/ast/namval.h index f54b08ff15..fefe46a0c7 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/namval.h +++ b/usr/src/lib/libast/sparcv9/include/ast/namval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/nl_types.h b/usr/src/lib/libast/sparcv9/include/ast/nl_types.h index e71605ff40..581cc13a81 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/nl_types.h +++ b/usr/src/lib/libast/sparcv9/include/ast/nl_types.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/option.h b/usr/src/lib/libast/sparcv9/include/ast/option.h index 39207fcc4c..5439707f8e 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/option.h +++ b/usr/src/lib/libast/sparcv9/include/ast/option.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/preroot.h b/usr/src/lib/libast/sparcv9/include/ast/preroot.h index 9a1db7b8dd..a2c891c032 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/preroot.h +++ b/usr/src/lib/libast/sparcv9/include/ast/preroot.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,7 +19,7 @@ * Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/proc.h b/usr/src/lib/libast/sparcv9/include/ast/proc.h index 219f0d5884..4161e1a385 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/proc.h +++ b/usr/src/lib/libast/sparcv9/include/ast/proc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/re_comp.h b/usr/src/lib/libast/sparcv9/include/ast/re_comp.h index e8d425d1c0..ec1d512e40 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/re_comp.h +++ b/usr/src/lib/libast/sparcv9/include/ast/re_comp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/recfmt.h b/usr/src/lib/libast/sparcv9/include/ast/recfmt.h index acdb18df36..fcd56de020 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/recfmt.h +++ b/usr/src/lib/libast/sparcv9/include/ast/recfmt.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/regex.h b/usr/src/lib/libast/sparcv9/include/ast/regex.h index 1fcd12d298..9b7299c814 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/regex.h +++ b/usr/src/lib/libast/sparcv9/include/ast/regex.h @@ -47,10 +47,11 @@ #define REG_MULTIREF 0x00100000 /* multiple digit backrefs */ #define REG_MUSTDELIM 0x08000000 /* all delimiters required */ #define REG_DELIMITED 0x10000000 /* pattern[0] is delimiter */ -#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ +#define REG_CLASS_ESCAPE 0x80000000 /* \ escapes in [...] */ #define REG_SHELL_DOT 0x00200000 /* explicit leading . match */ #define REG_SHELL_ESCAPED 0x00400000 /* \ not special */ +#define REG_SHELL_GROUP 0x20000000 /* (|&) inside [@|&](...) only */ #define REG_SHELL_PATH 0x00800000 /* explicit / match */ #define REG_REGEXP 0x40000000 /* <regexp.h> compatibility */ @@ -98,7 +99,7 @@ #define REG_BADBR 10 /* invalid {...} digits */ #define REG_ERANGE 11 /* invalid [...] range endpoint */ #define REG_ESPACE 12 /* out of space */ -#define REG_BADRPT 13 /* unary op not preceeded by re */ +#define REG_BADRPT 13 /* unary op not preceded by re */ #define REG_ENULL 14 /* empty subexpr in pattern */ #define REG_ECOUNT 15 /* re component count overflow */ #define REG_BADESC 16 /* invalid \char escape */ @@ -111,7 +112,7 @@ struct regex_s; typedef struct regex_s regex_t; struct regdisc_s; typedef struct regdisc_s regdisc_t; typedef int (*regclass_t) __PROTO__((int)); -typedef int32_t regflags_t; +typedef uint32_t regflags_t; typedef int regoff_t; typedef int (*regerror_t) __PROTO__((const regex_t*, regdisc_t*, int, ...)); typedef __V_* (*regcomp_t) __PROTO__((const regex_t*, const char*, size_t, regdisc_t*)); diff --git a/usr/src/lib/libast/sparcv9/include/ast/regexp.h b/usr/src/lib/libast/sparcv9/include/ast/regexp.h index 89e0d3a875..ea2df629b5 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/regexp.h +++ b/usr/src/lib/libast/sparcv9/include/ast/regexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/sfdisc.h b/usr/src/lib/libast/sparcv9/include/ast/sfdisc.h index ce1ed6e052..bc6e00b335 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/sfdisc.h +++ b/usr/src/lib/libast/sparcv9/include/ast/sfdisc.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/sfio.h b/usr/src/lib/libast/sparcv9/include/ast/sfio.h index 3506f5c955..da6ebfd9f2 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/sfio.h +++ b/usr/src/lib/libast/sparcv9/include/ast/sfio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/sfio_s.h b/usr/src/lib/libast/sparcv9/include/ast/sfio_s.h index 46b2348b9c..7f7483cc79 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/sfio_s.h +++ b/usr/src/lib/libast/sparcv9/include/ast/sfio_s.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/sfio_t.h b/usr/src/lib/libast/sparcv9/include/ast/sfio_t.h index 5c819865c8..4240316aef 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/sfio_t.h +++ b/usr/src/lib/libast/sparcv9/include/ast/sfio_t.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/shcmd.h b/usr/src/lib/libast/sparcv9/include/ast/shcmd.h index f59834ad80..2b7a3ce486 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/shcmd.h +++ b/usr/src/lib/libast/sparcv9/include/ast/shcmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/sig.h b/usr/src/lib/libast/sparcv9/include/ast/sig.h index 8025730eed..b30258a436 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/sig.h +++ b/usr/src/lib/libast/sparcv9/include/ast/sig.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -139,11 +139,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparcv9/include/ast/stack.h b/usr/src/lib/libast/sparcv9/include/ast/stack.h index 64bda47ad0..8a7f954797 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/stack.h +++ b/usr/src/lib/libast/sparcv9/include/ast/stack.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/stak.h b/usr/src/lib/libast/sparcv9/include/ast/stak.h index 3e867b0b7d..4396bdf02b 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/stak.h +++ b/usr/src/lib/libast/sparcv9/include/ast/stak.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/stdio.h b/usr/src/lib/libast/sparcv9/include/ast/stdio.h index 2053ba8b27..0d9876a250 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/stdio.h +++ b/usr/src/lib/libast/sparcv9/include/ast/stdio.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/stk.h b/usr/src/lib/libast/sparcv9/include/ast/stk.h index ae2684f36d..7a226b0e98 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/stk.h +++ b/usr/src/lib/libast/sparcv9/include/ast/stk.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/swap.h b/usr/src/lib/libast/sparcv9/include/ast/swap.h index 96c2f79d74..d214ece1e6 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/swap.h +++ b/usr/src/lib/libast/sparcv9/include/ast/swap.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/tar.h b/usr/src/lib/libast/sparcv9/include/ast/tar.h index 04f5586481..8e8af49bb2 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/tar.h +++ b/usr/src/lib/libast/sparcv9/include/ast/tar.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/times.h b/usr/src/lib/libast/sparcv9/include/ast/times.h index db0725a35c..1dbd3ee60a 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/times.h +++ b/usr/src/lib/libast/sparcv9/include/ast/times.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/tm.h b/usr/src/lib/libast/sparcv9/include/ast/tm.h index 154615088f..d8eb357c20 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/tm.h +++ b/usr/src/lib/libast/sparcv9/include/ast/tm.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/tmx.h b/usr/src/lib/libast/sparcv9/include/ast/tmx.h index 7471b3ac15..755298323e 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/tmx.h +++ b/usr/src/lib/libast/sparcv9/include/ast/tmx.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/tok.h b/usr/src/lib/libast/sparcv9/include/ast/tok.h index 8850458e9a..5e07aa302d 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/tok.h +++ b/usr/src/lib/libast/sparcv9/include/ast/tok.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/tv.h b/usr/src/lib/libast/sparcv9/include/ast/tv.h index 870ef5e538..f1b00031c9 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/tv.h +++ b/usr/src/lib/libast/sparcv9/include/ast/tv.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ ***********************************************************************/ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/include/ast/usage.h b/usr/src/lib/libast/sparcv9/include/ast/usage.h index e2bea60f9c..19d2b0fc14 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/usage.h +++ b/usr/src/lib/libast/sparcv9/include/ast/usage.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/vdb.h b/usr/src/lib/libast/sparcv9/include/ast/vdb.h index f800446d5f..a44d0c6132 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/vdb.h +++ b/usr/src/lib/libast/sparcv9/include/ast/vdb.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/vecargs.h b/usr/src/lib/libast/sparcv9/include/ast/vecargs.h index 8b567d5d5d..900e13d8b0 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/vecargs.h +++ b/usr/src/lib/libast/sparcv9/include/ast/vecargs.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/vmalloc.h b/usr/src/lib/libast/sparcv9/include/ast/vmalloc.h index 0115078cf5..f13cc58879 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/vmalloc.h +++ b/usr/src/lib/libast/sparcv9/include/ast/vmalloc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ ** Written by Kiem-Phong Vo, kpv@research.att.com, 01/16/94. */ -#define VMALLOC_VERSION 20070911L +#define VMALLOC_VERSION 20100101L #if _PACKAGE_ast #include <ast_std.h> @@ -39,6 +39,7 @@ typedef struct _vmalloc_s Vmalloc_t; typedef struct _vmstat_s Vmstat_t; typedef struct _vmdisc_s Vmdisc_t; typedef struct _vmethod_s Vmethod_t; +typedef struct _vmdata_s Vmdata_t; typedef Void_t* (*Vmemory_f)_ARG_((Vmalloc_t*, Void_t*, size_t, size_t, Vmdisc_t*)); typedef int (*Vmexcept_f)_ARG_((Vmalloc_t*, int, Void_t*, Vmdisc_t*)); @@ -75,6 +76,9 @@ struct _vmalloc_s char* file; /* file name */ int line; /* line number */ Void_t* func; /* calling function */ + Vmdisc_t* disc; /* discipline to get space */ + Vmdata_t* data; /* the real region data */ + Vmalloc_t* next; /* linked list of regions */ #ifdef _VM_PRIVATE_ _VM_PRIVATE_ #endif @@ -172,7 +176,8 @@ extern int vmtrbusy _ARG_((Vmalloc_t*)); extern int vmstat _ARG_((Vmalloc_t*, Vmstat_t*)); extern int vmwalk _ARG_((Vmalloc_t*, - int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*))); + int(*)(Vmalloc_t*,Void_t*,size_t,Vmdisc_t*,Void_t*), + Void_t*)); extern char* vmstrdup _ARG_((Vmalloc_t*, const char*)); #if !defined(_BLD_vmalloc) && !defined(_AST_STD_H) && \ @@ -311,5 +316,6 @@ _END_EXTERNS_ (VM_RSMOVE) ) #define vmnewof(v,p,t,n,x) (t*)vmresize((v), (p), sizeof(t)*(n)+(x), \ (VM_RSMOVE|VM_RSCOPY|VM_RSZERO) ) +#define vmdata(vm) ((Void_t*)(_VM_(vm)->data)) #endif /* _VMALLOC_H */ diff --git a/usr/src/lib/libast/sparcv9/include/ast/wait.h b/usr/src/lib/libast/sparcv9/include/ast/wait.h index bb690a2ee4..c4e3b8f2a0 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/wait.h +++ b/usr/src/lib/libast/sparcv9/include/ast/wait.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/wchar.h b/usr/src/lib/libast/sparcv9/include/ast/wchar.h index 5bd6aa3ba8..43c5ef1e98 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/wchar.h +++ b/usr/src/lib/libast/sparcv9/include/ast/wchar.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/include/ast/wordexp.h b/usr/src/lib/libast/sparcv9/include/ast/wordexp.h index 0ae7e93e99..af3169962b 100644 --- a/usr/src/lib/libast/sparcv9/include/ast/wordexp.h +++ b/usr/src/lib/libast/sparcv9/include/ast/wordexp.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/align b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/align index f62317708d..022d7943cb 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/align +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/align @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/botch b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/botch index 1b1f3a41c0..c6c447fb42 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/botch +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/botch @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ccode b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ccode index 78aed4b6ac..4c543d740c 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ccode +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ccode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/common b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/common index 827eab96c2..ff813fbd2c 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/common +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/common @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/dirent b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/dirent index e089bbefa2..baeb288ede 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/dirent +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/dirent @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/eaccess b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/eaccess index 0669111107..1b790fec3b 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/eaccess +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/eaccess @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/eaccess by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/eaccess by iffe version 2009-12-04 : : */ #ifndef _def_eaccess_ast #define _def_eaccess_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/errno b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/errno index ee9b847216..9e1c15edc0 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/errno +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/errno @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/errno by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/errno by iffe version 2009-12-04 : : */ #ifndef _def_errno_ast #define _def_errno_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fcntl b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fcntl index 1af42562ca..f6c4f0abe4 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fcntl +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fcntl @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/float b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/float index cb94fe0b9f..a2ff3da6fe 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/float +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/float @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fs b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fs index 169eb70204..f542635fd0 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fs +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/fs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/hack b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/hack index 0d716635cb..2a991f88c9 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/hack +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/hack @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/hack by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/hack by iffe version 2009-12-04 : : */ #ifndef _def_hack_ast #define _def_hack_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/iconv b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/iconv index 2062ba6ae1..81f5332030 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/iconv +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/iconv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/isoc99 b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/isoc99 index 79c93b2fc4..7cef3af637 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/isoc99 +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/isoc99 @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/isoc99 by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/isoc99 by iffe version 2009-12-04 : : */ #ifndef _def_isoc99_ast #define _def_isoc99_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/lib b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/lib index 1ecf711728..0b290d868b 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/lib +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/lib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -113,6 +113,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -144,7 +147,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/libpath b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/libpath index e061abd223..9aefb9aa61 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/libpath +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/libpath @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/libpath.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/libpath.sh by iffe version 2009-12-04 : : */ #ifndef _def_libpath_ast #define _def_libpath_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/limits b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/limits index 29541b28d5..019d408faf 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/limits +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/limits @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/map b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/map index e8c3169102..17de2eb4c1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/map +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/map @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mmap b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mmap index 55b3ff469e..ce7159ef18 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mmap +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mmap @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mode b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mode index c075013b77..a346a1a7f1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mode +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/mode @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ndbm b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ndbm index 2ebf428b23..3ede439064 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ndbm +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/ndbm @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/nl_types b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/nl_types index 540a2070e5..dc0d5feffe 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/nl_types +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/nl_types @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/omitted b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/omitted index 9037895d0a..0b719f8d46 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/omitted +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/omitted @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/omitted by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/omitted by iffe version 2009-12-04 : : */ #ifndef _def_omitted_ast #define _def_omitted_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/options b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/options new file mode 100644 index 0000000000..952c743b1e --- /dev/null +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/options @@ -0,0 +1,5 @@ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/options by iffe version 2009-12-04 : : */ +#ifndef _def_options_ast +#define _def_options_ast 1 +#define _sys_types 1 /* #include <sys/types.h> ok */ +#endif diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/param b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/param index ef85fba2b0..5327a11660 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/param +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/param @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/preroot b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/preroot index 20da834210..8c75c546dc 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/preroot +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/preroot @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/prog b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/prog index 374aed0f47..a1894f7e1c 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/prog +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/prog @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/prog by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/prog by iffe version 2009-12-04 : : */ #ifndef _def_prog_ast #define _def_prog_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfinit b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfinit index 973c3bb9ae..8a7df115a5 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfinit +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfinit @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sfinit.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sfinit.c by iffe version 2009-12-04 : : */ #ifndef _def_sfinit_ast #define _def_sfinit_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfio b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfio index fbca3f07c0..779757d315 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfio +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sfio @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sfio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sfio by iffe version 2009-12-04 : : */ #ifndef _def_sfio_ast #define _def_sfio_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sig b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sig index 93e9f11dab..a4cb97abc1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sig +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sig @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/siglist b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/siglist index ea32c8e5f0..7cc8e88654 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/siglist +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/siglist @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/siglist by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/siglist by iffe version 2009-12-04 : : */ #ifndef _def_siglist_ast #define _def_siglist_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/signal b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/signal index 850142e01d..b3a6b7f347 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/signal +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/signal @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/signal.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/signal.c by iffe version 2009-12-04 : : */ #ifndef _def_signal_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/standards b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/standards index 2af2a12db9..7d804a5e06 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/standards +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/standards @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/stdio b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/stdio index 6df00bdc50..1da15a034f 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/stdio +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/stdio @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sys b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sys index 37f473d50a..9d631719b7 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sys +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/sys @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/time b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/time index cb6df6caf0..30bbbdca34 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/time +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/time @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmlib b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmlib index 3b069d0dcc..7d21e48f9b 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmlib +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmlib @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tmlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tmlib by iffe version 2009-12-04 : : */ #ifndef _def_tmlib_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmx b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmx index e033082b3b..c650c4af02 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmx +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tmx @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tty b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tty index 14ad85f134..98cac27e57 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tty +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tty @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tv b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tv index 82ff72affb..e3959a1378 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tv +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tv @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tvlib b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tvlib index f1bec737d9..bd2469ae59 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tvlib +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/tvlib @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tvlib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tvlib by iffe version 2009-12-04 : : */ #ifndef _def_tvlib_ast #define _def_tvlib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -11,6 +11,7 @@ #define _lib_nanosleep 1 /* nanosleep() in default lib(s) */ #define _lib_usleep 1 /* usleep() in default lib(s) */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ +#define _lib_utimensat 1 /* complete utimensat implementation */ #define _sys_time 1 /* #include <sys/time.h> ok */ #define _lib_clock_gettime 1 /* execute{\ passed */ #define tmgettimeofday(p) gettimeofday(p,(struct timezone*)0) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/uwin b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/uwin index 77ae8f2992..e87d2d4513 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/uwin +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/uwin @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/uwin by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/uwin by iffe version 2009-12-04 : : */ #ifndef _def_uwin_ast #define _def_uwin_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vfork b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vfork index 476213e1c1..f375c530f4 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vfork +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vfork @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vmalloc b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vmalloc index 5828823987..576f8a7d31 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vmalloc +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/vmalloc @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/vmalloc by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/vmalloc by iffe version 2009-12-04 : : */ #ifndef _def_vmalloc_ast #define _def_vmalloc_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wait b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wait index d8d97504ec..9b9cae33cc 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wait +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wait @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wchar b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wchar index 20b0daad3f..3525ac9f82 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wchar +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/FEATURE/wchar @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/align.h b/usr/src/lib/libast/sparcv9/src/lib/libast/align.h index f62317708d..022d7943cb 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/align.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/align.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/align.c by iffe version 2009-12-04 : : */ #ifndef _def_align_ast #define _def_align_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_botch.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_botch.h index 1b1f3a41c0..c6c447fb42 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_botch.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_botch.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/botch.c by iffe version 2009-12-04 : : */ #ifndef _def_botch_ast #define _def_botch_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ccode.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ccode.h index 78aed4b6ac..4c543d740c 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ccode.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ccode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ccode by iffe version 2009-12-04 : : */ #ifndef _def_ccode_ast #define _def_ccode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_common.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_common.h index 2ae83984e8..aed49fe106 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_common.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_common.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/common by iffe version 2009-12-04 : : */ #ifndef _AST_COMMON_H #define _AST_COMMON_H 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_dirent.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_dirent.h index e089bbefa2..baeb288ede 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_dirent.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_dirent.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/dirent by iffe version 2009-12-04 : : */ #ifndef _def_dirent_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fcntl.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fcntl.h index 1af42562ca..f6c4f0abe4 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fcntl.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fcntl.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fcntl.c by iffe version 2009-12-04 : : */ #ifndef _def_fcntl_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_float.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_float.h index cb94fe0b9f..a2ff3da6fe 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_float.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_float.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/float by iffe version 2009-12-04 : : */ #ifndef _def_float_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fs.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fs.h index 169eb70204..f542635fd0 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fs.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_fs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/fs by iffe version 2009-12-04 : : */ #ifndef _def_fs_ast #if !defined(__PROTO__) @@ -75,15 +75,16 @@ __STDPP__directive pragma pp:noinitial #endif #define _hdr_stdio 1 /* #include <stdio.h> ok */ #define _sys_mntent 1 /* #include <sys/mntent.h> ok */ +#define _sys_mnttab 1 /* #include <sys/mnttab.h> ok */ +#define _sys_mount 1 /* #include <sys/mount.h> ok */ +#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ +#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ +#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _mem_st_blocks_stat 1 /* st_blocks is a member of struct stat */ #define _mem_st_blksize_stat 1 /* st_blksize is a member of struct stat */ #define _mem_st_rdev_stat 1 /* st_rdev is a member of struct stat */ -#define _sys_statfs 1 /* #include <sys/statfs.h> ok */ #define _mem_f_files_statfs 1 /* f_files is a member of struct statfs */ -#define _sys_vfs 1 /* #include <sys/vfs.h> ok */ #define _sys_param 1 /* #include <sys/param.h> ok */ -#define _sys_mount 1 /* #include <sys/mount.h> ok */ -#define _sys_statvfs 1 /* #include <sys/statvfs.h> ok */ #define _mem_f_basetype_statvfs 1 /* f_basetype is a member of struct statvfs */ #define _mem_f_frsize_statvfs 1 /* f_frsize is a member of struct statvfs */ #define _lib_getmntent 1 /* getmntent() in default lib(s) */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_iconv.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_iconv.h index 2062ba6ae1..81f5332030 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_iconv.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_iconv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/iconv by iffe version 2009-12-04 : : */ #ifndef _def_iconv_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_lib.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_lib.h index 1ecf711728..0b290d868b 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_lib.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_lib.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/lib by iffe version 2009-12-04 : : */ #ifndef _def_lib_ast #define _def_lib_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ @@ -113,6 +113,9 @@ #define _lib_strtoll 1 /* strtoll() in default lib(s) */ #define _lib_strtoul 1 /* strtoul() in default lib(s) */ #define _lib_strtoull 1 /* strtoull() in default lib(s) */ +#define _hdr_signal 1 /* #include <signal.h> ok */ +#define _lib_sigflag 1 /* sigflag() in default lib(s) */ +#define _npt_sigflag 1 /* sigflag() needs a prototype */ #define _mem_d_ino_dirent 1 /* d_ino is a member of struct dirent */ #define _mem_d_off_dirent 1 /* d_off is a member of struct dirent */ #define _mem_d_reclen_dirent 1 /* d_reclen is a member of struct dirent */ @@ -144,7 +147,6 @@ #define _hdr_string 1 /* #include <string.h> ok */ #define _lib_memcmp 1 /* standard memcmp interface that works */ #define _hdr_fcntl 1 /* #include <fcntl.h> ok */ -#define _hdr_signal 1 /* #include <signal.h> ok */ #define _sys_stat 1 /* #include <sys/stat.h> ok */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memccpy 1 /* standard memccpy interface that works */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_limits.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_limits.h index 29541b28d5..019d408faf 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_limits.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_limits.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/limits.c by iffe version 2009-12-04 : : */ #ifndef _def_limits_ast #define _def_limits_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_map.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_map.h index e8c3169102..17de2eb4c1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_map.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_map.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/map.c by iffe version 2009-12-04 : : */ #ifndef _def_map_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mmap.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mmap.h index 55b3ff469e..ce7159ef18 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mmap.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mmap.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mmap by iffe version 2009-12-04 : : */ #ifndef _def_mmap_ast #define _def_mmap_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mode.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mode.h index c075013b77..a346a1a7f1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mode.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_mode.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/mode.c by iffe version 2009-12-04 : : */ #ifndef _def_mode_ast #define _def_mode_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_namval.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_namval.h index f8f65ab2cb..49e777be1d 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_namval.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_namval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ndbm.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ndbm.h index 2ebf428b23..3ede439064 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ndbm.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_ndbm.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/ndbm by iffe version 2009-12-04 : : */ #ifndef _def_ndbm_ast #define _def_ndbm_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_nl_types.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_nl_types.h index 540a2070e5..dc0d5feffe 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_nl_types.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_nl_types.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/nl_types by iffe version 2009-12-04 : : */ #ifndef _def_nl_types_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_param.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_param.h index ef85fba2b0..5327a11660 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_param.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_param.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/param.sh by iffe version 2009-12-04 : : */ #ifndef _def_param_ast #define _def_param_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_standards.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_standards.h index 2af2a12db9..7d804a5e06 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_standards.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_standards.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/standards by iffe version 2009-12-04 : : */ #ifndef _def_standards_ast #define _def_standards_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_stdio.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_stdio.h index 6df00bdc50..1da15a034f 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_stdio.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_stdio.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/stdio by iffe version 2009-12-04 : : */ #ifndef _SFSTDIO_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_sys.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_sys.h index 37f473d50a..9d631719b7 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_sys.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_sys.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sys by iffe version 2009-12-04 : : */ #ifndef _AST_SYS_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_time.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_time.h index cb6df6caf0..30bbbdca34 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_time.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_time.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_tty.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_tty.h index 14ad85f134..98cac27e57 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_tty.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_tty.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tty by iffe version 2009-12-04 : : */ #ifndef _def_tty_ast #define _def_tty_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_vfork.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_vfork.h index 476213e1c1..f375c530f4 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_vfork.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_vfork.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/vfork by iffe version 2009-12-04 : : */ #ifndef _def_vfork_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wait.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wait.h index d8d97504ec..9b9cae33cc 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wait.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wait.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wait by iffe version 2009-12-04 : : */ #ifndef _def_wait_ast #define _def_wait_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wchar.h b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wchar.h index 20b0daad3f..3525ac9f82 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wchar.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/ast_wchar.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/wchar by iffe version 2009-12-04 : : */ #ifndef _def_wchar_ast #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.c b/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.c index cca6463dd1..6bcbe13801 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.c +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.c @@ -10,7 +10,7 @@ #include "FEATURE/param" #include "conftab.h" -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/comp/conf.tab : : */ /* * prefix strings -- the first few are indexed by Conf_t.standard diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.h b/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.h index 59c7b1b69d..25acf6bc13 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/conftab.h @@ -6,7 +6,7 @@ #endif #include <sys/systeminfo.h> -/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/comp/conf.tab : : */ +/* : : generated by conf from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/comp/conf.tab : : */ #if !defined(const) && !defined(__STDC__) && !defined(__cplusplus) && !defined(c_plusplus) #define const diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/lc.h b/usr/src/lib/libast/sparcv9/src/lib/libast/lc.h index da06a59ba4..65fdab45ab 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/lc.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/lc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1985-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -47,7 +47,9 @@ #define LC_undefined 0x00100 #define LC_utf8 0x00200 #define LC_verbose 0x00400 -#define LC_user 0x10000 +#define LC_setlocale 0x10000 +#define LC_setenv 0x20000 +#define LC_user 0x40000 #define LC_language_attribute_max 2 #define LC_territory_language_max 4 @@ -139,6 +141,7 @@ typedef struct Lc_category_s int internal; Lc_category_set_f setf; Lc_t* prev; + unsigned int flags; } Lc_category_t; #if _BLD_ast && defined(__EXPORT__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/preroot.h b/usr/src/lib/libast/sparcv9/src/lib/libast/preroot.h index 20da834210..8c75c546dc 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/preroot.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/preroot.h @@ -1,4 +1,4 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/preroot.sh by iffe version 2009-12-04 : : */ #ifndef _def_preroot_ast #define _def_preroot_ast 1 #define _sys_types 1 /* #include <sys/types.h> ok */ diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/sig.h b/usr/src/lib/libast/sparcv9/src/lib/libast/sig.h index 93e9f11dab..a4cb97abc1 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/sig.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/sig.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/sig.sh by iffe version 2009-12-04 : : */ #ifndef _def_sig_ast #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -118,11 +118,18 @@ extern __MANGLE__ Sig_info_t sig_info; #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ +#if _lib_sigflag && _npt_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif + #if _BLD_ast && defined(__EXPORT__) #undef __MANGLE__ #define __MANGLE__ __LINKAGE__ __EXPORT__ #endif +#if !_lib_sigflag +extern __MANGLE__ int sigflag __PROTO__((int, int, int)); +#endif extern __MANGLE__ int sigcritical __PROTO__((int)); extern __MANGLE__ int sigunblock __PROTO__((int)); diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/tmx.h b/usr/src/lib/libast/sparcv9/src/lib/libast/tmx.h index e033082b3b..c650c4af02 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/tmx.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/tmx.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tmx by iffe version 2009-12-04 : : */ #ifndef _TMX_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libast/sparcv9/src/lib/libast/tv.h b/usr/src/lib/libast/sparcv9/src/lib/libast/tv.h index 82ff72affb..e3959a1378 100644 --- a/usr/src/lib/libast/sparcv9/src/lib/libast/tv.h +++ b/usr/src/lib/libast/sparcv9/src/lib/libast/tv.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libast/features/tv by iffe version 2009-12-04 : : */ #ifndef _TV_H #if !defined(__PROTO__) diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com index c11a682638..2760d3dbdb 100644 --- a/usr/src/lib/libcmd/Makefile.com +++ b/usr/src/lib/libcmd/Makefile.com @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -48,6 +47,7 @@ OBJECTS = \ fds.o \ fmt.o \ fold.o \ + fts_fix.o \ getconf.o \ head.o \ id.o \ @@ -75,6 +75,7 @@ OBJECTS = \ tty.o \ uname.o \ uniq.o \ + vmstate.o \ wc.o \ wclib.o @@ -122,7 +123,7 @@ CPPFLAGS = \ '-DUSAGE_LICENSE=\ "[-author?Glenn Fowler <gsf@research.att.com>]"\ "[-author?David Korn <dgk@research.att.com>]"\ - "[-copyright?Copyright (c) 1992-2009 AT&T Intellectual Property]"\ + "[-copyright?Copyright (c) 1992-2010 AT&T Intellectual Property]"\ "[-license?http://www.opensource.org/licenses/cpl1.0.txt]"\ "[--catalog?libcmd]"' @@ -131,7 +132,9 @@ CFLAGS += \ CFLAGS64 += \ $(ASTCFLAGS64) +pics/cut.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED pics/sync.o := CERRWARN += -erroff=E_END_OF_LOOP_CODE_NOT_REACHED +pics/vmstate.o := CERRWARN += -erroff=E_NO_IMPLICIT_DECL_ALLOWED .KEEP_STATE: diff --git a/usr/src/lib/libcmd/amd64/include/ast/cmd.h b/usr/src/lib/libcmd/amd64/include/ast/cmd.h index f149f8d275..e064222a77 100644 --- a/usr/src/lib/libcmd/amd64/include/ast/cmd.h +++ b/usr/src/lib/libcmd/amd64/include/ast/cmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -68,8 +68,6 @@ #include <dlldefs.h> -typedef int (*Shbltin_f) __PROTO__((int, char**, __V_*)); - #else extern __MANGLE__ int CMD_STANDALONE __PROTO__((int, char**, __V_*)); @@ -135,7 +133,7 @@ main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** if (fun = (Shbltin_f)dlsym(dll, buf)) break; } - if (dll = dllfind("cmd", NiL, RTLD_LAZY)) + if (dll = dllplug(NiL, "cmd", NiL, RTLD_LAZY, NiL, 0)) { if (fun = (Shbltin_f)dlsym(dll, buf + 1)) break; diff --git a/usr/src/lib/libcmd/amd64/include/ast/cmdext.h b/usr/src/lib/libcmd/amd64/include/ast/cmdext.h index 416a3dc5a5..978322e2d3 100644 --- a/usr/src/lib/libcmd/amd64/include/ast/cmdext.h +++ b/usr/src/lib/libcmd/amd64/include/ast/cmdext.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -72,5 +72,6 @@ extern __MANGLE__ int b_tee __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_tty __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uname __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uniq __PROTO__((int, char**, __V_*)); +extern __MANGLE__ int b_vmstate __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_wc __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_xgrep __PROTO__((int, char**, __V_*)); diff --git a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/ids b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/ids index 4b285da2a7..5c25aaedd2 100644 --- a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/ids +++ b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/ids @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libcmd/features/ids by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libcmd/features/ids by iffe version 2009-12-04 : : */ #ifndef _def_ids_cmd #define _def_ids_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_endgrent 1 /* endgrent() in default lib(s) */ #define _lib_getgrent 1 /* getgrent() in default lib(s) */ diff --git a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/sockets b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/sockets index febcb42135..701f83e584 100644 --- a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/sockets +++ b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/sockets @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libcmd/features/sockets by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libcmd/features/sockets by iffe version 2009-12-04 : : */ #ifndef _def_sockets_cmd #define _def_sockets_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _sys_socket 1 /* #include <sys/socket.h> ok */ #define _hdr_arpa_inet 1 /* #include <arpa/inet.h> ok */ diff --git a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/symlink b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/symlink index 3426d54558..50a4f770a0 100644 --- a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/symlink +++ b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/symlink @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libcmd/features/symlink by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libcmd/features/symlink by iffe version 2009-12-04 : : */ #ifndef _def_symlink_cmd #define _def_symlink_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_lchown 1 /* lchown implemented */ #endif diff --git a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/utsname b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/utsname index 482658f139..60fae23d03 100644 --- a/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/utsname +++ b/usr/src/lib/libcmd/amd64/src/lib/libcmd/FEATURE/utsname @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libcmd/features/utsname by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libcmd/features/utsname by iffe version 2009-12-04 : : */ #ifndef _def_utsname_cmd #define _def_utsname_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_getdomainname 1 /* getdomainname() in default lib(s) */ #define _lib_gethostid 1 /* gethostid() in default lib(s) */ diff --git a/usr/src/lib/libcmd/common/RELEASE b/usr/src/lib/libcmd/common/RELEASE index ebda670177..fba77c1c29 100644 --- a/usr/src/lib/libcmd/common/RELEASE +++ b/usr/src/lib/libcmd/common/RELEASE @@ -1,3 +1,19 @@ +10-03-07 tail.c: sfsync(sfstdout) after all -f done, fix -f partial line +10-03-05 mktemp.c: add --regress=seed for testing +10-03-05 vmstate.c: add +10-01-26 tail.c: -f sleep(1) only if no progress from last round of checks +10-01-20 fts_fix.[ch]: use <fts_fix.h> instead of <fts.h> (see fts_fix.c) +10-01-20 cp.c: free(state) if called from old shell +09-12-10 join.c: <wctype.h> for iswspace()! +09-12-04 cmd.h: fix CMD_DYNAMIC logic +09-12-04 cut.c: handle -d mb +09-12-03 mkdir.c: add --verbose +09-11-30 cat.c,date.c,cksum.c: drop setlocale() call already done by optget() +09-11-30 join.c: handle -t mb +09-11-28 wclib.c: { -w -L } mb independent of -m +09-11-28 paste.c: handle -d mb +09-11-28 uniq.c: handle -s mb +09-11-28 cksum.c: FTS_SEEDOTDIR by default 09-09-09 fds.c: add --unit=fd 09-08-25 tail.c: initialize Tail_t.fifo=0 !! 09-08-15 tail.c: fix fifo logic diff --git a/usr/src/lib/libcmd/common/basename.c b/usr/src/lib/libcmd/common/basename.c index 2b59030483..74da190ce8 100644 --- a/usr/src/lib/libcmd/common/basename.c +++ b/usr/src/lib/libcmd/common/basename.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/cat.c b/usr/src/lib/libcmd/common/cat.c index e451998cc2..dbec90c1da 100644 --- a/usr/src/lib/libcmd/common/cat.c +++ b/usr/src/lib/libcmd/common/cat.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -406,7 +406,6 @@ b_cat(int argc, char** argv, void* context) char states[UCHAR_MAX+1]; cmdinit(argc, argv, context, ERROR_CATALOG, 0); - setlocale(LC_ALL, ""); att = !strcmp(astconf("UNIVERSE", NiL, NiL), "att"); mode = "r"; for (;;) diff --git a/usr/src/lib/libcmd/common/chgrp.c b/usr/src/lib/libcmd/common/chgrp.c index 3295f3ab24..5272171787 100644 --- a/usr/src/lib/libcmd/common/chgrp.c +++ b/usr/src/lib/libcmd/common/chgrp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -103,7 +103,7 @@ __STDPP__directive pragma pp:hide lchown #include <cdt.h> #include <ls.h> #include <ctype.h> -#include <fts.h> +#include <fts_fix.h> #include "FEATURE/symlink" diff --git a/usr/src/lib/libcmd/common/chmod.c b/usr/src/lib/libcmd/common/chmod.c index 4247446859..7bfcf09dc8 100644 --- a/usr/src/lib/libcmd/common/chmod.c +++ b/usr/src/lib/libcmd/common/chmod.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -135,7 +135,7 @@ __STDPP__directive pragma pp:hide lchmod #include <cmd.h> #include <ls.h> -#include <fts.h> +#include <fts_fix.h> #include "FEATURE/symlink" diff --git a/usr/src/lib/libcmd/common/chown.c b/usr/src/lib/libcmd/common/chown.c index cc80ba516f..4e0bea0a7b 100644 --- a/usr/src/lib/libcmd/common/chown.c +++ b/usr/src/lib/libcmd/common/chown.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/cksum.c b/usr/src/lib/libcmd/common/cksum.c index 2be23e4a93..c42e865b09 100644 --- a/usr/src/lib/libcmd/common/cksum.c +++ b/usr/src/lib/libcmd/common/cksum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: sum (AT&T Research) 2009-07-02 $\n]" +"[-?\n@(#)$Id: sum (AT&T Research) 2009-11-28 $\n]" USAGE_LICENSE "[+NAME?cksum,md5sum,sum - print file checksum and block count]" "[+DESCRIPTION?\bsum\b lists the checksum, and for most methods the block" @@ -113,7 +113,7 @@ USAGE_LICENSE #include <sum.h> #include <ls.h> #include <modex.h> -#include <fts.h> +#include <fts_fix.h> #include <error.h> typedef struct State_s /* program state */ @@ -453,8 +453,7 @@ b_cksum(int argc, register char** argv, void* context) cmdinit(argc, argv, context, ERROR_CATALOG, ERROR_NOTIFY); memset(&state, 0, sizeof(state)); - setlocale(LC_ALL, ""); - flags = fts_flags() | FTS_TOP | FTS_NOPOSTORDER | FTS_NOSEEDOTDIR; + flags = fts_flags() | FTS_TOP | FTS_NOPOSTORDER; state.flags = SUM_SIZE; state.warn = 1; logical = 1; @@ -555,7 +554,10 @@ b_cksum(int argc, register char** argv, void* context) */ if (logical) + { flags &= ~(FTS_META|FTS_PHYSICAL); + flags |= FTS_SEEDOTDIR; + } if (state.permissions) { state.uid = geteuid(); diff --git a/usr/src/lib/libcmd/common/cmd.h b/usr/src/lib/libcmd/common/cmd.h index 3b054da7dd..a78755bbc0 100644 --- a/usr/src/lib/libcmd/common/cmd.h +++ b/usr/src/lib/libcmd/common/cmd.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -57,8 +57,6 @@ #include <dlldefs.h> -typedef int (*Shbltin_f)(int, char**, void*); - #else extern int CMD_STANDALONE(int, char**, void*); @@ -126,7 +124,7 @@ main(int argc, char** argv) if (fun = (Shbltin_f)dlsym(dll, buf)) break; } - if (dll = dllfind("cmd", NiL, RTLD_LAZY)) + if (dll = dllplug(NiL, "cmd", NiL, RTLD_LAZY, NiL, 0)) { if (fun = (Shbltin_f)dlsym(dll, buf + 1)) break; diff --git a/usr/src/lib/libcmd/common/cmdinit.c b/usr/src/lib/libcmd/common/cmdinit.c index e0bdfe511e..70a65cd1b2 100644 --- a/usr/src/lib/libcmd/common/cmdinit.c +++ b/usr/src/lib/libcmd/common/cmdinit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/cmp.c b/usr/src/lib/libcmd/common/cmp.c index 12b69ee23b..db3f8de4b4 100644 --- a/usr/src/lib/libcmd/common/cmp.c +++ b/usr/src/lib/libcmd/common/cmp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/comm.c b/usr/src/lib/libcmd/common/comm.c index f3fee9ef09..dcae3ba22e 100644 --- a/usr/src/lib/libcmd/common/comm.c +++ b/usr/src/lib/libcmd/common/comm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/cp.c b/usr/src/lib/libcmd/common/cp.c index bff4430830..66b946b7f5 100644 --- a/usr/src/lib/libcmd/common/cp.c +++ b/usr/src/lib/libcmd/common/cp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ */ static const char usage_head[] = -"[-?@(#)$Id: cp (AT&T Research) 2009-06-18 $\n]" +"[-?@(#)$Id: cp (AT&T Research) 2010-01-20 $\n]" USAGE_LICENSE ; @@ -123,7 +123,7 @@ static const char usage_tail[] = #include <cmd.h> #include <ls.h> #include <times.h> -#include <fts.h> +#include <fts_fix.h> #include <fs3d.h> #include <hashkey.h> #include <stk.h> @@ -274,7 +274,7 @@ visit(State_t* state, register FTSENT* ent) if (state->directory) { if ((state->postsiz + len) > state->pathsiz && !(state->path = newof(state->path, char, state->pathsiz = roundof(state->postsiz + len, PATH_CHUNK), 0))) - error(3, "out of space"); + error(ERROR_SYSTEM|3, "out of space"); if (state->hierarchy && ent->fts_level == 0 && strchr(base, '/')) { s = state->path + state->postsiz; @@ -667,6 +667,7 @@ b_cp(int argc, register char** argv, void* context) struct stat st; State_t* state; Shbltin_t* sh; + void* cleanup = context; cmdinit(argc, argv, context, ERROR_CATALOG, ERROR_NOTIFY); if (!(sh = CMD_CONTEXT(context)) || !(state = (State_t*)sh->ptr)) @@ -825,7 +826,7 @@ b_cp(int argc, register char** argv, void* context) argv++; } if (!(v = (char**)stkalloc(stkstd, (argc + 2) * sizeof(char*)))) - error(3, "out of space"); + error(ERROR_SYSTEM|3, "out of space"); memcpy(v, argv, (argc + 1) * sizeof(char*)); argv = v; if (!standard) @@ -906,7 +907,7 @@ b_cp(int argc, register char** argv, void* context) state->official = 1; state->postsiz = strlen(file); if (state->pathsiz < roundof(state->postsiz + 2, PATH_CHUNK) && !(state->path = newof(state->path, char, state->pathsiz = roundof(state->postsiz + 2, PATH_CHUNK), 0))) - error(3, "out of space"); + error(ERROR_SYSTEM|3, "out of space"); memcpy(state->path, file, state->postsiz + 1); if (state->directory && state->path[state->postsiz - 1] != '/') state->path[state->postsiz++] = '/'; @@ -939,5 +940,11 @@ b_cp(int argc, register char** argv, void* context) } else if ((*state->link)(*argv, state->path)) error(ERROR_SYSTEM|2, "%s: cannot link to %s", *argv, state->path); + if (cleanup && !sh) + { + if (state->path) + free(state->path); + free(state); + } return error_info.errors != 0; } diff --git a/usr/src/lib/libcmd/common/cut.c b/usr/src/lib/libcmd/common/cut.c index 2be03c3183..abafdc5070 100644 --- a/usr/src/lib/libcmd/common/cut.c +++ b/usr/src/lib/libcmd/common/cut.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -23,13 +23,11 @@ * David Korn * AT&T Bell Laboratories * - * cut [-sN] [-f flist] [-c clist] [-d delim] [-D delim] [-r reclen] [file] ... - * * cut fields or columns from fields from a file */ static const char usage[] = -"[-?\n@(#)$Id: cut (AT&T Research) 2008-04-01 $\n]" +"[-?\n@(#)$Id: cut (AT&T Research) 2009-12-04 $\n]" USAGE_LICENSE "[+NAME?cut - cut out selected columns or fields of each line of a file]" "[+DESCRIPTION?\bcut\b bytes, characters, or character-delimited fields " @@ -49,13 +47,13 @@ USAGE_LICENSE "[+?If no \afile\a is given, or if the \afile\a is \b-\b, \bcut\b " "cuts from standard input. The start of the file is defined " "as the current offset.]" -"[b:bytes]:[list?\bcut\b based on a list of bytes.]" -"[c:characters]:[list?\bcut\b based on a list of characters.]" +"[b:bytes]:[list?\bcut\b based on a list of byte counts.]" +"[c:characters]:[list?\bcut\b based on a list of character counts.]" "[d:delimiter]:[delim?The field character for the \b-f\b option is set " "to \adelim\a. The default is the \btab\b character.]" "[f:fields]:[list?\bcut\b based on fields separated by the delimiter " "character specified with the \b-d\b optiion.]" -"[n:nosplit?Do not split characters. Currently ignored.]" +"[n!:split?Split multibyte characters selected by the \b-b\b option.]" "[R|r:reclen]#[reclen?If \areclen\a > 0, the input will be read as fixed length " "records of length \areclen\a when used with the \b-b\b or \b-c\b " "option.]" @@ -65,7 +63,7 @@ USAGE_LICENSE "[D:line-delimeter|output-delimiter]:[ldelim?The line delimiter character for " "the \b-f\b option is set to \aldelim\a. The default is the " "\bnewline\b character.]" -"[N:nonewline?Do not output new-lines at end of each record when used " +"[N!:newline?Output new-lines at end of each record when used " "with the \b-b\b or \b-c\b option.]" "\n" "\n[file ...]\n" @@ -80,79 +78,102 @@ USAGE_LICENSE #include <cmd.h> #include <ctype.h> -typedef struct Last_s +typedef struct Delim_s { - int seqno; - int seq; - int wdelim; - int ldelim; -} Last_t; + char* str; + int len; + int chr; +} Delim_t; typedef struct Cut_s { + int mb; + int eob; int cflag; + int nosplit; int sflag; int nlflag; - int wdelim; - int ldelim; - int seqno; int reclen; - signed char space[UCHAR_MAX]; - Last_t last; + Delim_t wdelim; + Delim_t ldelim; + unsigned char space[UCHAR_MAX+1]; int list[2]; /* NOTE: must be last member */ } Cut_t; -#define HUGE (1<<14) +#define HUGE INT_MAX #define BLOCK 8*1024 #define C_BYTES 1 #define C_CHARS 2 #define C_FIELDS 4 #define C_SUPRESS 8 -#define C_NOCHOP 16 +#define C_NOSPLIT 16 #define C_NONEWLINE 32 +#define SP_LINE 1 +#define SP_WORD 2 +#define SP_WIDE 3 + +#define mb2wc(w,p,n) (*ast.mb_towc)(&w,(char*)p,n) + /* * compare the first of an array of integers */ -static int mycomp(register const void *a,register const void *b) +static int +mycomp(register const void* a, register const void* b) { - return(*((int*)a) - *((int*)b)); + if (*((int*)a) < *((int*)b)) + return -1; + if (*((int*)a) > *((int*)b)) + return 1; + return 0; } -static Cut_t *cutinit(int mode,char *str,int wdelim,int ldelim,size_t reclen) +static Cut_t* +cutinit(int mode, char* str, Delim_t* wdelim, Delim_t* ldelim, size_t reclen) { - register int *lp, c, n=0; - register int range = 0; - register char *cp = str; - Cut_t *cuthdr; - if (!(cuthdr = (Cut_t*)stakalloc(sizeof(Cut_t)+strlen(cp)*sizeof(int)))) + register int* lp; + register int c; + register int n = 0; + register int range = 0; + register char* cp = str; + Cut_t* cut; + + if (!(cut = (Cut_t*)stakalloc(sizeof(Cut_t) + strlen(cp) * sizeof(int)))) error(ERROR_exit(1), "out of space"); - memset(cuthdr->space, 0, sizeof(cuthdr->space)); - cuthdr->last.seqno = 0; - cuthdr->last.seq = 0; - cuthdr->last.wdelim = 0; - cuthdr->last.ldelim = '\n'; - cuthdr->cflag = ((mode&C_CHARS)!=0 && mbwide()); - cuthdr->sflag = ((mode&C_SUPRESS)!=0); - cuthdr->nlflag = ((mode&C_NONEWLINE)!=0); - cuthdr->wdelim = wdelim; - cuthdr->ldelim = ldelim; - cuthdr->reclen = reclen; - cuthdr->seqno = ++cuthdr->last.seqno; - lp = cuthdr->list; - while(1) switch(c= *cp++) + if (cut->mb = mbwide()) { + memset(cut->space, 0, sizeof(cut->space) / 2); + memset(cut->space + sizeof(cut->space) / 2, SP_WIDE, sizeof(cut->space) / 2); + } + else + memset(cut->space, 0, sizeof(cut->space)); + cut->wdelim = *wdelim; + if (wdelim->len == 1) + cut->space[wdelim->chr] = SP_WORD; + cut->ldelim = *ldelim; + cut->eob = (ldelim->len == 1) ? ldelim->chr : 0; + cut->space[cut->eob] = SP_LINE; + cut->cflag = (mode&C_CHARS) && cut->mb; + cut->nosplit = (mode&(C_BYTES|C_NOSPLIT)) == (C_BYTES|C_NOSPLIT) && cut->mb; + cut->sflag = (mode&C_SUPRESS) != 0; + cut->nlflag = (mode&C_NONEWLINE) != 0; + cut->reclen = reclen; + lp = cut->list; + for (;;) + switch(c = *cp++) + { case ' ': case '\t': while(*cp==' ' || *cp=='\t') cp++; + /*FALLTHROUGH*/ case 0: case ',': if(range) { --range; - if((n = (n==0?HUGE:n-range)) < 0) + if((n = (n ? (n-range) : (HUGE-1))) < 0) error(ERROR_exit(1),"invalid range for c/f option"); *lp++ = range; *lp++ = n; @@ -166,8 +187,8 @@ static Cut_t *cutinit(int mode,char *str,int wdelim,int ldelim,size_t reclen) { register int *dp; *lp = HUGE; - n = 1 + (lp-cuthdr->list)/2; - qsort(lp=cuthdr->list,n,2*sizeof(*lp),mycomp); + n = 1 + (lp-cut->list)/2; + qsort(lp=cut->list,n,2*sizeof(*lp),mycomp); /* eliminate overlapping regions */ for(n=0,range= -2,dp=lp; *lp!=HUGE; lp+=2) { @@ -196,7 +217,7 @@ static Cut_t *cutinit(int mode,char *str,int wdelim,int ldelim,size_t reclen) } } *dp = HUGE; - lp = cuthdr->list; + lp = cut->list; /* convert ranges into gaps */ for(n=0; *lp!=HUGE; lp+=2) { @@ -204,7 +225,7 @@ static Cut_t *cutinit(int mode,char *str,int wdelim,int ldelim,size_t reclen) *lp -= n; n = c+lp[1]; } - return(cuthdr); + return cut; } n = range = 0; break; @@ -220,70 +241,121 @@ static Cut_t *cutinit(int mode,char *str,int wdelim,int ldelim,size_t reclen) if(!isdigit(c)) error(ERROR_exit(1),"bad list for c/f option"); n = 10*n + (c-'0'); - } + break; + } /* NOTREACHED */ } /* - * advance <cp> by <n> multi-byte characters - */ -static int advance(const char *str, register int n, register int inlen) -{ - register int size, len=inlen; - register const char *cp=str; - while(len>0 && n-->0) - { - size = mblen(cp, len); - if(size<0) - size = 1; - cp += size; - len -= size; - - } - if(n>0) - return(inlen+1); - return(cp-str); -} - -/* * cut each line of file <fdin> and put results to <fdout> using list <list> */ -static void cutcols(Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout) +static void +cutcols(Cut_t* cut, Sfio_t* fdin, Sfio_t* fdout) { - register int c, ncol=0,len; - register const int *lp = cuthdr->list; - register char *inp; + register int c; + register int len; + register int ncol = 0; + register const int* lp = cut->list; + register char* bp; register int skip; /* non-zero for don't copy */ - while(1) + int must; + char* ep; + const char* xx; + + for (;;) { - if(len = cuthdr->reclen) - inp = sfreserve(fdin, len, -1); + if (len = cut->reclen) + bp = sfreserve(fdin, len, -1); else - inp = sfgetr(fdin, '\n', 0); - if(!inp && !(inp = sfgetr(fdin, 0, SF_LASTR))) + bp = sfgetr(fdin, '\n', 0); + if (!bp && !(bp = sfgetr(fdin, 0, SF_LASTR))) break; len = sfvalue(fdin); - if((ncol = skip = *(lp = cuthdr->list)) == 0) + ep = bp + len; + xx = 0; + if (!(ncol = skip = *(lp = cut->list))) ncol = *++lp; - while(1) + must = 1; + do { - if((c=(cuthdr->cflag?advance(inp,ncol,len):ncol)) > len) - c = len; - else if(c==len && !skip) - ncol++; - ncol -= c; - if(!skip && sfwrite(fdout,(char*)inp,c)<0) - return; - inp += c; - if(ncol) + if (cut->nosplit) + { + register const char* s = bp; + register int w = len < ncol ? len : ncol; + register int z; + + while (w > 0) + { + if (!(*s & 0x80)) + z = 1; + else if ((z = mblen(s, w)) <= 0) + { + if (s == bp && xx) + { + w += s - xx; + bp = (char*)(s = xx); + xx = 0; + continue; + } + xx = s; + if (skip) + s += w; + w = 0; + break; + } + s += z; + w -= z; + } + c = s - bp; + ncol = !w && ncol >= len; + } + else if (cut->cflag) + { + register const char* s = bp; + register int w = len; + register int z; + + while (w > 0 && ncol > 0) + { + ncol--; + if (!(*s & 0x80) || (z = mblen(s, w)) <= 0) + z = 1; + s += z; + w -= z; + + } + c = s - bp; + ncol = !w && (ncol || !skip); + } + else + { + if ((c = ncol) > len) + c = len; + else if (c == len && !skip) + ncol++; + ncol -= c; + } + if (!skip && c) + { + if (sfwrite(fdout, (char*)bp, c) < 0) + return; + must = 0; + } + bp += c; + if (ncol) break; len -= c; ncol = *++lp; skip = !skip; + } while (ncol != HUGE); + if (!cut->nlflag && (skip || must || cut->reclen)) + { + if (cut->ldelim.len > 1) + sfwrite(fdout, cut->ldelim.str, cut->ldelim.len); + else + sfputc(fdout, cut->ldelim.chr); } - if(!cuthdr->nlflag && (skip || cuthdr->reclen)) - sfputc(fdout,cuthdr->ldelim); } } @@ -292,93 +364,180 @@ static void cutcols(Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout) * stream <fdin> must be line buffered */ -#define endline(c) (((signed char)-1)<0?(c)<0:(c)==((char)-1)) - -static void cutfields(Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout) +static void +cutfields(Cut_t* cut, Sfio_t* fdin, Sfio_t* fdout) { + register unsigned char *sp = cut->space; register unsigned char *cp; + register unsigned char *wp; register int c, nfields; - register const int *lp = cuthdr->list; + register const int *lp = cut->list; register unsigned char *copy; register int nodelim, empty, inword=0; - register unsigned char *endbuff; - unsigned char *inbuff, *first; + register unsigned char *ep; + unsigned char *bp, *first; int lastchar; + wchar_t w; Sfio_t *fdtmp = 0; long offset = 0; - if(cuthdr->seqno != cuthdr->last.seq) - { - cuthdr->space[cuthdr->last.ldelim] = 0; - cuthdr->space[cuthdr->last.wdelim] = 0; - cuthdr->space[cuthdr->last.wdelim=cuthdr->wdelim] = 1; - cuthdr->space[cuthdr->last.ldelim=cuthdr->ldelim] = -1; - cuthdr->last.seq = cuthdr->seqno; - } + unsigned char mb[8]; /* process each buffer */ - while ((inbuff = (unsigned char*)sfreserve(fdin, SF_UNBOUND, 0)) && (c = sfvalue(fdin)) > 0) + while ((bp = (unsigned char*)sfreserve(fdin, SF_UNBOUND, -1)) && (c = sfvalue(fdin)) > 0) { - cp = inbuff; - endbuff = cp + --c; - if((lastchar = cp[c]) != cuthdr->ldelim) - *endbuff = cuthdr->ldelim; + cp = bp; + ep = cp + --c; + if((lastchar = cp[c]) != cut->eob) + *ep = cut->eob; /* process each line in the buffer */ - while(cp <= endbuff) + while (cp <= ep) { first = cp; - if(!inword) + if (!inword) { nodelim = empty = 1; copy = cp; - if(nfields = *(lp = cuthdr->list)) + if (nfields = *(lp = cut->list)) copy = 0; else nfields = *++lp; } - else if(copy) + else if (copy) copy = cp; inword = 0; - while(!inword) + do { /* skip over non-delimiter characters */ - while(!(c=cuthdr->space[*cp++])); + if (cut->mb) + for (;;) + { + switch (c = sp[*(unsigned char*)cp++]) + { + case 0: + continue; + case SP_WIDE: + wp = --cp; + while ((c = mb2wc(w, cp, ep - cp)) <= 0) + { + /* mb char possibly spanning buffer boundary -- fun stuff */ + if ((ep - cp) < mbmax()) + { + int i; + int j; + int k; + + if (lastchar != cut->eob) + { + *ep = lastchar; + if ((c = mb2wc(w, cp, ep - cp)) > 0) + break; + } + if (copy) + { + empty = 0; + if ((c = cp - copy) > 0 && sfwrite(fdout, (char*)copy, c) < 0) + goto failed; + } + for (i = 0; i <= (ep - cp); i++) + mb[i] = cp[i]; + if (!(bp = (unsigned char*)sfreserve(fdin, SF_UNBOUND, -1)) || (c = sfvalue(fdin)) <= 0) + goto failed; + cp = bp; + ep = cp + --c; + if ((lastchar = cp[c]) != cut->eob) + *ep = cut->eob; + j = i; + k = 0; + while (j < mbmax()) + mb[j++] = cp[k++]; + if ((c = mb2wc(w, (char*)mb, j)) <= 0) + { + c = i; + w = 0; + } + first = bp = cp += c - i; + if (copy) + { + copy = bp; + if (w == cut->ldelim.chr) + lastchar = cut->ldelim.chr; + else if (w != cut->wdelim.chr) + { + empty = 0; + if (sfwrite(fdout, (char*)mb, c) < 0) + goto failed; + } + } + c = 0; + } + else + { + w = *cp; + c = 1; + } + break; + } + cp += c; + c = w; + if (c == cut->wdelim.chr) + { + c = SP_WORD; + break; + } + if (c == cut->ldelim.chr) + { + c = SP_LINE; + break; + } + continue; + default: + wp = cp - 1; + break; + } + break; + } + else + { + while (!(c = sp[*cp++])); + wp = cp - 1; + } /* check for end-of-line */ - if(endline(c)) + if (c == SP_LINE) { - if(cp<=endbuff) + if (cp <= ep) break; - if((c=cuthdr->space[lastchar]),endline(c)) + if (lastchar == cut->ldelim.chr) break; - /* restore cuthdr->last. character */ - if(lastchar != cuthdr->ldelim) - *endbuff = lastchar; + /* restore cut->last character */ + if (lastchar != cut->eob) + *ep = lastchar; inword++; - if(!c) + if (!sp[lastchar]) break; } nodelim = 0; - if(--nfields >0) + if (--nfields > 0) continue; nfields = *++lp; - if(copy) + if (copy) { empty = 0; - if((c=(cp-1)-copy)>0 && sfwrite(fdout,(char*)copy,c)< 0) + if ((c = wp - copy) > 0 && sfwrite(fdout, (char*)copy, c) < 0) goto failed; copy = 0; } else /* set to delimiter unless the first field */ - copy = cp -!empty; - } - if(!inword) + copy = empty ? cp : wp; + } while (!inword); + if (!inword) { - if(!copy) + if (!copy) { - if(nodelim) + if (nodelim) { - if(!cuthdr->sflag) + if (!cut->sflag) { - if(offset) + if (offset) { sfseek(fdtmp,(Sfoff_t)0,SEEK_SET); sfmove(fdtmp,fdout,offset,-1); @@ -389,14 +548,14 @@ static void cutfields(Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout) else sfputc(fdout,'\n'); } - if(offset) + if (offset) sfseek(fdtmp,offset=0,SEEK_SET); } - if(copy && (c=cp-copy)>0 && (!nodelim || !cuthdr->sflag) && sfwrite(fdout,(char*)copy,c)< 0) + if (copy && (c=cp-copy)>0 && (!nodelim || !cut->sflag) && sfwrite(fdout,(char*)copy,c)< 0) goto failed; } /* see whether to save in tmp file */ - if(inword && nodelim && !cuthdr->sflag && (c=cp-first)>0) + if(inword && nodelim && !cut->sflag && (c=cp-first)>0) { /* copy line to tmpfile in case no fields */ if(!fdtmp) @@ -405,73 +564,107 @@ static void cutfields(Cut_t *cuthdr,Sfio_t *fdin,Sfio_t *fdout) offset +=c; } } -failed: + failed: if(fdtmp) sfclose(fdtmp); } int -b_cut(int argc,char *argv[], void* context) +b_cut(int argc, char** argv, void* context) { - register char *cp = 0; - register Sfio_t *fp; - int n; - Cut_t *cuthdr; - int mode = 0; - int wdelim = '\t'; - int ldelim = '\n'; - size_t reclen = 0; + register char* cp = 0; + register Sfio_t* fp; + char* s; + int n; + Cut_t* cut; + int mode = 0; + Delim_t wdelim; + Delim_t ldelim; + size_t reclen = 0; cmdinit(argc, argv, context, ERROR_CATALOG, 0); - while (n = optget(argv, usage)) switch (n) + wdelim.chr = '\t'; + ldelim.chr = '\n'; + wdelim.len = ldelim.len = 1; + for (;;) { - case 'b': - case 'c': - if(mode&C_FIELDS) + switch (n = optget(argv, usage)) { - error(2, "f option already specified"); + case 0: break; - } - cp = opt_info.arg; - if(n=='b') - mode |= C_BYTES; - else - mode |= C_CHARS; - break; - case 'D': - ldelim = *(unsigned char*)opt_info.arg; - break; - case 'd': - wdelim = *(unsigned char*)opt_info.arg; - break; - case 'f': - if(mode&(C_CHARS|C_BYTES)) - { - error(2, "c option already specified"); + case 'b': + case 'c': + if(mode&C_FIELDS) + { + error(2, "f option already specified"); + continue; + } + cp = opt_info.arg; + if(n=='b') + mode |= C_BYTES; + else + mode |= C_CHARS; + continue; + case 'D': + ldelim.str = opt_info.arg; + if (mbwide()) + { + s = opt_info.arg; + ldelim.chr = mbchar(s); + if ((n = s - opt_info.arg) > 1) + { + ldelim.len = n; + continue; + } + } + ldelim.chr = *(unsigned char*)opt_info.arg; + ldelim.len = 1; + continue; + case 'd': + wdelim.str = opt_info.arg; + if (mbwide()) + { + s = opt_info.arg; + wdelim.chr = mbchar(s); + if ((n = s - opt_info.arg) > 1) + { + wdelim.len = n; + continue; + } + } + wdelim.chr = *(unsigned char*)opt_info.arg; + wdelim.len = 1; + continue; + case 'f': + if(mode&(C_CHARS|C_BYTES)) + { + error(2, "c option already specified"); + continue; + } + cp = opt_info.arg; + mode |= C_FIELDS; + continue; + case 'n': + mode |= C_NOSPLIT; + continue; + case 'N': + mode |= C_NONEWLINE; + continue; + case 'R': + case 'r': + if(opt_info.num>0) + reclen = opt_info.num; + continue; + case 's': + mode |= C_SUPRESS; + continue; + case ':': + error(2, "%s", opt_info.arg); + break; + case '?': + error(ERROR_usage(2), "%s", opt_info.arg); break; } - cp = opt_info.arg; - mode |= C_FIELDS; - break; - case 'n': - mode |= C_NOCHOP; - break; - case 'N': - mode |= C_NONEWLINE; - break; - case 'R': - case 'r': - if(opt_info.num>0) - reclen = opt_info.num; - break; - case 's': - mode |= C_SUPRESS; - break; - case ':': - error(2, "%s", opt_info.arg); - break; - case '?': - error(ERROR_usage(2), "%s", opt_info.arg); break; } argv += opt_info.index; @@ -486,7 +679,7 @@ b_cut(int argc,char *argv[], void* context) error(3, "non-empty b, c or f option must be specified"); if((mode & (C_FIELDS|C_SUPRESS)) == C_SUPRESS) error(3, "s option requires f option"); - cuthdr = cutinit(mode,cp,wdelim,ldelim,reclen); + cut = cutinit(mode, cp, &wdelim, &ldelim, reclen); if(cp = *argv) argv++; do @@ -499,13 +692,13 @@ b_cut(int argc,char *argv[], void* context) continue; } if(mode&C_FIELDS) - cutfields(cuthdr,fp,sfstdout); + cutfields(cut,fp,sfstdout); else - cutcols(cuthdr,fp,sfstdout); + cutcols(cut,fp,sfstdout); if(fp!=sfstdin) sfclose(fp); } while(cp = *argv++); if (sfsync(sfstdout)) error(ERROR_system(0), "write error"); - return(error_info.errors?1:0); + return error_info.errors != 0; } diff --git a/usr/src/lib/libcmd/common/date.c b/usr/src/lib/libcmd/common/date.c index d7895b02d4..ce011e2960 100644 --- a/usr/src/lib/libcmd/common/date.c +++ b/usr/src/lib/libcmd/common/date.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -294,7 +294,6 @@ b_date(int argc, register char** argv, void* context) int unelapsed = 0; /* fmtelapsed() => strelapsed */ cmdinit(argc, argv, context, ERROR_CATALOG, 0); - setlocale(LC_ALL, ""); tm_info.flags = TM_DATESTYLE; fmts = &fmt; fmt.format = ""; diff --git a/usr/src/lib/libcmd/common/dirname.c b/usr/src/lib/libcmd/common/dirname.c index cd6076240b..076460eb97 100644 --- a/usr/src/lib/libcmd/common/dirname.c +++ b/usr/src/lib/libcmd/common/dirname.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/expr.c b/usr/src/lib/libcmd/common/expr.c index 78749d25ce..537408e507 100644 --- a/usr/src/lib/libcmd/common/expr.c +++ b/usr/src/lib/libcmd/common/expr.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/fds.c b/usr/src/lib/libcmd/common/fds.c index cca4fd22c3..0eb22bb1fd 100644 --- a/usr/src/lib/libcmd/common/fds.c +++ b/usr/src/lib/libcmd/common/fds.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/fmt.c b/usr/src/lib/libcmd/common/fmt.c index ab0db310ea..2830e2191b 100644 --- a/usr/src/lib/libcmd/common/fmt.c +++ b/usr/src/lib/libcmd/common/fmt.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/fold.c b/usr/src/lib/libcmd/common/fold.c index 01a2cadfb1..e371570095 100644 --- a/usr/src/lib/libcmd/common/fold.c +++ b/usr/src/lib/libcmd/common/fold.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/fts_fix.c b/usr/src/lib/libcmd/common/fts_fix.c new file mode 100644 index 0000000000..cc007e06c7 --- /dev/null +++ b/usr/src/lib/libcmd/common/fts_fix.c @@ -0,0 +1,56 @@ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1992-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* * +***********************************************************************/ +/* + * -lcmd specific workaround to handle + * fts_namelen + * fts_pathlen + * fts_level + * changing from [unsigned] short bit to [s]size_t + * + * ksh (or any other main application) that pulls in -lcmd + * at runtime may result in old -last running with new -lcmd + * which is not a good situation (tm) + * + * probably safe to drop after 20150101 + */ + +#include <ast.h> +#include <fts_fix.h> + +#undef fts_read + +FTSENT* +_fts_read(FTS* fts) +{ + FTSENT* oe; + + static FTSENT* ne; + + if ((oe = _ast_fts_read(fts)) && ast.version < 20100102L && (ne || (ne = newof(0, FTSENT, 1, 0)))) + { + *ne = *oe; + oe = ne; + ne->fts_namelen = ne->_fts_namelen; + ne->fts_pathlen = ne->_fts_pathlen; + ne->fts_level = ne->_fts_level; + } + return oe; +} diff --git a/usr/src/lib/libast/common/misc/liberror.c b/usr/src/lib/libcmd/common/fts_fix.h index 43fb5697e3..e4d411a82e 100644 --- a/usr/src/lib/libast/common/misc/liberror.c +++ b/usr/src/lib/libcmd/common/fts_fix.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1985-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -16,25 +16,33 @@ * * * Glenn Fowler <gsf@research.att.com> * * David Korn <dgk@research.att.com> * -* Phong Vo <kpv@research.att.com> * * * ***********************************************************************/ -#pragma prototyped /* - * Glenn Fowler - * AT&T Bell Laboratories + * -lcmd specific workaround to handle + * fts_namelen + * fts_pathlen + * fts_level + * changing from [unsigned] short bit to [s]size_t * - * OBSOLETE: use errormsg() + * ksh (or any other main application) that pulls in -lcmd + * at runtime may result in old -last running with new -lcmd + * which is not a good situation (tm) */ -#include <error.h> +#ifndef _FTS_FIX_H +#define _FTS_FIX_H 1 -void -liberror(const char* lib, int level, ...) -{ - va_list ap; +#include <fts.h> - va_start(ap, level); - errorv(lib, level, ap); - va_end(ap); -} +#ifdef fts_read +#undef fts_read +#else +#define _ast_fts_read fts_read +#endif + +#define fts_read _fts_read + +extern FTSENT* fts_read(FTS*); + +#endif diff --git a/usr/src/lib/libcmd/common/getconf.c b/usr/src/lib/libcmd/common/getconf.c index a4509437ab..d7d02c98ac 100644 --- a/usr/src/lib/libcmd/common/getconf.c +++ b/usr/src/lib/libcmd/common/getconf.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/head.c b/usr/src/lib/libcmd/common/head.c index 98f7df8e8f..80ce196b7e 100644 --- a/usr/src/lib/libcmd/common/head.c +++ b/usr/src/lib/libcmd/common/head.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/id.c b/usr/src/lib/libcmd/common/id.c index 53d8cad830..1465d76b7b 100644 --- a/usr/src/lib/libcmd/common/id.c +++ b/usr/src/lib/libcmd/common/id.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/join.c b/usr/src/lib/libcmd/common/join.c index 909a8e8a29..4ef3c40860 100644 --- a/usr/src/lib/libcmd/common/join.c +++ b/usr/src/lib/libcmd/common/join.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -28,7 +28,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: join (AT&T Research) 2009-08-01 $\n]" +"[-?\n@(#)$Id: join (AT&T Research) 2009-12-10 $\n]" USAGE_LICENSE "[+NAME?join - relational database operator]" "[+DESCRIPTION?\bjoin\b performs an \aequality join\a on the files \afile1\a " @@ -93,6 +93,21 @@ USAGE_LICENSE #include <cmd.h> #include <sfdisc.h> +#if _hdr_wchar && _hdr_wctype && _lib_iswctype + +#include <wchar.h> +#include <wctype.h> + +#else + +#include <ctype.h> + +#ifndef iswspace +#define iswspace(x) isspace(x) +#endif + +#endif + #define C_FILE1 001 #define C_FILE2 002 #define C_COMMON 004 @@ -104,8 +119,15 @@ USAGE_LICENSE #define S_DELIM 1 #define S_SPACE 2 #define S_NL 3 +#define S_WIDE 4 -typedef struct +typedef struct Field_s +{ + char* beg; + char* end; +} Field_t; + +typedef struct File_s { Sfio_t* iop; char* name; @@ -118,10 +140,10 @@ typedef struct int spaces; int hit; int discard; - char** fieldlist; + Field_t* fields; } File_t; -typedef struct +typedef struct Join_s { unsigned char state[1<<CHAR_BIT]; Sfio_t* outfile; @@ -129,9 +151,12 @@ typedef struct int outmode; int ooutmode; char* nullfield; + char* delimstr; int delim; + int delimlen; int buffered; int ignorecase; + int mb; char* same; int samesize; void* context; @@ -147,10 +172,10 @@ done(register Join_t* jp) sfclose(jp->file[1].iop); if (jp->outlist) free(jp->outlist); - if (jp->file[0].fieldlist) - free(jp->file[0].fieldlist); - if (jp->file[1].fieldlist) - free(jp->file[1].fieldlist); + if (jp->file[0].fields) + free(jp->file[0].fields); + if (jp->file[1].fields) + free(jp->file[1].fields); if (jp->same) free(jp->same); free(jp); @@ -160,14 +185,20 @@ static Join_t* init(void) { register Join_t* jp; + register int i; + setlocale(LC_ALL, ""); if (jp = newof(0, Join_t, 1, 0)) { + if (jp->mb = mbwide()) + for (i = 0x80; i <= 0xff; i++) + jp->state[i] = S_WIDE; jp->state[' '] = jp->state['\t'] = S_SPACE; + jp->state['\n'] = S_NL; jp->delim = -1; jp->nullfield = 0; - if (!(jp->file[0].fieldlist = newof(0, char*, NFIELD + 1, 0)) || - !(jp->file[1].fieldlist = newof(0, char*, NFIELD + 1, 0))) + if (!(jp->file[0].fields = newof(0, Field_t, NFIELD + 1, 0)) || + !(jp->file[1].fields = newof(0, Field_t, NFIELD + 1, 0))) { done(jp); return 0; @@ -265,10 +296,11 @@ getrec(Join_t* jp, int index, int discard) { register unsigned char* sp = jp->state; register File_t* fp = &jp->file[index]; - register char** ptr = fp->fieldlist; - register char** ptrmax = ptr + fp->maxfields; + register Field_t* field = fp->fields; + register Field_t* fieldmax = field + fp->maxfields; register char* cp; - register int n = 0; + register int n; + char* tp; if (sh_checksig(jp->context)) return 0; @@ -283,48 +315,148 @@ getrec(Join_t* jp, int index, int discard) } fp->recptr = cp; fp->reclen = sfvalue(fp->iop); - if (jp->delim=='\n') /* handle new-line delimiter specially */ + if (jp->delim == '\n') /* handle new-line delimiter specially */ { - *ptr++ = cp; + field->beg = cp; cp += fp->reclen; + field->end = cp - 1; + field++; } - else while (n!=S_NL) /* separate into fields */ - { - if (ptr >= ptrmax) - { - n = 2*fp->maxfields; - fp->fieldlist = newof(fp->fieldlist, char*, n + 1, 0); - ptr = fp->fieldlist + fp->maxfields; - fp->maxfields = n; - ptrmax = fp->fieldlist+n; - } - *ptr++ = cp; - if (jp->delim<=0 && sp[*(unsigned char*)cp]==S_SPACE) + else + do /* separate into fields */ { - fp->spaces = 1; - while (sp[*(unsigned char*)cp++]==S_SPACE); - cp--; - } - while ((n=sp[*(unsigned char*)cp++])==0); - } - *ptr = cp; - fp->nfields = ptr - fp->fieldlist; - if ((n=fp->field) < fp->nfields) + if (field >= fieldmax) + { + n = 2 * fp->maxfields; + fp->fields = newof(fp->fields, Field_t, n + 1, 0); + field = fp->fields + fp->maxfields; + fp->maxfields = n; + fieldmax = fp->fields + n; + } + field->beg = cp; + if (jp->delim == -1) + { + switch (sp[*(unsigned char*)cp]) + { + case S_SPACE: + cp++; + break; + case S_WIDE: + tp = cp; + if (iswspace(mbchar(tp))) + { + cp = tp; + break; + } + /*FALLTHROUGH*/ + default: + goto next; + } + fp->spaces = 1; + if (jp->mb) + for (;;) + { + switch (sp[*(unsigned char*)cp++]) + { + case S_SPACE: + continue; + case S_WIDE: + tp = cp - 1; + if (iswspace(mbchar(tp))) + { + cp = tp; + continue; + } + break; + } + break; + } + else + while (sp[*(unsigned char*)cp++]==S_SPACE); + cp--; + } + next: + if (jp->mb) + { + for (;;) + { + tp = cp; + switch (n = sp[*(unsigned char*)cp++]) + { + case 0: + continue; + case S_WIDE: + cp--; + n = mbchar(cp); + if (n == jp->delim) + { + n = S_DELIM; + break; + } + if (jp->delim == -1 && iswspace(n)) + { + n = S_SPACE; + break; + } + continue; + } + break; + } + field->end = tp; + } + else + { + while (!(n = sp[*(unsigned char*)cp++])); + field->end = cp - 1; + } + field++; + } while (n != S_NL); + fp->nfields = field - fp->fields; + if ((n = fp->field) < fp->nfields) { - cp = fp->fieldlist[n]; + cp = fp->fields[n].beg; /* eliminate leading spaces */ if (fp->spaces) { - while (sp[*(unsigned char*)cp++]==S_SPACE); + if (jp->mb) + for (;;) + { + switch (sp[*(unsigned char*)cp++]) + { + case S_SPACE: + continue; + case S_WIDE: + tp = cp - 1; + if (iswspace(mbchar(tp))) + { + cp = tp; + continue; + } + break; + } + break; + } + else + while (sp[*(unsigned char*)cp++]==S_SPACE); cp--; } - fp->fieldlen = (fp->fieldlist[n+1]-cp)-1; + fp->fieldlen = fp->fields[n].end - cp; return (unsigned char*)cp; } fp->fieldlen = 0; return (unsigned char*)""; } +static unsigned char* +_trace_getrec(Join_t* jp, int index, int discard) +{ + unsigned char* r; + + r = getrec(jp, index, discard); + return r; +} +#define getrec _trace_getrec + #if DEBUG_TRACE static unsigned char* u1,u2,u3; #define getrec(p,n,d) (u1 = getrec(p, n, d), sfprintf(sfstdout, "[G%d#%d@%I*d:%-.8s]", __LINE__, n, sizeof(Sfoff_t), sftell(p->file[n].iop), u1), u1) @@ -341,42 +473,78 @@ outfield(Join_t* jp, int index, register int n, int last) register char* cpmax; register int size; register Sfio_t* iop = jp->outfile; + char* tp; if (n < fp->nfields) { - cp = fp->fieldlist[n]; - cpmax = fp->fieldlist[n+1]; + cp = fp->fields[n].beg; + cpmax = fp->fields[n].end + 1; } else cp = 0; - if ((n=jp->delim)<=0) + if ((n = jp->delim) == -1) { if (cp && fp->spaces) { + register unsigned char* sp = jp->state; + /*eliminate leading spaces */ - while (jp->state[*(unsigned char*)cp++]==S_SPACE); + if (jp->mb) + for (;;) + { + switch (sp[*(unsigned char*)cp++]) + { + case S_SPACE: + continue; + case S_WIDE: + tp = cp - 1; + if (iswspace(mbchar(tp))) + { + cp = tp; + continue; + } + break; + } + break; + } + else + while (sp[*(unsigned char*)cp++]==S_SPACE); cp--; } n = ' '; } + else if (jp->delimstr) + n = -1; if (last) n = '\n'; if (cp) - size = cpmax-cp; + size = cpmax - cp; else size = 0; - if (size<=1) + if (n == -1) + { + if (size<=1) + { + if (jp->nullfield && sfputr(iop, jp->nullfield, -1) < 0) + return -1; + } + else if (sfwrite(iop, cp, size) < 0) + return -1; + if (sfwrite(iop, jp->delimstr, jp->delimlen) < 0) + return -1; + } + else if (size <= 1) { if (!jp->nullfield) - sfputc(iop,n); - else if (sfputr(iop,jp->nullfield,n) < 0) + sfputc(iop, n); + else if (sfputr(iop, jp->nullfield, n) < 0) return -1; } else { last = cp[size-1]; cp[size-1] = n; - if (sfwrite(iop,cp,size) < 0) + if (sfwrite(iop, cp, size) < 0) return -1; cp[size-1] = last; } @@ -735,7 +903,18 @@ b_join(int argc, char** argv, void* context) continue; case 't': jp->state[' '] = jp->state['\t'] = 0; - n= *(unsigned char*)opt_info.arg; + if (jp->mb) + { + cp = opt_info.arg; + jp->delim = mbchar(cp); + if ((n = cp - opt_info.arg) > 1) + { + jp->delimlen = n; + jp->delimstr = opt_info.arg; + continue; + } + } + n = *(unsigned char*)opt_info.arg; jp->state[n] = S_DELIM; jp->delim = n; continue; @@ -802,7 +981,6 @@ b_join(int argc, char** argv, void* context) sfsetbuf(jp->file[0].iop, jp->file[0].iop, SF_UNBOUND); sfsetbuf(jp->file[1].iop, jp->file[1].iop, SF_UNBOUND); } - jp->state['\n'] = S_NL; jp->outfile = sfstdout; if (!jp->outlist) jp->nullfield = 0; diff --git a/usr/src/lib/libcmd/common/ln.c b/usr/src/lib/libcmd/common/ln.c index 94da7be389..c898e7fb05 100644 --- a/usr/src/lib/libcmd/common/ln.c +++ b/usr/src/lib/libcmd/common/ln.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/logname.c b/usr/src/lib/libcmd/common/logname.c index 6ca5b02e0b..d23f694c7f 100644 --- a/usr/src/lib/libcmd/common/logname.c +++ b/usr/src/lib/libcmd/common/logname.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/md5sum.c b/usr/src/lib/libcmd/common/md5sum.c index c4cafa98c7..28a1c435e4 100644 --- a/usr/src/lib/libcmd/common/md5sum.c +++ b/usr/src/lib/libcmd/common/md5sum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/mkdir.c b/usr/src/lib/libcmd/common/mkdir.c index 5ccce98221..491d990f64 100644 --- a/usr/src/lib/libcmd/common/mkdir.c +++ b/usr/src/lib/libcmd/common/mkdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: mkdir (AT&T Research) 2007-04-25 $\n]" +"[-?\n@(#)$Id: mkdir (AT&T Research) 2009-12-03 $\n]" USAGE_LICENSE "[+NAME?mkdir - make directories]" "[+DESCRIPTION?\bmkdir\b creates one or more directories. By " @@ -43,6 +43,8 @@ USAGE_LICENSE "dir\v where the \b-m\b mode option represents that option supplied to " "the original invocation of \bmkdir\b, if any. Each dir operand that " "names an existing directory shall be ignored without error.]" +"[v:verbose?Print a message on the standard error for each created " + "directory.]" "\n" "\ndirectory ...\n" "\n" @@ -68,6 +70,7 @@ b_mkdir(int argc, char** argv, void* context) register mode_t mask = 0; register int mflag = 0; register int pflag = 0; + register int vflag = 0; char* name; mode_t dmode; struct stat st; @@ -79,15 +82,18 @@ b_mkdir(int argc, char** argv, void* context) { case 0: break; - case 'p': - pflag = 1; - continue; case 'm': mflag = 1; mode = strperm(arg = opt_info.arg, &opt_info.arg, mode); if (*opt_info.arg) error(ERROR_exit(0), "%s: invalid mode", arg); continue; + case 'p': + pflag = 1; + continue; + case 'v': + vflag = 1; + continue; case ':': error(2, "%s", opt_info.arg); continue; @@ -149,6 +155,8 @@ b_mkdir(int argc, char** argv, void* context) error(ERROR_system(0), "%s:", name); break; } + if (vflag) + error(0, "%s: directory created", name); if (!(*arg = n) && (mode & (S_ISVTX|S_ISUID|S_ISGID))) { if (stat(name, &st)) @@ -164,6 +172,8 @@ b_mkdir(int argc, char** argv, void* context) } } } + else if (vflag) + error(0, "%s: directory created", arg); } if (mask) umask(mask); diff --git a/usr/src/lib/libcmd/common/mkfifo.c b/usr/src/lib/libcmd/common/mkfifo.c index 8692c0702d..f44e10aa01 100644 --- a/usr/src/lib/libcmd/common/mkfifo.c +++ b/usr/src/lib/libcmd/common/mkfifo.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/mktemp.c b/usr/src/lib/libcmd/common/mktemp.c index 2936a56e22..a9444045de 100644 --- a/usr/src/lib/libcmd/common/mktemp.c +++ b/usr/src/lib/libcmd/common/mktemp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -21,7 +21,7 @@ #pragma prototyped static const char usage[] = -"[-?\n@(#)$Id: mktemp (AT&T Research) 2009-06-19 $\n]" +"[-?\n@(#)$Id: mktemp (AT&T Research) 2010-03-05 $\n]" USAGE_LICENSE "[+NAME?mktemp - make temporary file or directory]" "[+DESCRIPTION?\bmktemp\b creates a temporary file with optional base " @@ -34,12 +34,12 @@ USAGE_LICENSE "{" "[+*?Lower case to avoid clashes on case ignorant filesystems.]" "[+*?Pseudo-random part to deter denial of service attacks.]" - "[+*?Pseudo-random part is \a3-chars\a.\a3-chars\a to accomodate " - "8.3 filesystems.]" + "[+*?Default pseudo-random part (no specific \bX...\b template) " + "formatted to accomodate 8.3 filesystems.]" "}" -"[+?A consecutive sequence of \bX\b's in \aprefix\a is replaced by the " - "pseudo-random part. If there are no \bX\b's then the pseudo-random part " - "is appended to the prefix.]" +"[+?A consecutive trailing sequence of \bX\b's in \aprefix\a is replaced " + "by the pseudo-random part. If there are no \bX\b's then the " + "pseudo-random part is appended to the prefix.]" "[d:directory?Create a directory instead of a regular file.]" "[m:mode]:[mode?Set the mode of the created temporary to \amode\a. " "\amode\a is symbolic or octal mode as in \bchmod\b(1). Relative modes " @@ -47,10 +47,13 @@ USAGE_LICENSE "[p:default?Use \adirectory\a if the \bTMPDIR\b environment variable is " "not defined. Implies \b--tmp\b.]:[directory]" "[q:quiet?Suppress file and directory error diagnostics.]" +"[R:regress?The pseudo random generator is seeded with \aseed\a instead " + "of process/system specific transient data. Use for testing " + "only. A seed of \b0\b is silently changed to \b1\b.]#[seed]" "[t:tmp|temporary-directory?Create a path rooted in a temporary " "directory.]" "[u:unsafe|dry-run?Check for file/directory existence but do not create. " - "Who would want to do that.]" + "Use this for testing only.]" "\n" "\n[ prefix ]\n" "\n" @@ -106,6 +109,10 @@ b_mktemp(int argc, char** argv, void* context) unsafe = 1; fdp = 0; continue; + case 'R': + if (!pathtemp(NiL, 0, opt_info.arg, "/seed", NiL)) + error(2, "%s: regression test initializtion failed", opt_info.arg); + continue; case ':': error(2, "%s", opt_info.arg); continue; diff --git a/usr/src/lib/libcmd/common/mv.c b/usr/src/lib/libcmd/common/mv.c index c84c1092bd..1055a9c553 100644 --- a/usr/src/lib/libcmd/common/mv.c +++ b/usr/src/lib/libcmd/common/mv.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/paste.c b/usr/src/lib/libcmd/common/paste.c index 71da3f472a..0c20109dda 100644 --- a/usr/src/lib/libcmd/common/paste.c +++ b/usr/src/lib/libcmd/common/paste.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -29,7 +29,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: paste (AT&T Research) 2008-04-01 $\n]" +"[-?\n@(#)$Id: paste (AT&T Research) 2009-11-28 $\n]" USAGE_LICENSE "[+NAME?paste - merge lines of files]" "[+DESCRIPTION?\bpaste\b concatenates the corresponding lines of a " @@ -69,18 +69,23 @@ USAGE_LICENSE "[+SEE ALSO?\bcut\b(1), \bcat\b(1), \bjoin\b(1)]" ; - #include <cmd.h> +typedef struct Delim_s +{ + const char* chr; + size_t len; +} Delim_t; + /* * paste the lines of the <nstreams> defined in <streams> and put results * to <out> */ -static int paste(int nstream,Sfio_t* streams[],Sfio_t *out, register const char *delim,int dlen) +static int paste(int nstream,Sfio_t* streams[],Sfio_t *out, register const char *delim, int dsiz, int dlen, Delim_t* mp) { register const char *cp; - register int d, n, more=1; + register int d, n, i, z, more=1; register Sfio_t *fp; do { @@ -95,14 +100,21 @@ static int paste(int nstream,Sfio_t* streams[],Sfio_t *out, register const char more = 1; else if(!more) /* first stream with output */ { - if(dlen==1) + if(dsiz == 1) sfnputc(out, *delim, n); else if(dlen>0) { for(d=n; d>dlen; d-=dlen) - sfwrite(out,delim,dlen); + sfwrite(out,delim,dsiz); if(d) - sfwrite(out,delim,d); + { + if(mp) + for (i = z = 0; i < d; i++) + z += mp[i].len; + else + z = d; + sfwrite(out,delim,z); + } } more = n+1; } @@ -117,29 +129,28 @@ static int paste(int nstream,Sfio_t* streams[],Sfio_t *out, register const char register int c; if(d >= dlen) d = 0; - if(c=delim[d++]) + if(mp) + sfwrite(out,mp[d].chr,mp[d].len); + else if(c=delim[d]) sfputc(out,c); + d++; } else if(n==nstream && !streams[n-1] && more) sfputc(out,'\n'); } - } - while(more); + } while(more); return(0); } /* * Handles paste -s, for file <in> to file <out> using delimiters <delim> */ -static int spaste(Sfio_t *in,register Sfio_t* out,register const char *delim,int dlen) +static int spaste(Sfio_t *in,register Sfio_t* out,register const char *delim,int dsiz,int dlen,Delim_t* mp) { register const char *cp; register int d=0; - if(cp = sfgetr(in,'\n',0)) - { - if(sfwrite(out,cp,sfvalue(in)-1) < 0) - return(-1); - } + if((cp = sfgetr(in,'\n',0)) && sfwrite(out,cp,sfvalue(in)-1) < 0) + return(-1); while(cp=sfgetr(in, '\n',0)) { if(dlen) @@ -147,8 +158,11 @@ static int spaste(Sfio_t *in,register Sfio_t* out,register const char *delim,int register int c; if(d >= dlen) d = 0; - if(c=delim[d++]) + if(mp) + sfwrite(out,mp[d].chr,mp[d].len); + else if(c=delim[d]) sfputc(out,c); + d++; } if(sfwrite(out,cp,sfvalue(in)-1) < 0) return(-1); @@ -163,7 +177,9 @@ b_paste(int argc,register char *argv[], void* context) register int n, sflag=0; register Sfio_t *fp, **streams; register char *cp, *delim; - int dlen; + char *ep; + Delim_t *mp; + int dlen, dsiz; char defdelim[2]; cmdinit(argc, argv, context, ERROR_CATALOG, 0); @@ -186,12 +202,38 @@ b_paste(int argc,register char *argv[], void* context) argv += opt_info.index; if(error_info.errors) error(ERROR_usage(2),"%s", optusage(NiL)); - if(delim) - dlen = stresc(delim); - else + if(!delim || !*delim) { - *(delim = defdelim) = '\t'; - dlen = 1; + delim = defdelim; + delim[0] = '\t'; + delim[1] = 0; + } + dlen = dsiz = stresc(delim); + mp = 0; + if (mbwide()) + { + cp = delim; + ep = delim + dlen; + dlen = 0; + while (cp < ep) + { + mbchar(cp); + dlen++; + } + if(dlen < dsiz) + { + if (!(mp = newof(0, Delim_t, dlen, 0))) + error(ERROR_system(1), "out of space"); + cp = delim; + dlen = 0; + while (cp < ep) + { + mp[dlen].chr = cp; + mbchar(cp); + mp[dlen].len = cp - mp[dlen].chr; + dlen++; + } + } } if(cp = *argv) { @@ -214,7 +256,7 @@ b_paste(int argc,register char *argv[], void* context) error(ERROR_system(0),"%s: cannot open",cp); if(fp && sflag) { - if(spaste(fp,sfstdout,delim,dlen) < 0) + if(spaste(fp,sfstdout,delim,dsiz,dlen,mp) < 0) error(ERROR_system(0),"write failed"); if(fp!=sfstdin) sfclose(fp); @@ -224,12 +266,13 @@ b_paste(int argc,register char *argv[], void* context) } while(cp= *argv++); if(!sflag) { - if(error_info.errors==0 && paste(n,streams,sfstdout,delim,dlen) < 0) + if(error_info.errors==0 && paste(n,streams,sfstdout,delim,dsiz,dlen,mp) < 0) error(ERROR_system(0),"write failed"); while(--n>=0) if((fp=streams[n]) && fp!=sfstdin) sfclose(fp); } + if (mp) + free(mp); return(error_info.errors); } - diff --git a/usr/src/lib/libcmd/common/pathchk.c b/usr/src/lib/libcmd/common/pathchk.c index ef27bd2788..6fafac4feb 100644 --- a/usr/src/lib/libcmd/common/pathchk.c +++ b/usr/src/lib/libcmd/common/pathchk.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -230,7 +230,6 @@ static int pathchk(char* path, int mode) int b_pathchk(int argc, char** argv, void* context) { - register int n; register int mode = 0; register char* s; diff --git a/usr/src/lib/libcmd/common/pids.c b/usr/src/lib/libcmd/common/pids.c index 432b46f345..e88ac96ce3 100644 --- a/usr/src/lib/libcmd/common/pids.c +++ b/usr/src/lib/libcmd/common/pids.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/rev.c b/usr/src/lib/libcmd/common/rev.c index c67a6a4c9f..5f0a98f4c7 100644 --- a/usr/src/lib/libcmd/common/rev.c +++ b/usr/src/lib/libcmd/common/rev.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/rev.h b/usr/src/lib/libcmd/common/rev.h index c35fbc4ead..2d37ede916 100644 --- a/usr/src/lib/libcmd/common/rev.h +++ b/usr/src/lib/libcmd/common/rev.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/revlib.c b/usr/src/lib/libcmd/common/revlib.c index a2407f122b..90b44a0128 100644 --- a/usr/src/lib/libcmd/common/revlib.c +++ b/usr/src/lib/libcmd/common/revlib.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/rm.c b/usr/src/lib/libcmd/common/rm.c index fbd21583fb..dfcb13f3fc 100644 --- a/usr/src/lib/libcmd/common/rm.c +++ b/usr/src/lib/libcmd/common/rm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -68,7 +68,7 @@ USAGE_LICENSE #include <cmd.h> #include <ls.h> -#include <fts.h> +#include <fts_fix.h> #include <fs3d.h> #define RM_ENTRY 1 diff --git a/usr/src/lib/libcmd/common/rmdir.c b/usr/src/lib/libcmd/common/rmdir.c index c7acb197f9..b57eebb60b 100644 --- a/usr/src/lib/libcmd/common/rmdir.c +++ b/usr/src/lib/libcmd/common/rmdir.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/stty.c b/usr/src/lib/libcmd/common/stty.c index a7754f447c..1a696a78b4 100644 --- a/usr/src/lib/libcmd/common/stty.c +++ b/usr/src/lib/libcmd/common/stty.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/sum.c b/usr/src/lib/libcmd/common/sum.c index 8b16197863..9f26249153 100644 --- a/usr/src/lib/libcmd/common/sum.c +++ b/usr/src/lib/libcmd/common/sum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/sync.c b/usr/src/lib/libcmd/common/sync.c index 863211c225..16ccfeb718 100644 --- a/usr/src/lib/libcmd/common/sync.c +++ b/usr/src/lib/libcmd/common/sync.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/tail.c b/usr/src/lib/libcmd/common/tail.c index ca128f2938..b65ec1a9f3 100644 --- a/usr/src/lib/libcmd/common/tail.c +++ b/usr/src/lib/libcmd/common/tail.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -28,7 +28,7 @@ */ static const char usage[] = -"+[-?\n@(#)$Id: tail (AT&T Research) 2009-08-25 $\n]" +"+[-?\n@(#)$Id: tail (AT&T Research) 2010-03-23 $\n]" USAGE_LICENSE "[+NAME?tail - output trailing portion of one or more files ]" "[+DESCRIPTION?\btail\b copies one or more input files to standard output " @@ -135,7 +135,8 @@ struct Tail_s Tail_t* next; char* name; Sfio_t* sp; - Sfoff_t last; + Sfoff_t cur; + Sfoff_t end; unsigned long expire; long dev; long ino; @@ -324,7 +325,7 @@ init(Tail_t* tp, Sfoff_t number, int delim, int flags, const char** format) } } } - tp->last = offset; + tp->cur = tp->end = offset; if (flags & LOG) { if (fstat(sffileno(tp->sp), &st)) @@ -410,7 +411,6 @@ b_tail(int argc, char** argv, void* context) char* s; char* t; char* r; - char* e; char* file; Sfoff_t offset; Sfoff_t number = DEFAULT; @@ -418,6 +418,7 @@ b_tail(int argc, char** argv, void* context) struct stat st; const char* format = header_fmt+1; ssize_t z; + ssize_t w; Sfio_t* op; register Tail_t* fp; register Tail_t* pp; @@ -514,7 +515,7 @@ b_tail(int argc, char** argv, void* context) flags |= TIMEOUT; timeout = strelapsed(opt_info.arg, &s, 1); if (*s) - error(ERROR_exit(1), "%s: invalid elapsed time", opt_info.arg); + error(ERROR_exit(1), "%s: invalid elapsed time [%s]", opt_info.arg, s); continue; case 'v': flags |= VERBOSE; @@ -632,40 +633,30 @@ b_tail(int argc, char** argv, void* context) return error_info.errors != 0; pp->next = 0; hp = 0; + n = 1; while (fp = files) { - if (sfsync(sfstdout)) - error(ERROR_system(1), "write error"); -#if 0 - sleep(1); -#else - { - struct timespec rqt = { 0L, 1000000000L/4L }; - (void)nanosleep(&rqt, NULL); - } -#endif - n = 0; + if (n) + n = 0; + else + sleep(1); pp = 0; while (fp) { if (fstat(sffileno(fp->sp), &st)) error(ERROR_system(0), "%s: cannot stat", fp->name); - else if (st.st_size > fp->last || fp->fifo) + else if (fp->fifo || fp->end < st.st_size) { n = 1; if (timeout) fp->expire = NOW + timeout; - z = fp->fifo ? SF_UNBOUND : st.st_size - fp->last; + z = fp->fifo ? SF_UNBOUND : st.st_size - fp->cur; i = 0; if ((s = sfreserve(fp->sp, z, SF_LOCKR)) || (z = sfvalue(fp->sp)) && (s = sfreserve(fp->sp, z, SF_LOCKR)) && (i = 1)) { - if (fp->fifo) - z = sfvalue(fp->sp); - r = 0; - for (e = (t = s) + z; t < e; t++) - if (*t == '\n') - r = t; - if (r || i && (r = e)) + z = sfvalue(fp->sp); + for (r = s + z; r > s && *(r - 1) != '\n'; r--); + if ((w = r - s) || i && (w = z)) { if ((flags & (HEADERS|VERBOSE)) && hp != fp) { @@ -673,13 +664,13 @@ b_tail(int argc, char** argv, void* context) sfprintf(sfstdout, format, fp->name); format = header_fmt; } - z = r - s + 1; - fp->last += z; - sfwrite(sfstdout, s, z); + fp->cur += w; + sfwrite(sfstdout, s, w); } else - z = 0; - sfread(fp->sp, s, z); + w = 0; + sfread(fp->sp, s, w); + fp->end += w; } goto next; } @@ -707,14 +698,16 @@ b_tail(int argc, char** argv, void* context) sfclose(fp->sp); if (pp) pp = pp->next = fp->next; - else if (!(files = files->next)) - return error_info.errors != 0; + else + files = files->next; fp = fp->next; continue; next: pp = fp; fp = fp->next; } + if (sfsync(sfstdout)) + error(ERROR_system(1), "write error"); } } else diff --git a/usr/src/lib/libcmd/common/tee.c b/usr/src/lib/libcmd/common/tee.c index 246b5af9c3..89eb57457f 100644 --- a/usr/src/lib/libcmd/common/tee.c +++ b/usr/src/lib/libcmd/common/tee.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -111,11 +111,9 @@ b_tee(int argc, register char** argv, void* context) { register Tee_t* tp = 0; register int oflag = O_WRONLY|O_TRUNC|O_CREAT|O_BINARY; - register int n; register int* hp; register char* cp; int line; - Sfdisc_t tee_disc; if (argc <= 0) { diff --git a/usr/src/lib/libcmd/common/tty.c b/usr/src/lib/libcmd/common/tty.c index b257290e50..684838578e 100644 --- a/usr/src/lib/libcmd/common/tty.c +++ b/usr/src/lib/libcmd/common/tty.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/uname.c b/usr/src/lib/libcmd/common/uname.c index 74cbd39ebe..88ceec400d 100644 --- a/usr/src/lib/libcmd/common/uname.c +++ b/usr/src/lib/libcmd/common/uname.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -34,7 +34,7 @@ USAGE_LICENSE "[+DESCRIPTION?By default \buname\b writes the operating system name to" " standard output. When options are specified, one or more" " system characteristics are written to standard output, space" -" separated, on a single line. When more than one option is specifed" +" separated, on a single line. When more than one option is specified" " the output is in the order specfied by the \b-A\b option below." " Unsupported option values are listed as \a[option]]\a. If any unknown" " options are specified then the local \b/usr/bin/uname\b is called.]" diff --git a/usr/src/lib/libcmd/common/uniq.c b/usr/src/lib/libcmd/common/uniq.c index bf87a2a15a..78fee1c603 100644 --- a/usr/src/lib/libcmd/common/uniq.c +++ b/usr/src/lib/libcmd/common/uniq.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -26,7 +26,7 @@ */ static const char usage[] = -"[-n?\n@(#)$Id: uniq (AT&T Research) 2009-08-10 $\n]" +"[-n?\n@(#)$Id: uniq (AT&T Research) 2009-11-28 $\n]" USAGE_LICENSE "[+NAME?uniq - Report or filter out repeated lines in a file]" "[+DESCRIPTION?\buniq\b reads the input, compares adjacent lines, and " @@ -84,8 +84,8 @@ typedef int (*Compare_f)(const char*, const char*, size_t); static int uniq(Sfio_t *fdin, Sfio_t *fdout, int fields, int chars, int width, int mode, int* all, Compare_f compare) { - register int n, f, outsize=0; - register char *cp, *ep, *bufp, *outp; + register int n, f, outsize=0, mb = mbwide(); + register char *cp, *ep, *mp, *bufp, *outp; char *orecp, *sbufp=0, *outbuff; int reclen,oreclen= -1,count=0,cwidth=0,sep,next; if(mode&C_FLAG) @@ -102,30 +102,50 @@ static int uniq(Sfio_t *fdin, Sfio_t *fdout, int fields, int chars, int width, i } else n = 0; - if(n) + if (n) { cp = bufp; ep = cp + n; - if(f=fields) - while(f-->0 && cp<ep) /* skip over fields */ + if (f = fields) + while (f-->0 && cp<ep) /* skip over fields */ { - while(cp<ep && *cp==' ' || *cp=='\t') + while (cp<ep && *cp==' ' || *cp=='\t') cp++; - while(cp<ep && *cp!=' ' && *cp!='\t') + while (cp<ep && *cp!=' ' && *cp!='\t') cp++; } - if(chars) - cp += chars; - if((reclen = n - (cp-bufp)) <=0) + if (chars) + { + if (mb) + for (f = chars; f; f--) + mbchar(cp); + else + cp += chars; + } + if ((reclen = n - (cp - bufp)) <= 0) { reclen = 1; - cp = bufp + sfvalue(fdin)-1; + cp = bufp + n - 1; + } + else if (width >= 0 && width < reclen) + { + if (mb) + { + reclen = 0; + mp = cp; + while (reclen < width && mp < ep) + { + reclen++; + mbchar(mp); + } + reclen = mp - cp; + } + else + reclen = width; } - else if(width >= 0 && width < reclen) - reclen = width; } else - reclen=-2; + reclen = -2; if(reclen==oreclen && (!reclen || !(*compare)(cp,orecp,reclen))) { count++; diff --git a/usr/src/lib/libcmd/common/vmstate.c b/usr/src/lib/libcmd/common/vmstate.c new file mode 100644 index 0000000000..79722972d2 --- /dev/null +++ b/usr/src/lib/libcmd/common/vmstate.c @@ -0,0 +1,163 @@ +/*********************************************************************** +* * +* This software is part of the ast package * +* Copyright (c) 1992-2010 AT&T Intellectual Property * +* and is licensed under the * +* Common Public License, Version 1.0 * +* by AT&T Intellectual Property * +* * +* A copy of the License is available at * +* http://www.opensource.org/licenses/cpl1.0.txt * +* (with md5 checksum 059e8cd6165cb4c31e351f2b69388fd9) * +* * +* Information and Software Systems Research * +* AT&T Research * +* Florham Park NJ * +* * +* Glenn Fowler <gsf@research.att.com> * +* David Korn <dgk@research.att.com> * +* * +***********************************************************************/ +#pragma prototyped + +#define FORMAT "region=%(region)p size=%(size)d segments=%(segments)d busy=(%(busy_size)d,%(busy_blocks)d,%(busy_max)d) free=(%(free_size)d,%(free_blocks)d,%(free_max)d)" + +static const char usage[] = +"[-?\n@(#)$Id: vmstate (AT&T Research) 2010-03-05 $\n]" +USAGE_LICENSE +"[+NAME?vmstate - list the calling process vmalloc region state]" +"[+DESCRIPTION?When invoked as a shell builtin, \bvmstate\b lists the " + "calling process \bvmalloc\b(3) state for all regions.]" +"[f:format?List the ids specified by \aformat\a. \aformat\a follows " + "\bprintf\b(3) conventions, except that \bsfio\b(3) inline ids are used " + "instead of arguments: " + "%[-+]][\awidth\a[.\aprecis\a[.\abase\a]]]]]](\aid\a)\achar\a. The " + "supported \aid\as are:]:[format:=" FORMAT "]" + "{" + "[+size?The total region size.]" + "[+segments?The number of segments in the region.]" + "[+busy_size?The total busy block size.]" + "[+busy_blocks?The number of busy blocks.]" + "[+busy_max?The maximum busy block size.]" + "[+free_size?The total free block size.]" + "[+free_blocks?The number of free blocks.]" + "[+free_max?The maximum free block size.]" + "}" +"[+SEE ALSO?\bvmalloc\b(3)]" +; + +#include <cmd.h> +#include <vmalloc.h> + +typedef struct State_s +{ + char* format; + Vmalloc_t* vm; + Vmstat_t vs; + unsigned int regions; + Vmalloc_t* region[256]; +} State_t; + +/* + * sfkeyprintf() lookup + * handle==0 for heading + */ + +static int +key(void* handle, Sffmt_t* fp, const char* arg, char** ps, Sflong_t* pn) +{ + register State_t* state = (State_t*)handle; + register char* s; + + if (!(s = fp->t_str) || streq(s, "size")) + *pn = state->vs.extent; + else if (streq(s, "region")) + *pn = integralof(state->vm); + else if (streq(s, "segments")) + *pn = state->vs.n_seg; + else if (streq(s, "busy_size")) + *pn = state->vs.s_busy; + else if (streq(s, "busy_blocks")) + *pn = state->vs.n_busy; + else if (streq(s, "busy_max")) + *pn = state->vs.m_busy; + else if (streq(s, "free_size")) + *pn = state->vs.s_free; + else if (streq(s, "free_blocks")) + *pn = state->vs.n_free; + else if (streq(s, "free_max")) + *pn = state->vs.m_free; + else if (streq(s, "format")) + *ps = (char*)state->format; + else + { + error(2, "%s: unknown format identifier", s); + return 0; + } + return 1; +} + +static int +visit(Vmalloc_t* vm, void* addr, size_t size, Vmdisc_t* disc, void* handle) +{ + State_t* state = (State_t*)handle; + Vmstat_t vs; + + if (vm != state->vm) + { + state->vm = vm; + if (state->regions < elementsof(state->region)) + state->region[state->regions++] = vm; + } + return 0; +} + +int +b_vmstate(int argc, char** argv, void* context) +{ + register int i; + State_t state; + + memset(&state, 0, sizeof(state)); + cmdinit(argc, argv, context, ERROR_CATALOG, 0); + for (;;) + { + switch (optget(argv, usage)) + { + case 'f': + state.format = opt_info.arg; + continue; + case '?': + error(ERROR_USAGE|4, "%s", opt_info.arg); + continue; + case ':': + error(2, "%s", opt_info.arg); + continue; + } + break; + } + argv += opt_info.index; + if (error_info.errors || *argv) + error(ERROR_USAGE|4, "%s", optusage(NiL)); + if (!state.format) + state.format = FORMAT; + + /* + * the walk must do no allocations because it locks the regions + */ + + vmwalk(NiL, visit, &state); + + /* + * now we can compute and list the state of each region + */ + + for (i = 0; i < state.regions; i++) + { + state.vm = state.region[i]; + vmstat(state.vm, &state.vs); + sfkeyprintf(sfstdout, &state, state.format, key, NiL); + sfprintf(sfstdout, "\n"); + } + return 0; +} diff --git a/usr/src/lib/libcmd/common/wc.c b/usr/src/lib/libcmd/common/wc.c index 4203fffd3a..7c988872db 100644 --- a/usr/src/lib/libcmd/common/wc.c +++ b/usr/src/lib/libcmd/common/wc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ */ static const char usage[] = -"[-?\n@(#)$Id: wc (AT&T Research) 2000-08-11 $\n]" +"[-?\n@(#)$Id: wc (AT&T Research) 2009-11-28 $\n]" USAGE_LICENSE "[+NAME?wc - print the number of bytes, words, and lines in files]" "[+DESCRIPTION?\bwc\b reads one or more input files and, by default, " diff --git a/usr/src/lib/libcmd/common/wc.h b/usr/src/lib/libcmd/common/wc.h index e23a1ec2c4..cb2a51ed5f 100644 --- a/usr/src/lib/libcmd/common/wc.h +++ b/usr/src/lib/libcmd/common/wc.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libcmd/common/wclib.c b/usr/src/lib/libcmd/common/wclib.c index c7ce5a338a..77732723ab 100644 --- a/usr/src/lib/libcmd/common/wclib.c +++ b/usr/src/lib/libcmd/common/wclib.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -52,7 +52,7 @@ #define eol(c) ((c)&WC_NL) #define mbc(c) ((c)&WC_MB) #define spc(c) ((c)&WC_SP) -#define mbwc(w,p,n) (*ast.mb_towc)(&w,(char*)p,n) +#define mb2wc(w,p,n) (*ast.mb_towc)(&w,(char*)p,n) Wc_t* wc_init(int mode) { @@ -163,6 +163,7 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) { register char* type = wp->type; register unsigned char* cp; + register Sfoff_t nbytes; register Sfoff_t nchars; register Sfoff_t nwords; register Sfoff_t nlines; @@ -179,14 +180,14 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) unsigned char side[32]; sfset(fd,SF_WRITE,1); - nlines = nwords = nchars = 0; + nlines = nwords = nchars = nbytes = 0; wp->longest = 0; if (wp->mb < 0 && (wp->mode & (WC_MBYTE|WC_WORDS))) { cp = buff = endbuff = 0; for (;;) { - if (cp >= endbuff || (n = mbwc(x, cp, endbuff-cp)) < 0) + if (cp >= endbuff || (n = mb2wc(x, cp, endbuff-cp)) < 0) { if ((o = endbuff-cp) < sizeof(side)) { @@ -205,6 +206,7 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) wp->longest = nchars - longest; break; } + nbytes += n; if ((c = sizeof(side) - o) > n) c = n; if (c) @@ -247,6 +249,8 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) } nchars++; } + if (!(wp->mode & WC_MBYTE)) + nchars = nbytes; } else if (!wp->mb && !(wp->mode & WC_LONGEST) || wp->mb > 0 && !(wp->mode & (WC_MBYTE|WC_WORDS|WC_LONGEST))) { @@ -343,6 +347,7 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) xspace = iswspace(0xa0) || iswspace(0x85); while ((cp = buff = (unsigned char*)sfreserve(fd, SF_UNBOUND, 0)) && (c = sfvalue(fd)) > 0) { + nbytes += c; nchars += c; start = cp-lineoff; /* check to see whether first character terminates word */ @@ -487,7 +492,10 @@ int wc_count(Wc_t *wp, Sfio_t *fd, const char* file) nlines++; else if (!lasttype) nwords++; - nchars -= adjust; + if (wp->mode & WC_MBYTE) + nchars -= adjust; + else + nchars = nbytes; } wp->chars = nchars; wp->words = nwords; diff --git a/usr/src/lib/libcmd/i386/include/ast/cmd.h b/usr/src/lib/libcmd/i386/include/ast/cmd.h index f149f8d275..e064222a77 100644 --- a/usr/src/lib/libcmd/i386/include/ast/cmd.h +++ b/usr/src/lib/libcmd/i386/include/ast/cmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -68,8 +68,6 @@ #include <dlldefs.h> -typedef int (*Shbltin_f) __PROTO__((int, char**, __V_*)); - #else extern __MANGLE__ int CMD_STANDALONE __PROTO__((int, char**, __V_*)); @@ -135,7 +133,7 @@ main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** if (fun = (Shbltin_f)dlsym(dll, buf)) break; } - if (dll = dllfind("cmd", NiL, RTLD_LAZY)) + if (dll = dllplug(NiL, "cmd", NiL, RTLD_LAZY, NiL, 0)) { if (fun = (Shbltin_f)dlsym(dll, buf + 1)) break; diff --git a/usr/src/lib/libcmd/i386/include/ast/cmdext.h b/usr/src/lib/libcmd/i386/include/ast/cmdext.h index 416a3dc5a5..978322e2d3 100644 --- a/usr/src/lib/libcmd/i386/include/ast/cmdext.h +++ b/usr/src/lib/libcmd/i386/include/ast/cmdext.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -72,5 +72,6 @@ extern __MANGLE__ int b_tee __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_tty __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uname __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uniq __PROTO__((int, char**, __V_*)); +extern __MANGLE__ int b_vmstate __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_wc __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_xgrep __PROTO__((int, char**, __V_*)); diff --git a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/ids b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/ids index 052b939476..9ebd27114b 100644 --- a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/ids +++ b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/ids @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libcmd/features/ids by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libcmd/features/ids by iffe version 2009-12-04 : : */ #ifndef _def_ids_cmd #define _def_ids_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_endgrent 1 /* endgrent() in default lib(s) */ #define _lib_getgrent 1 /* getgrent() in default lib(s) */ diff --git a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/sockets b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/sockets index e9c9c9e59e..6fb96ec2c6 100644 --- a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/sockets +++ b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/sockets @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libcmd/features/sockets by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libcmd/features/sockets by iffe version 2009-12-04 : : */ #ifndef _def_sockets_cmd #define _def_sockets_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _sys_socket 1 /* #include <sys/socket.h> ok */ #define _hdr_arpa_inet 1 /* #include <arpa/inet.h> ok */ diff --git a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/symlink b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/symlink index b237c3896c..c4a03de88a 100644 --- a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/symlink +++ b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/symlink @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libcmd/features/symlink by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libcmd/features/symlink by iffe version 2009-12-04 : : */ #ifndef _def_symlink_cmd #define _def_symlink_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_lchown 1 /* lchown implemented */ #endif diff --git a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/utsname b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/utsname index 88adc91c75..f66b30e21d 100644 --- a/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/utsname +++ b/usr/src/lib/libcmd/i386/src/lib/libcmd/FEATURE/utsname @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libcmd/features/utsname by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libcmd/features/utsname by iffe version 2009-12-04 : : */ #ifndef _def_utsname_cmd #define _def_utsname_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_getdomainname 1 /* getdomainname() in default lib(s) */ #define _lib_gethostid 1 /* gethostid() in default lib(s) */ diff --git a/usr/src/lib/libcmd/mapfile-vers b/usr/src/lib/libcmd/mapfile-vers index 9e59e44cad..508c396112 100644 --- a/usr/src/lib/libcmd/mapfile-vers +++ b/usr/src/lib/libcmd/mapfile-vers @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -90,6 +89,7 @@ SUNWprivate_1.1 { b_uname; b_uniq; b_wc; + b_vmstate; b_xgrep; local: *; diff --git a/usr/src/lib/libcmd/sparc/include/ast/cmd.h b/usr/src/lib/libcmd/sparc/include/ast/cmd.h index f149f8d275..e064222a77 100644 --- a/usr/src/lib/libcmd/sparc/include/ast/cmd.h +++ b/usr/src/lib/libcmd/sparc/include/ast/cmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -68,8 +68,6 @@ #include <dlldefs.h> -typedef int (*Shbltin_f) __PROTO__((int, char**, __V_*)); - #else extern __MANGLE__ int CMD_STANDALONE __PROTO__((int, char**, __V_*)); @@ -135,7 +133,7 @@ main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** if (fun = (Shbltin_f)dlsym(dll, buf)) break; } - if (dll = dllfind("cmd", NiL, RTLD_LAZY)) + if (dll = dllplug(NiL, "cmd", NiL, RTLD_LAZY, NiL, 0)) { if (fun = (Shbltin_f)dlsym(dll, buf + 1)) break; diff --git a/usr/src/lib/libcmd/sparc/include/ast/cmdext.h b/usr/src/lib/libcmd/sparc/include/ast/cmdext.h index 416a3dc5a5..978322e2d3 100644 --- a/usr/src/lib/libcmd/sparc/include/ast/cmdext.h +++ b/usr/src/lib/libcmd/sparc/include/ast/cmdext.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -72,5 +72,6 @@ extern __MANGLE__ int b_tee __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_tty __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uname __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uniq __PROTO__((int, char**, __V_*)); +extern __MANGLE__ int b_vmstate __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_wc __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_xgrep __PROTO__((int, char**, __V_*)); diff --git a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/ids b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/ids index 19cfcffdf3..bd025699c4 100644 --- a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/ids +++ b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/ids @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libcmd/features/ids by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libcmd/features/ids by iffe version 2009-12-04 : : */ #ifndef _def_ids_cmd #define _def_ids_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_endgrent 1 /* endgrent() in default lib(s) */ #define _lib_getgrent 1 /* getgrent() in default lib(s) */ diff --git a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/sockets b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/sockets index a479cee37b..b5810a47fc 100644 --- a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/sockets +++ b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/sockets @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libcmd/features/sockets by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libcmd/features/sockets by iffe version 2009-12-04 : : */ #ifndef _def_sockets_cmd #define _def_sockets_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _sys_socket 1 /* #include <sys/socket.h> ok */ #define _hdr_arpa_inet 1 /* #include <arpa/inet.h> ok */ diff --git a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/symlink b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/symlink index 1dee0e7af3..00b254f70d 100644 --- a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/symlink +++ b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/symlink @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libcmd/features/symlink by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libcmd/features/symlink by iffe version 2009-12-04 : : */ #ifndef _def_symlink_cmd #define _def_symlink_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_lchown 1 /* lchown implemented */ #endif diff --git a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/utsname b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/utsname index a582177617..93df54b142 100644 --- a/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/utsname +++ b/usr/src/lib/libcmd/sparc/src/lib/libcmd/FEATURE/utsname @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libcmd/features/utsname by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libcmd/features/utsname by iffe version 2009-12-04 : : */ #ifndef _def_utsname_cmd #define _def_utsname_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_getdomainname 1 /* getdomainname() in default lib(s) */ #define _lib_gethostid 1 /* gethostid() in default lib(s) */ diff --git a/usr/src/lib/libcmd/sparcv9/include/ast/cmd.h b/usr/src/lib/libcmd/sparcv9/include/ast/cmd.h index f149f8d275..e064222a77 100644 --- a/usr/src/lib/libcmd/sparcv9/include/ast/cmd.h +++ b/usr/src/lib/libcmd/sparcv9/include/ast/cmd.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -68,8 +68,6 @@ #include <dlldefs.h> -typedef int (*Shbltin_f) __PROTO__((int, char**, __V_*)); - #else extern __MANGLE__ int CMD_STANDALONE __PROTO__((int, char**, __V_*)); @@ -135,7 +133,7 @@ main __PARAM__((int argc, char** argv), (argc, argv)) __OTORP__(int argc; char** if (fun = (Shbltin_f)dlsym(dll, buf)) break; } - if (dll = dllfind("cmd", NiL, RTLD_LAZY)) + if (dll = dllplug(NiL, "cmd", NiL, RTLD_LAZY, NiL, 0)) { if (fun = (Shbltin_f)dlsym(dll, buf + 1)) break; diff --git a/usr/src/lib/libcmd/sparcv9/include/ast/cmdext.h b/usr/src/lib/libcmd/sparcv9/include/ast/cmdext.h index 416a3dc5a5..978322e2d3 100644 --- a/usr/src/lib/libcmd/sparcv9/include/ast/cmdext.h +++ b/usr/src/lib/libcmd/sparcv9/include/ast/cmdext.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1992-2009 AT&T Intellectual Property * +* Copyright (c) 1992-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -72,5 +72,6 @@ extern __MANGLE__ int b_tee __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_tty __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uname __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_uniq __PROTO__((int, char**, __V_*)); +extern __MANGLE__ int b_vmstate __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_wc __PROTO__((int, char**, __V_*)); extern __MANGLE__ int b_xgrep __PROTO__((int, char**, __V_*)); diff --git a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/ids b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/ids index ce23090155..9560cee811 100644 --- a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/ids +++ b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/ids @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libcmd/features/ids by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libcmd/features/ids by iffe version 2009-12-04 : : */ #ifndef _def_ids_cmd #define _def_ids_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_endgrent 1 /* endgrent() in default lib(s) */ #define _lib_getgrent 1 /* getgrent() in default lib(s) */ diff --git a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/sockets b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/sockets index f6681b51f8..1f7dcfa50d 100644 --- a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/sockets +++ b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/sockets @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libcmd/features/sockets by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libcmd/features/sockets by iffe version 2009-12-04 : : */ #ifndef _def_sockets_cmd #define _def_sockets_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _sys_socket 1 /* #include <sys/socket.h> ok */ #define _hdr_arpa_inet 1 /* #include <arpa/inet.h> ok */ diff --git a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/symlink b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/symlink index c52367e2ef..bf182d7859 100644 --- a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/symlink +++ b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/symlink @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libcmd/features/symlink by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libcmd/features/symlink by iffe version 2009-12-04 : : */ #ifndef _def_symlink_cmd #define _def_symlink_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_lchown 1 /* lchown implemented */ #endif diff --git a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/utsname b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/utsname index ed90329740..4e3f4bcd4f 100644 --- a/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/utsname +++ b/usr/src/lib/libcmd/sparcv9/src/lib/libcmd/FEATURE/utsname @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libcmd/features/utsname by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libcmd/features/utsname by iffe version 2009-12-04 : : */ #ifndef _def_utsname_cmd #define _def_utsname_cmd 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _lib_getdomainname 1 /* getdomainname() in default lib(s) */ #define _lib_gethostid 1 /* gethostid() in default lib(s) */ diff --git a/usr/src/lib/libdll/amd64/src/lib/libdll/FEATURE/dll b/usr/src/lib/libdll/amd64/src/lib/libdll/FEATURE/dll index 87c04d9ca8..6c7a005b64 100644 --- a/usr/src/lib/libdll/amd64/src/lib/libdll/FEATURE/dll +++ b/usr/src/lib/libdll/amd64/src/lib/libdll/FEATURE/dll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/amd64/src/lib/libdll/dlldefs.h b/usr/src/lib/libdll/amd64/src/lib/libdll/dlldefs.h index 87c04d9ca8..6c7a005b64 100644 --- a/usr/src/lib/libdll/amd64/src/lib/libdll/dlldefs.h +++ b/usr/src/lib/libdll/amd64/src/lib/libdll/dlldefs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/common/RELEASE b/usr/src/lib/libdll/common/RELEASE index 7aeac9e025..14edf74176 100644 --- a/usr/src/lib/libdll/common/RELEASE +++ b/usr/src/lib/libdll/common/RELEASE @@ -1,3 +1,4 @@ +09-11-17 dllscan.c: handle name[-.]version in dlsopen() 09-04-15 dllopen.c: add, use dllopen() internally to wrap dlopen() 08-05-12 dllscan.c: LIBSUFFIX==.dylib => default plugin version match 0.0 06-10-11 dllscan.c: check sfstruse() return values -- doh diff --git a/usr/src/lib/libdll/common/dlfcn.c b/usr/src/lib/libdll/common/dlfcn.c index 08fd774181..9707eb6b80 100644 --- a/usr/src/lib/libdll/common/dlfcn.c +++ b/usr/src/lib/libdll/common/dlfcn.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dllfind.c b/usr/src/lib/libdll/common/dllfind.c index 88b2fd1015..536f73a3cd 100644 --- a/usr/src/lib/libdll/common/dllfind.c +++ b/usr/src/lib/libdll/common/dllfind.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dlllook.c b/usr/src/lib/libdll/common/dlllook.c index a9d7c97dce..f9d8e03267 100644 --- a/usr/src/lib/libdll/common/dlllook.c +++ b/usr/src/lib/libdll/common/dlllook.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dllnext.c b/usr/src/lib/libdll/common/dllnext.c index 012a01b0e1..178a053d52 100644 --- a/usr/src/lib/libdll/common/dllnext.c +++ b/usr/src/lib/libdll/common/dllnext.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dllopen.c b/usr/src/lib/libdll/common/dllopen.c index 19c057d792..f0a0609bd6 100644 --- a/usr/src/lib/libdll/common/dllopen.c +++ b/usr/src/lib/libdll/common/dllopen.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dllplug.c b/usr/src/lib/libdll/common/dllplug.c index e0c9dc61cf..a4a623dced 100644 --- a/usr/src/lib/libdll/common/dllplug.c +++ b/usr/src/lib/libdll/common/dllplug.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libdll/common/dllscan.c b/usr/src/lib/libdll/common/dllscan.c index 85389152cb..811c2d61ed 100644 --- a/usr/src/lib/libdll/common/dllscan.c +++ b/usr/src/lib/libdll/common/dllscan.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1997-2009 AT&T Intellectual Property * +* Copyright (c) 1997-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -266,6 +266,19 @@ dllsopen(const char* lib, const char* name, const char* version) memcpy(scan->pb, name, t - (char*)name); name = (const char*)(t + 1); } + if (name && !version) + for (t = (char*)name; *t; t++) + if ((*t == '-' || *t == '.' || *t == '?') && isdigit(*(t + 1))) + { + if (*t != '-') + scan->flags |= DLL_MATCH_VERSION; + version = t + 1; + if (!(s = vmnewof(vm, 0, char, t - (char*)name, 1))) + goto bad; + memcpy(s, name, t - (char*)name); + name = (const char*)s; + break; + } if (!version) { scan->flags |= DLL_MATCH_VERSION; @@ -283,10 +296,7 @@ dllsopen(const char* lib, const char* name, const char* version) sfsprintf(scan->nam, sizeof(scan->nam), "%s", s); } else - { - scan->flags |= DLL_MATCH_VERSION; sfsprintf(scan->nam, sizeof(scan->nam), "%s%s%s.%s", info->prefix, name, info->suffix, version); - } if (scan->flags & (DLL_MATCH_NAME|DLL_MATCH_VERSION)) { if (scan->flags & DLL_INFO_PREVER) diff --git a/usr/src/lib/libdll/i386/src/lib/libdll/FEATURE/dll b/usr/src/lib/libdll/i386/src/lib/libdll/FEATURE/dll index e881151555..8f1dfc4543 100644 --- a/usr/src/lib/libdll/i386/src/lib/libdll/FEATURE/dll +++ b/usr/src/lib/libdll/i386/src/lib/libdll/FEATURE/dll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/i386/src/lib/libdll/dlldefs.h b/usr/src/lib/libdll/i386/src/lib/libdll/dlldefs.h index e881151555..8f1dfc4543 100644 --- a/usr/src/lib/libdll/i386/src/lib/libdll/dlldefs.h +++ b/usr/src/lib/libdll/i386/src/lib/libdll/dlldefs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/sparc/src/lib/libdll/FEATURE/dll b/usr/src/lib/libdll/sparc/src/lib/libdll/FEATURE/dll index 646bf17ba5..7f5cd08a38 100644 --- a/usr/src/lib/libdll/sparc/src/lib/libdll/FEATURE/dll +++ b/usr/src/lib/libdll/sparc/src/lib/libdll/FEATURE/dll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/sparc/src/lib/libdll/dlldefs.h b/usr/src/lib/libdll/sparc/src/lib/libdll/dlldefs.h index 646bf17ba5..7f5cd08a38 100644 --- a/usr/src/lib/libdll/sparc/src/lib/libdll/dlldefs.h +++ b/usr/src/lib/libdll/sparc/src/lib/libdll/dlldefs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/sparcv9/src/lib/libdll/FEATURE/dll b/usr/src/lib/libdll/sparcv9/src/lib/libdll/FEATURE/dll index 1d012283e9..306ed8c1d5 100644 --- a/usr/src/lib/libdll/sparcv9/src/lib/libdll/FEATURE/dll +++ b/usr/src/lib/libdll/sparcv9/src/lib/libdll/FEATURE/dll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libdll/sparcv9/src/lib/libdll/dlldefs.h b/usr/src/lib/libdll/sparcv9/src/lib/libdll/dlldefs.h index 1d012283e9..306ed8c1d5 100644 --- a/usr/src/lib/libdll/sparcv9/src/lib/libdll/dlldefs.h +++ b/usr/src/lib/libdll/sparcv9/src/lib/libdll/dlldefs.h @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libdll/features/dll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libdll/features/dll by iffe version 2009-12-04 : : */ #ifndef _def_dll_dll #if !defined(__PROTO__) @@ -63,7 +63,7 @@ #define _def_dll_dll 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_dlfcn 1 /* #include <dlfcn.h> ok */ #define _LIB_dl 1 /* -ldl is a library */ diff --git a/usr/src/lib/libshell/Makefile.demo b/usr/src/lib/libshell/Makefile.demo index 58924e6285..0365970d0e 100644 --- a/usr/src/lib/libshell/Makefile.demo +++ b/usr/src/lib/libshell/Makefile.demo @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # ROOTDEMODIRBASE= $(ROOT)/usr/demo/ksh @@ -122,8 +121,10 @@ DEMOFILES= \ tests/sun_solaris_builtin_sum.sh \ tests/sun_solaris_builtin_tail.sh \ tests/sun_solaris_command_substitution.sh \ + tests/sun_solaris_compound_misc.sh \ tests/sun_solaris_compound_nameref.sh \ tests/sun_solaris_compoundvario.sh \ + tests/sun_solaris_cr_xxxxxxxx_template.sh \ tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh \ tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh \ tests/sun_solaris_cr_6722134_background_CHLD_trap.sh \ @@ -145,7 +146,13 @@ DEMOFILES= \ tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh \ tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh \ tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh \ + tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh \ + tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh \ + tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh \ + tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh \ + tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh \ tests/sun_solaris_getconf.sh \ + tests/sun_solaris_locale_misc.sh \ tests/sun_solaris_local_compound_nameref001.sh \ tests/sun_solaris_staticvariables.sh \ tests/sun_solaris_vartree001.sh \ @@ -164,12 +171,8 @@ $(ROOTDEMODIRBASE)/tests/shtests := FILEMODE= 755 $(ROOTDEMODIRBASE)/fun/% := FILEMODE= 755 $(ROOTDEMODIRBASE)/bin/% := FILEMODE= 755 -# ToDO: We should replace the "cat $<" below with $ shcomp $< # once the -# build machines start to ship /usr/bin/shcomp to compile the scripts -# in bin/ and use $ shcomp -n $< /dev/null 2>&1 # to do minimum lint-style -# checks before installation. $(ROOTDEMODIRBASE)/bin/%: common/scripts/%.sh - cat "$<" >"$(@F)" + /usr/bin/shcomp "$<" >"$(@F)" $(INS) -s -m $(FILEMODE) -f $(@D) "$(@F)" $(RM) "$(@F)" diff --git a/usr/src/lib/libshell/amd64/include/ast/history.h b/usr/src/lib/libshell/amd64/include/ast/history.h index 0159773f4d..1b0f3ce403 100644 --- a/usr/src/lib/libshell/amd64/include/ast/history.h +++ b/usr/src/lib/libshell/amd64/include/ast/history.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/amd64/include/ast/nval.h b/usr/src/lib/libshell/amd64/include/ast/nval.h index a81d34b84a..f5be4fa865 100644 --- a/usr/src/lib/libshell/amd64/include/ast/nval.h +++ b/usr/src/lib/libshell/amd64/include/ast/nval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/amd64/include/ast/shell.h b/usr/src/lib/libshell/amd64/include/ast/shell.h index b5d87afc94..a8c1d85c3b 100644 --- a/usr/src/lib/libshell/amd64/include/ast/shell.h +++ b/usr/src/lib/libshell/amd64/include/ast/shell.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/acct b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/acct index 6282d28a47..7206f410fa 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/acct +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/acct @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_acct_ksh93 #define _def_acct_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_acct 1 /* acct() in default lib(s) */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/cmds b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/cmds index 71d68caeae..0cc37f2781 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/cmds +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/cmds @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/cmds by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/cmds by iffe version 2009-12-04 : : */ #ifndef _def_cmds_ksh93 #define _def_cmds_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _cmd_newgrp 1 /* newgrp in ?(/usr)/(bin|etc|ucb) */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/dynamic b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/dynamic index d13667da0b..0e3fdfa1b3 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/dynamic +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/dynamic @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/dynamic by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/dynamic by iffe version 2009-12-04 : : */ #ifndef _def_dynamic_ksh93 #define _def_dynamic_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #if SHOPT_DYNAMIC diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/execargs b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/execargs index 070a127da3..53e7f14ddb 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/execargs +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/execargs @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_execargs_ksh93 #define _def_execargs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/externs b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/externs index 66abda8ba9..c1fa9f9ee1 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/externs +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/externs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/externs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/externs by iffe version 2009-12-04 : : */ #ifndef _def_externs_ksh93 #if !defined(__PROTO__) @@ -63,10 +63,10 @@ #define _def_externs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_exec_attr 1 /* #include <exec_attr.h> ok */ @@ -75,10 +75,12 @@ #define _lib_setreuid 1 /* setreuid() in default lib(s) */ #define _lib_setregid 1 /* setregid() in default lib(s) */ #define _lib_nice 1 /* nice() in default lib(s) */ -#define _lib_sigflag 1 /* sigflag() in default lib(s) */ #define _lib_fork 1 /* fork() in default lib(s) */ #define _lib_spawnveg 1 /* spawnveg() in default lib(s) */ #define _lib_fchdir 1 /* fchdir() in default lib(s) */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memcntl 1 /* memcntl() in default lib(s) */ +#define _LIB_secdb 1 /* -lsecdb is a library */ +#define _lib_getexecuser 1 /* getexecuser() in default lib(s) */ +#define _lib_free_execattr 1 /* free_execattr() in default lib(s) */ #endif diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/locale b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/locale index dec6103584..92a8838fc4 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/locale +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/locale @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/locale by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/locale by iffe version 2009-12-04 : : */ #ifndef _def_locale_ksh93 #define _def_locale_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_locale 1 /* #include <locale.h> ok */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/math b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/math index e11378591b..91c42367be 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/math +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/math @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/math.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/math.sh by iffe version 2009-12-04 : : */ #ifndef _def_math_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,15 +62,15 @@ #define _def_math_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ -/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/data/math.tab : : */ +/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/data/math.tab : : */ typedef Sfdouble_t (*Math_f) __PROTO__((Sfdouble_t,...)); diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/options b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/options index eee9524c79..9d0e8e990a 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/options +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/options @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/options by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/options by iffe version 2009-12-04 : : */ #ifndef _def_options_ksh93 #define _def_options_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define SHELLMAGIC 1 diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/poll b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/poll index d3590e8d73..6626a56a90 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/poll +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/poll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/poll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/poll by iffe version 2009-12-04 : : */ #ifndef _def_poll_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,10 +62,10 @@ #define _def_poll_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_poll 1 /* #include <poll.h> ok */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/pstat b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/pstat index 2ad9d1c5ea..7e03d66551 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/pstat +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/pstat @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_pstat_ksh93 #define _def_pstat_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/rlimits b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/rlimits index 15bdcad01d..64cf916a2b 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/rlimits +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/rlimits @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/rlimits by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/rlimits by iffe version 2009-12-04 : : */ #ifndef _def_rlimits_ksh93 #define _def_rlimits_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _sys_resource 1 /* #include <sys/resource.h> ok */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/setjmp b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/setjmp index 19cc1b9719..bd4a7ccd92 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/setjmp +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/setjmp @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/setjmp by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/setjmp by iffe version 2009-12-04 : : */ #ifndef _def_setjmp_ksh93 #define _def_setjmp_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigsetjmp 1 /* sigsetjmp() in default lib(s) */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/sigfeatures b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/sigfeatures index 6f4ad9835d..0b40374d91 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/sigfeatures +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/sigfeatures @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-12-04 : : */ #ifndef _def_sigfeatures_ksh93 #define _def_sigfeatures_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigrelse 1 /* sigrelse() in default lib(s) */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/time b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/time index 9efb09e58c..cb3d0aeb3d 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/time +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/time @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ksh93 #define _def_time_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_utime 1 /* #include <utime.h> ok */ diff --git a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/ttys b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/ttys index 564720fc11..43f3314feb 100644 --- a/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/ttys +++ b/usr/src/lib/libshell/amd64/src/cmd/ksh93/FEATURE/ttys @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/cmd/ksh93/features/ttys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/cmd/ksh93/features/ttys by iffe version 2009-12-04 : : */ #ifndef _def_ttys_ksh93 #define _def_ttys_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_termios 1 /* #include <termios.h> ok */ diff --git a/usr/src/lib/libshell/common/RELEASE b/usr/src/lib/libshell/common/RELEASE index ad43ff6b45..b8fc92511a 100644 --- a/usr/src/lib/libshell/common/RELEASE +++ b/usr/src/lib/libshell/common/RELEASE @@ -1,4 +1,73 @@ -09-10-12 --- Release ksh93t+ --- +10-03-05 --- Release ksh93t+ --- +10-03-05 A varibale unset memory leak has been fixed and tests/leaks.sh + has been added to verify the fix. +10-03-04 Documentation, comment, and disgnostic spelling typos corrected. +10-02-14 Fix sh_getenv() initialization to cooperate with the 3d fs. +10-02-12 A bug in which the get discipline function was not invoked for + associative array subscripts for unset array elements has been fixed. +10-02-12 A bug which could occur if the last line of a script was an eval + that executed multiple commands has been fixed. +10-02-02 A buffer overflow in read and another in binary type base64 + encoding were fixed. +10-01-20 A bug in the evaluation of arithmetic expression in which the + subscript was evaluated twice for $((foo[x++]++)) has been fixed. +10-01-19 A workaround for a double-free of a trap in both a subshell and its + parent has been added. +10-01-18 A bug in type handling of typeset -H has been fixed. +10-01-15 The "adding empty subscript" warning now only emitted with -x set. +10-01-01 A bug in the parser in which '$((case i in i):;esac);:))' was not + parsed correctly was fixed. +10-01-01 A bug in the parser in which '$(( 2 , 3.6 ))' dumped core for locales + with radix char , and thousands separator . has been fixed. +09-12-28 A bug in the handling of SIGCLD on systems that generated SIGCLD + while blocked waiting for process to complete has been fixed. +09-12-24 ast setlocale() reworked to differentiate env var changes from user + override. +09-12-18 A bug with the SHOPT_BGX option set which disabled traps for signals + < SIGCHLD when a trap for a signal > SIGCHLD was set has been fixed. +09-12-18 A bug where [[ -v var ]] was incorrect for some variables (including + LC_* vars) has been fixed. +09-12-15 A bug that produced a syntax error when a multibyte character + straddled a buffer boundary has been fixed. +09-12-11 A bug where the subscript of an unset variable was not evaluated has + been fixed. +09-12-09 A bug where shcomp dumped core on certain syntax errors has been fixed. +09-12-07 A bug where a parent shell environment var reset in a subshell removed + the value in subsequent children of the parent shell has been fixed. +09-12-04 A bug in which in some cases a trap in a function executed in + a subshell could trigger twice has been fixed. +09-12-03 A bug in which SHLVL exported with some attributes could cause + the shell to abort at startup has been fixed. +09-12-02 A bug with pipefail in which the shell could hang waiting for the + writer to complete before the last reader command has been fixed. +09-11-30 A bug in which a trap could be inherited by the first element of + a pipeline when the command had more than 63 arguments that did + not contain any macro expansions has been fixed. +09-11-19 When read from a terminal was called from with a while or foo loop, + and an edit mode was on, a backspace or erase no longer will + overwrite the prompt. +09-11-17 Change .paths parse to handle BUILTIN_LIB=foo BUILTIN_LIB=foo-1.2. +09-11-17 Inside a function, typeset foo.bar will bind foo to global variable + foo if local variable foo does not exist, instead of creating a + local variable. +09-11-17 "read -n1" from the terminal has been fixed to read exactly one character. +09-11-11 Job control now works for subshell commands, (...). +09-11-11 If set -e is on for an interactive shell errors in special builtins + now cause the shell to exit. +09-11-11 A bug in which an interrupt handler processed during the read builtin + when IFS did not contain a new line has been fixed. +09-11-09 A bug in which a variable that has been unset in a subshell and then + exported from that subshell does not show up in the environment + has been fixed. +09-11-02 ``,2'' is now a valid numeric constant for locales with + decimal_point=','. +09-11-02 A bug where "return" in .profile did not restore the shell state + has been fixed. +09-10-31 A bug that corrupted saved exit status when pids wrapped around has + been fixed. +09-10-26 A bug in { LANG LC_ALL LC_category } ordering has been fixed in -last. +09-10-16 A bug where notification to libast that the environment has changed + has been fixed. 09-10-12 A bug in which a function loaded in a subshell could leave side effects in the parent shell has been fixed. 09-10-12 A bug in converting a printf %d operand to a number when the operand @@ -38,7 +107,7 @@ did not display an error message has been fixed. 09-08-24 When processing profiles, ksh93 now violates the POSIX standard and treats &> as a redirection operator similar to bash. -09-08-23 A bug in the handling of the trap on SIGPIPE that could lead to am +09-08-23 A bug in the handling of the trap on SIGPIPE that could lead to a memory fault has been fixed. 09-08-21 A bug in the handling of the comma operator in arithmetic expressions that could cause a core dump on some systems has been fixed. @@ -107,7 +176,7 @@ 09-05-01 A bug that caused a core dump when SIGWINCH was received and both vi and emacs mode were off has been fixed. 09-04-22 Default alias compound='typeset -C' added. -09-04-15 A bug that caused ${...;} to hang for large files has ben fixed. +09-04-15 A bug that caused ${...;} to hang for large files has been fixed. 09-04-08 A change was made in the -n option which printed out an incorrect warning with <>. 09-04-07 The emacs edit command M-_ and M_. and the vi command _ was fixed diff --git a/usr/src/lib/libshell/common/bltins/alarm.c b/usr/src/lib/libshell/common/bltins/alarm.c index 17d8442e01..a52130dd9f 100644 --- a/usr/src/lib/libshell/common/bltins/alarm.c +++ b/usr/src/lib/libshell/common/bltins/alarm.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/cd_pwd.c b/usr/src/lib/libshell/common/bltins/cd_pwd.c index 58a90a42c4..68b4fead8a 100644 --- a/usr/src/lib/libshell/common/bltins/cd_pwd.c +++ b/usr/src/lib/libshell/common/bltins/cd_pwd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -210,7 +210,11 @@ int b_pwd(int argc, char *argv[],void *extra) { register int n, flag = 0; register char *cp; +#if SHOPT_FS_3D register Shell_t *shp = ((Shbltin_t*)extra)->shp; +#else + NOT_USED(extra); +#endif NOT_USED(argc); while((n = optget(argv,sh_optpwd))) switch(n) { diff --git a/usr/src/lib/libshell/common/bltins/cflow.c b/usr/src/lib/libshell/common/bltins/cflow.c index cc50817e4c..4d9d10d7f1 100644 --- a/usr/src/lib/libshell/common/bltins/cflow.c +++ b/usr/src/lib/libshell/common/bltins/cflow.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/enum.c b/usr/src/lib/libshell/common/bltins/enum.c index 487f9cf1c9..74c991b0ed 100644 --- a/usr/src/lib/libshell/common/bltins/enum.c +++ b/usr/src/lib/libshell/common/bltins/enum.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -27,7 +27,7 @@ USAGE_LICENSE "[+DESCRIPTION?\benum\b is a declaration command that creates an enumeration " "type \atypename\a that can only store any one of the values in the indexed " "array variable \atypename\a.]" -"[+?If the list of \avalue\as is ommitted, then \atypename\a must name an " +"[+?If the list of \avalue\as is omitted, then \atypename\a must name an " "indexed array variable with at least two elements.]" "[i:ignorecase?The values are case insensitive.]" "\n" diff --git a/usr/src/lib/libshell/common/bltins/getopts.c b/usr/src/lib/libshell/common/bltins/getopts.c index 5cb81ae4fe..eb76ae3639 100644 --- a/usr/src/lib/libshell/common/bltins/getopts.c +++ b/usr/src/lib/libshell/common/bltins/getopts.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/hist.c b/usr/src/lib/libshell/common/bltins/hist.c index d35aec2070..25e98d61cf 100644 --- a/usr/src/lib/libshell/common/bltins/hist.c +++ b/usr/src/lib/libshell/common/bltins/hist.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/misc.c b/usr/src/lib/libshell/common/bltins/misc.c index c66dff20bf..237a4448ee 100644 --- a/usr/src/lib/libshell/common/bltins/misc.c +++ b/usr/src/lib/libshell/common/bltins/misc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/mkservice.c b/usr/src/lib/libshell/common/bltins/mkservice.c index 8136b4c296..0a1eeb2bce 100644 --- a/usr/src/lib/libshell/common/bltins/mkservice.c +++ b/usr/src/lib/libshell/common/bltins/mkservice.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/print.c b/usr/src/lib/libshell/common/bltins/print.c index 18b51aab67..41db7b3e46 100644 --- a/usr/src/lib/libshell/common/bltins/print.c +++ b/usr/src/lib/libshell/common/bltins/print.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/read.c b/usr/src/lib/libshell/common/bltins/read.c index d5df0ca53d..6abf7a82f6 100644 --- a/usr/src/lib/libshell/common/bltins/read.c +++ b/usr/src/lib/libshell/common/bltins/read.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -146,7 +146,6 @@ int b_read(int argc,char *argv[], void *extra) if(fd<0 || !(r&IOREAD)) errormsg(SH_DICT,ERROR_system(1),e_file+4); /* look for prompt */ - shp->prompt = default_prompt; if((name = *argv) && (name=strchr(name,'?')) && (r&IOTTY)) r = strlen(name++); else @@ -162,6 +161,7 @@ int b_read(int argc,char *argv[], void *extra) rp->plen = r; } bypass: + shp->prompt = default_prompt; if(r && (shp->prompt=(char*)sfreserve(sfstderr,r,SF_LOCKR))) { memcpy(shp->prompt,name,r); @@ -342,16 +342,22 @@ int sh_readline(register Shell_t *shp,char **names, int fd, int flags,long timeo int f; for (;;) { - c = (flags&NN_FLAG) ? -size : -1; + c = size; cp = sfreserve(iop,c,SF_LOCKR); f = 1; if(cp) m = sfvalue(iop); - else + else if(flags&NN_FLAG) { - m = (cp = sfreserve(iop,size,0)) ? sfvalue(iop) : 0; + c = size; + m = (cp = sfreserve(iop,c,0)) ? sfvalue(iop) : 0; f = 0; } + else + { + c = sfvalue(iop); + m = (cp = sfreserve(iop,c,SF_LOCKR)) ? sfvalue(iop) : 0; + } if(m>0 && (flags&N_FLAG) && !binary && (v=memchr(cp,'\n',m))) { *v++ = 0; @@ -404,9 +410,13 @@ int sh_readline(register Shell_t *shp,char **names, int fd, int flags,long timeo cur = var; #endif *cur = 0; - if(c>=size) - sfclrerr(iop); - break; + if(c>=size || (flags&N_FLAG) || m==0) + { + if(m) + sfclrerr(iop); + break; + } + size -= c; } } if(timeslot) @@ -419,7 +429,7 @@ int sh_readline(register Shell_t *shp,char **names, int fd, int flags,long timeo { Namval_t *mp; if(var==buf) - var = memdup(var,c); + var = memdup(var,c+1); nv_putval(np,var,NV_RAW); nv_setsize(np,c); if(!nv_isattr(np,NV_IMPORT|NV_EXPORT) && (mp=(Namval_t*)np->nvenv)) diff --git a/usr/src/lib/libshell/common/bltins/regress.c b/usr/src/lib/libshell/common/bltins/regress.c index b736fd1534..d6d39bf5c9 100644 --- a/usr/src/lib/libshell/common/bltins/regress.c +++ b/usr/src/lib/libshell/common/bltins/regress.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/sleep.c b/usr/src/lib/libshell/common/bltins/sleep.c index a0648632dd..6121cfe62b 100644 --- a/usr/src/lib/libshell/common/bltins/sleep.c +++ b/usr/src/lib/libshell/common/bltins/sleep.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/test.c b/usr/src/lib/libshell/common/bltins/test.c index ec8095107d..2cffd57134 100644 --- a/usr/src/lib/libshell/common/bltins/test.c +++ b/usr/src/lib/libshell/common/bltins/test.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/trap.c b/usr/src/lib/libshell/common/bltins/trap.c index 494d5d8431..cd6a2e8d9b 100644 --- a/usr/src/lib/libshell/common/bltins/trap.c +++ b/usr/src/lib/libshell/common/bltins/trap.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/typeset.c b/usr/src/lib/libshell/common/bltins/typeset.c index 6428248499..f93bcf3d54 100644 --- a/usr/src/lib/libshell/common/bltins/typeset.c +++ b/usr/src/lib/libshell/common/bltins/typeset.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -540,7 +540,12 @@ static int b_common(char **argv,register int flag,Dt_t *troot,struct tdata * else if(nv_isnull(np)) nv_onattr(np,NV_ARRAY|(comvar?NV_NOFREE:0)); else + { + Namarr_t *ap=nv_arrayptr(np); + if(ap && comvar) + ap->nelem |= ARRAY_TREE; nv_putsub(np, (char*)0, 0); + } } else if(nvflags&NV_ARRAY) { diff --git a/usr/src/lib/libshell/common/bltins/ulimit.c b/usr/src/lib/libshell/common/bltins/ulimit.c index 7c8e9378d3..77ce771195 100644 --- a/usr/src/lib/libshell/common/bltins/ulimit.c +++ b/usr/src/lib/libshell/common/bltins/ulimit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/umask.c b/usr/src/lib/libshell/common/bltins/umask.c index d8bc67647a..0067c89dbe 100644 --- a/usr/src/lib/libshell/common/bltins/umask.c +++ b/usr/src/lib/libshell/common/bltins/umask.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/bltins/whence.c b/usr/src/lib/libshell/common/bltins/whence.c index 4714c78b10..580753607a 100644 --- a/usr/src/lib/libshell/common/bltins/whence.c +++ b/usr/src/lib/libshell/common/bltins/whence.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/aliases.c b/usr/src/lib/libshell/common/data/aliases.c index 5b7298b299..e3a7430540 100644 --- a/usr/src/lib/libshell/common/data/aliases.c +++ b/usr/src/lib/libshell/common/data/aliases.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/bash_pre_rc.sh b/usr/src/lib/libshell/common/data/bash_pre_rc.sh index 56767363dc..e5a7bd3736 100644 --- a/usr/src/lib/libshell/common/data/bash_pre_rc.sh +++ b/usr/src/lib/libshell/common/data/bash_pre_rc.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/data/builtins.c b/usr/src/lib/libshell/common/data/builtins.c index 94b34c77dd..bfd390187c 100644 --- a/usr/src/lib/libshell/common/data/builtins.c +++ b/usr/src/lib/libshell/common/data/builtins.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1269,9 +1269,9 @@ USAGE_LICENSE "[u]#[fd:=0?Read from file descriptor number \afd\a instead of standard input.]" "[t]:[timeout?Specify a timeout \atimeout\a in seconds when reading from " "a terminal or pipe.]" -"[n]#[nbyte?Read at most \ansize\a characters. For binary fields \asize\a " +"[n]#[nchar?Read at most \anchar\a characters. For binary fields \asize\a " "will be in bytes.]" -"[N]#[nbyte?Read exactly \ansize\a characters. For binary fields \asize\a " +"[N]#[nchar?Read exactly \anchar\a characters. For binary fields \asize\a " "will be in bytes.]" "[v?When reading from a terminal the value of the first variable is displayed " "and used as a default value.]" diff --git a/usr/src/lib/libshell/common/data/keywords.c b/usr/src/lib/libshell/common/data/keywords.c index ccacdb95ee..8520af64d0 100644 --- a/usr/src/lib/libshell/common/data/keywords.c +++ b/usr/src/lib/libshell/common/data/keywords.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/lexstates.c b/usr/src/lib/libshell/common/data/lexstates.c index 3decd14dbc..7da677c1b8 100644 --- a/usr/src/lib/libshell/common/data/lexstates.c +++ b/usr/src/lib/libshell/common/data/lexstates.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -387,7 +387,7 @@ const char *sh_lexrstates[ST_NONE] = const char e_lexversion[] = "%d: invalid binary script version"; const char e_lexspace[] = "line %d: use space or tab to separate operators %c and %c"; -const char e_lexslash[] = "line %d: $ not preceeded by \\"; +const char e_lexslash[] = "line %d: $ not preceded by \\"; const char e_lexsyntax1[] = "syntax error at line %d: `%s' %s"; const char e_lexsyntax2[] = "syntax error: `%s' %s"; const char e_lexsyntax3[] = "syntax error at line %d: duplicate label %s"; diff --git a/usr/src/lib/libshell/common/data/limits.c b/usr/src/lib/libshell/common/data/limits.c index ae13d21df5..3bea9cc9e5 100644 --- a/usr/src/lib/libshell/common/data/limits.c +++ b/usr/src/lib/libshell/common/data/limits.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/msg.c b/usr/src/lib/libshell/common/data/msg.c index 022aa5390d..27ce63a4ec 100644 --- a/usr/src/lib/libshell/common/data/msg.c +++ b/usr/src/lib/libshell/common/data/msg.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/options.c b/usr/src/lib/libshell/common/data/options.c index b2894b90e7..5643b86b5a 100644 --- a/usr/src/lib/libshell/common/data/options.c +++ b/usr/src/lib/libshell/common/data/options.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -19,8 +19,7 @@ ***********************************************************************/ #pragma prototyped -#include <defs.h> -#include "FEATURE/options" +#include "defs.h" #include "name.h" #include "shtable.h" diff --git a/usr/src/lib/libshell/common/data/signals.c b/usr/src/lib/libshell/common/data/signals.c index 371ffa2eac..bac1031045 100644 --- a/usr/src/lib/libshell/common/data/signals.c +++ b/usr/src/lib/libshell/common/data/signals.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/solaris_cmdlist.h b/usr/src/lib/libshell/common/data/solaris_cmdlist.h index 4cb7672636..f394e79aa7 100644 --- a/usr/src/lib/libshell/common/data/solaris_cmdlist.h +++ b/usr/src/lib/libshell/common/data/solaris_cmdlist.h @@ -20,8 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _SOLARIS_KSH_CMDLIST_H @@ -38,16 +37,6 @@ extern "C" { * tools */ -/* POSIX compatible commands */ -#ifdef _NOT_YET -#define XPG6CMDLIST(f) \ - { "/usr/xpg6/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, -#define XPG4CMDLIST(f) \ - { "/usr/xpg4/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, -#else -#define XPG6CMDLIST(f) -#define XPG4CMDLIST(f) -#endif /* NOT_YET */ /* * Commands which are 100% compatible with native Solaris versions (/bin is * a softlink to ./usr/bin, ksh93 takes care about the lookup) @@ -60,6 +49,18 @@ extern "C" { { "/sbin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, #define SUSRBINCMDLIST(f) \ { "/usr/sbin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +/* POSIX compatible commands */ +#define XPG6CMDLIST(f) \ + { "/usr/xpg6/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#define XPG4CMDLIST(f) \ + { "/usr/xpg4/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#ifdef SHOPT_USR_GNU_BIN_BUILTINS +/* GNU coreutils compatible commands */ +#define GNUCMDLIST(f) \ + { "/usr/gnu/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#else +#define GNUCMDLIST(f) +#endif /* * Make all ksh93 builtins accessible when /usr/ast/bin was added to * /usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/bin:/opt/SUNWspro/bin @@ -73,89 +74,115 @@ extern "C" { #undef mktemp /* Generated data, do not edit. */ -XPG4CMDLIST(basename) ASTCMDLIST(basename) -BINCMDLIST(cat) +GNUCMDLIST(basename) +XPG4CMDLIST(basename) ASTCMDLIST(cat) -XPG4CMDLIST(chgrp) +BINCMDLIST(cat) ASTCMDLIST(chgrp) +// XPG4CMDLIST(chgrp) ASTCMDLIST(chmod) -XPG4CMDLIST(chown) -BINCMDLIST(chown) ASTCMDLIST(chown) -BINCMDLIST(cksum) +// XPG4CMDLIST(chown) +BINCMDLIST(chown) ASTCMDLIST(cksum) -BINCMDLIST(cmp) +BINCMDLIST(cksum) +GNUCMDLIST(cksum) ASTCMDLIST(cmp) -BINCMDLIST(comm) +BINCMDLIST(cmp) ASTCMDLIST(comm) -XPG4CMDLIST(cp) +BINCMDLIST(comm) +GNUCMDLIST(comm) ASTCMDLIST(cp) -BINCMDLIST(cut) +// XPG4CMDLIST(cp) ASTCMDLIST(cut) -XPG4CMDLIST(date) +BINCMDLIST(cut) +GNUCMDLIST(cut) ASTCMDLIST(date) +// XPG4CMDLIST(date) ASTCMDLIST(dirname) +BINCMDLIST(dirname) +GNUCMDLIST(dirname) ASTCMDLIST(egrep) -XPG4CMDLIST(expr) +XPG4CMDLIST(egrep) ASTCMDLIST(expr) +GNUCMDLIST(expr) +XPG6CMDLIST(expr) ASTCMDLIST(fds) ASTCMDLIST(fgrep) +XPG4CMDLIST(fgrep) ASTCMDLIST(fmt) -BINCMDLIST(fold) ASTCMDLIST(fold) +BINCMDLIST(fold) +GNUCMDLIST(fold) ASTCMDLIST(grep) -BINCMDLIST(head) +XPG4CMDLIST(grep) ASTCMDLIST(head) -XPG4CMDLIST(id) +BINCMDLIST(head) ASTCMDLIST(id) -BINCMDLIST(join) +XPG4CMDLIST(id) ASTCMDLIST(join) -XPG4CMDLIST(ln) +BINCMDLIST(join) +GNUCMDLIST(join) ASTCMDLIST(ln) -BINCMDLIST(logname) +// XPG4CMDLIST(ln) ASTCMDLIST(logname) +BINCMDLIST(logname) +GNUCMDLIST(logname) ASTCMDLIST(md5sum) -BINCMDLIST(mkdir) ASTCMDLIST(mkdir) -BINCMDLIST(mkfifo) +BINCMDLIST(mkdir) +GNUCMDLIST(mkdir) ASTCMDLIST(mkfifo) -BINCMDLIST(mktemp) +BINCMDLIST(mkfifo) +GNUCMDLIST(mkfifo) ASTCMDLIST(mktemp) -XPG4CMDLIST(mv) +BINCMDLIST(mktemp) +GNUCMDLIST(mktemp) ASTCMDLIST(mv) -BINCMDLIST(paste) +// XPG4CMDLIST(mv) ASTCMDLIST(paste) -BINCMDLIST(pathchk) +BINCMDLIST(paste) +GNUCMDLIST(paste) ASTCMDLIST(pathchk) +BINCMDLIST(pathchk) +GNUCMDLIST(pathchk) ASTCMDLIST(readlink) -BINCMDLIST(rev) ASTCMDLIST(rev) -XPG4CMDLIST(rm) +BINCMDLIST(rev) ASTCMDLIST(rm) -BINCMDLIST(rmdir) +XPG4CMDLIST(rm) ASTCMDLIST(rmdir) -XPG4CMDLIST(stty) +BINCMDLIST(rmdir) +GNUCMDLIST(rmdir) +GNUCMDLIST(sleep) ASTCMDLIST(stty) -BINCMDLIST(sum) +// XPG4CMDLIST(stty) ASTCMDLIST(sum) -SUSRBINCMDLIST(sync) -SBINCMDLIST(sync) -BINCMDLIST(sync) +BINCMDLIST(sum) ASTCMDLIST(sync) -XPG4CMDLIST(tail) -BINCMDLIST(tail) +BINCMDLIST(sync) +GNUCMDLIST(sync) +SBINCMDLIST(sync) +SUSRBINCMDLIST(sync) ASTCMDLIST(tail) -BINCMDLIST(tee) +BINCMDLIST(tail) +XPG4CMDLIST(tail) ASTCMDLIST(tee) -BINCMDLIST(tty) +BINCMDLIST(tee) +GNUCMDLIST(tee) ASTCMDLIST(tty) +BINCMDLIST(tty) +GNUCMDLIST(tty) ASTCMDLIST(uname) -BINCMDLIST(uniq) ASTCMDLIST(uniq) -BINCMDLIST(wc) +BINCMDLIST(uniq) +GNUCMDLIST(uniq) ASTCMDLIST(wc) +BINCMDLIST(wc) +GNUCMDLIST(wc) ASTCMDLIST(xgrep) +BINCMDLIST(xgrep) /* Mandatory for ksh93 test suite and AST scripts */ BINCMDLIST(getconf) diff --git a/usr/src/lib/libshell/common/data/strdata.c b/usr/src/lib/libshell/common/data/strdata.c index 4642c2826b..05a88b095c 100644 --- a/usr/src/lib/libshell/common/data/strdata.c +++ b/usr/src/lib/libshell/common/data/strdata.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/testops.c b/usr/src/lib/libshell/common/data/testops.c index 230ec4cbf8..a85f2ef46c 100644 --- a/usr/src/lib/libshell/common/data/testops.c +++ b/usr/src/lib/libshell/common/data/testops.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/data/variables.c b/usr/src/lib/libshell/common/data/variables.c index bb8d7441fe..ba44b5cd87 100644 --- a/usr/src/lib/libshell/common/data/variables.c +++ b/usr/src/lib/libshell/common/data/variables.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/completion.c b/usr/src/lib/libshell/common/edit/completion.c index f90f7af9c6..4c1b044942 100644 --- a/usr/src/lib/libshell/common/edit/completion.c +++ b/usr/src/lib/libshell/common/edit/completion.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/edit.c b/usr/src/lib/libshell/common/edit/edit.c index 7fe6a99c47..7dab2368d6 100644 --- a/usr/src/lib/libshell/common/edit/edit.c +++ b/usr/src/lib/libshell/common/edit/edit.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/emacs.c b/usr/src/lib/libshell/common/edit/emacs.c index 8faf4c7856..7a3c39e951 100644 --- a/usr/src/lib/libshell/common/edit/emacs.c +++ b/usr/src/lib/libshell/common/edit/emacs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/hexpand.c b/usr/src/lib/libshell/common/edit/hexpand.c index 497f8170d5..c796334ec6 100644 --- a/usr/src/lib/libshell/common/edit/hexpand.c +++ b/usr/src/lib/libshell/common/edit/hexpand.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/history.c b/usr/src/lib/libshell/common/edit/history.c index b0a3c8db27..4cc7c01a21 100644 --- a/usr/src/lib/libshell/common/edit/history.c +++ b/usr/src/lib/libshell/common/edit/history.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/edit/vi.c b/usr/src/lib/libshell/common/edit/vi.c index b374aa4b0d..2365c16ff5 100644 --- a/usr/src/lib/libshell/common/edit/vi.c +++ b/usr/src/lib/libshell/common/edit/vi.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/features/externs b/usr/src/lib/libshell/common/features/externs index 7d5e48d7c7..bc267591d8 100644 --- a/usr/src/lib/libshell/common/features/externs +++ b/usr/src/lib/libshell/common/features/externs @@ -1,9 +1,10 @@ set prototyped hdr nc,exec_attr mem exception.name,_exception.name math.h -lib setreuid,setregid,nice,sigflag,fork,spawnveg,fchdir +lib setreuid,setregid,nice,fork,spawnveg,fchdir lib pathnative,pathposix,uwin_path,uwin_unpath,fts_notify lib memcntl sys/mman.h +lib getexecuser,free_execattr exec_attr.h -lsecdb reference unistd.h diff --git a/usr/src/lib/libshell/common/features/math.sh b/usr/src/lib/libshell/common/features/math.sh index 5d7a498921..b06fcefbb2 100644 --- a/usr/src/lib/libshell/common/features/math.sh +++ b/usr/src/lib/libshell/common/features/math.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/features/rlimits b/usr/src/lib/libshell/common/features/rlimits index a9e4294ed1..f2ffe192cf 100644 --- a/usr/src/lib/libshell/common/features/rlimits +++ b/usr/src/lib/libshell/common/features/rlimits @@ -1,3 +1,3 @@ hdr,sys resource,vlimit lib getrlimit,ulimit,vlimit -typ rlim_t sys/resource.h +typ rlim_t sys/types.h sys/resource.h diff --git a/usr/src/lib/libshell/common/include/argnod.h b/usr/src/lib/libshell/common/include/argnod.h index 524cc49d61..e568efca63 100644 --- a/usr/src/lib/libshell/common/include/argnod.h +++ b/usr/src/lib/libshell/common/include/argnod.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/builtins.h b/usr/src/lib/libshell/common/include/builtins.h index 900bc35937..510f8e2330 100644 --- a/usr/src/lib/libshell/common/include/builtins.h +++ b/usr/src/lib/libshell/common/include/builtins.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/defs.h b/usr/src/lib/libshell/common/include/defs.h index 57c39b6dec..4520e31988 100644 --- a/usr/src/lib/libshell/common/include/defs.h +++ b/usr/src/lib/libshell/common/include/defs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -31,6 +31,7 @@ #include <ast.h> #include <sfio.h> #include <error.h> +#include "FEATURE/externs" #include "FEATURE/options" #include <cdt.h> #include <history.h> @@ -57,6 +58,9 @@ # define env_delete(e,p) env_change() #endif +extern char* sh_getenv(const char*); +extern char* sh_setenviron(const char*); + /* * note that the first few fields have to be the same as for * Shscoped_t in <shell.h> @@ -170,6 +174,8 @@ struct limits unsigned char lastsig; /* last signal received */ \ char subshare; /* set when in ${..} comsub */ \ char toomany; /* set when out of fd's */ \ + char instance; /* in set_instance */ \ + char decomma; /* decimal_point=',' */ \ char *readscript; /* set before reading a script */ \ int *inpipe; /* input pipe pointer */ \ int *outpipe; /* output pipe pointer */ \ @@ -337,6 +343,10 @@ struct limits # define PIPE_BUF 512 #endif +#if SHOPT_PFSH && ( !_lib_getexecuser || !_lib_free_execattr ) +# undef SHOPT_PFSH +#endif + #define MATCH_MAX 64 #define SH_READEVAL 0x4000 /* for sh_eval */ diff --git a/usr/src/lib/libshell/common/include/edit.h b/usr/src/lib/libshell/common/include/edit.h index 3e8fe73f8d..122c700e37 100644 --- a/usr/src/lib/libshell/common/include/edit.h +++ b/usr/src/lib/libshell/common/include/edit.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/env.h b/usr/src/lib/libshell/common/include/env.h index c8b30a2c68..e8317ad736 100644 --- a/usr/src/lib/libshell/common/include/env.h +++ b/usr/src/lib/libshell/common/include/env.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/fault.h b/usr/src/lib/libshell/common/include/fault.h index 97a4280b0d..97973b40bb 100644 --- a/usr/src/lib/libshell/common/include/fault.h +++ b/usr/src/lib/libshell/common/include/fault.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/fcin.h b/usr/src/lib/libshell/common/include/fcin.h index 310cc6693c..4923dc0737 100644 --- a/usr/src/lib/libshell/common/include/fcin.h +++ b/usr/src/lib/libshell/common/include/fcin.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/history.h b/usr/src/lib/libshell/common/include/history.h index 40351707f9..6faedafa07 100644 --- a/usr/src/lib/libshell/common/include/history.h +++ b/usr/src/lib/libshell/common/include/history.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/io.h b/usr/src/lib/libshell/common/include/io.h index bd2a8bdb87..8ba4e0ecd4 100644 --- a/usr/src/lib/libshell/common/include/io.h +++ b/usr/src/lib/libshell/common/include/io.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/jobs.h b/usr/src/lib/libshell/common/include/jobs.h index 513667e1ab..4ed087f0a7 100644 --- a/usr/src/lib/libshell/common/include/jobs.h +++ b/usr/src/lib/libshell/common/include/jobs.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/lexstates.h b/usr/src/lib/libshell/common/include/lexstates.h index e3f75446e4..c117988d9c 100644 --- a/usr/src/lib/libshell/common/include/lexstates.h +++ b/usr/src/lib/libshell/common/include/lexstates.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/name.h b/usr/src/lib/libshell/common/include/name.h index 80d970055c..cf46c92b5f 100644 --- a/usr/src/lib/libshell/common/include/name.h +++ b/usr/src/lib/libshell/common/include/name.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -156,7 +156,8 @@ struct Ufunction #define nv_setsize(n,s) ((n)->nvsize = (s)) #undef nv_size #define nv_size(np) ((np)->nvsize) -#define nv_isnull(np) (!(np)->nvalue.cp && !((np)->nvfun && (np)->nvfun->disc) && nv_isattr(np,NV_SHORT|NV_INTEGER)!=(NV_SHORT|NV_INTEGER)) +#define _nv_hasget(np) ((np)->nvfun && (np)->nvfun->disc && nv_hasget(np)) +#define nv_isnull(np) (!(np)->nvalue.cp && (nv_isattr(np,NV_SHORT|NV_INTEGER)!=(NV_SHORT|NV_INTEGER)) && !_nv_hasget(np)) /* ... for arrays */ @@ -179,6 +180,7 @@ extern void nv_optimize(Namval_t*); extern void nv_outname(Sfio_t*,char*, int); extern void nv_unref(Namval_t*); extern void _nv_unset(Namval_t*,int); +extern int nv_hasget(Namval_t*); extern int nv_clone(Namval_t*, Namval_t*, int); void clone_all_disc(Namval_t*, Namval_t*, int); extern Namfun_t *nv_clone_disc(Namfun_t*, int); diff --git a/usr/src/lib/libshell/common/include/national.h b/usr/src/lib/libshell/common/include/national.h index 41fe6e5316..94221a2c95 100644 --- a/usr/src/lib/libshell/common/include/national.h +++ b/usr/src/lib/libshell/common/include/national.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/nval.h b/usr/src/lib/libshell/common/include/nval.h index 2a4c61f0ac..d4eb243c42 100644 --- a/usr/src/lib/libshell/common/include/nval.h +++ b/usr/src/lib/libshell/common/include/nval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/path.h b/usr/src/lib/libshell/common/include/path.h index 39f45e8883..9c656adf92 100644 --- a/usr/src/lib/libshell/common/include/path.h +++ b/usr/src/lib/libshell/common/include/path.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/regress.h b/usr/src/lib/libshell/common/include/regress.h index e47cc2cf17..487823e8ae 100644 --- a/usr/src/lib/libshell/common/include/regress.h +++ b/usr/src/lib/libshell/common/include/regress.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/shell.h b/usr/src/lib/libshell/common/include/shell.h index d649dbf271..2ce315566e 100644 --- a/usr/src/lib/libshell/common/include/shell.h +++ b/usr/src/lib/libshell/common/include/shell.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/shlex.h b/usr/src/lib/libshell/common/include/shlex.h index 371e01b001..7da3e90ed6 100644 --- a/usr/src/lib/libshell/common/include/shlex.h +++ b/usr/src/lib/libshell/common/include/shlex.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/shnodes.h b/usr/src/lib/libshell/common/include/shnodes.h index 176a0d9e5f..032ef2609d 100644 --- a/usr/src/lib/libshell/common/include/shnodes.h +++ b/usr/src/lib/libshell/common/include/shnodes.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/shtable.h b/usr/src/lib/libshell/common/include/shtable.h index f8953f651d..bd237ae895 100644 --- a/usr/src/lib/libshell/common/include/shtable.h +++ b/usr/src/lib/libshell/common/include/shtable.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/streval.h b/usr/src/lib/libshell/common/include/streval.h index 001f2d1ea1..32ccbb6824 100644 --- a/usr/src/lib/libshell/common/include/streval.h +++ b/usr/src/lib/libshell/common/include/streval.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -78,6 +78,7 @@ struct lval short emode; short level; short elen; + char nosub; }; struct mathtab @@ -159,6 +160,7 @@ typedef struct _arith_ #define A_DOT 52 #define A_LIT 53 #define A_NOTNOT 54 +#define A_ASSIGNOP 55 /* define error messages */ diff --git a/usr/src/lib/libshell/common/include/terminal.h b/usr/src/lib/libshell/common/include/terminal.h index 7192039013..3974b4b22b 100644 --- a/usr/src/lib/libshell/common/include/terminal.h +++ b/usr/src/lib/libshell/common/include/terminal.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/test.h b/usr/src/lib/libshell/common/include/test.h index 1a38632d44..4ef649883a 100644 --- a/usr/src/lib/libshell/common/include/test.h +++ b/usr/src/lib/libshell/common/include/test.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/timeout.h b/usr/src/lib/libshell/common/include/timeout.h index 276cf131a1..5f404447a2 100644 --- a/usr/src/lib/libshell/common/include/timeout.h +++ b/usr/src/lib/libshell/common/include/timeout.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/ulimit.h b/usr/src/lib/libshell/common/include/ulimit.h index 39fedeed78..a1c36613fd 100644 --- a/usr/src/lib/libshell/common/include/ulimit.h +++ b/usr/src/lib/libshell/common/include/ulimit.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/variables.h b/usr/src/lib/libshell/common/include/variables.h index 098e8743aa..5afad98b59 100644 --- a/usr/src/lib/libshell/common/include/variables.h +++ b/usr/src/lib/libshell/common/include/variables.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/include/version.h b/usr/src/lib/libshell/common/include/version.h index b22c513e65..7a4a876c06 100644 --- a/usr/src/lib/libshell/common/include/version.h +++ b/usr/src/lib/libshell/common/include/version.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -17,4 +17,4 @@ * David Korn <dgk@research.att.com> * * * ***********************************************************************/ -#define SH_RELEASE "93t+ 2009-10-12" +#define SH_RELEASE "93t+ 2010-03-05" diff --git a/usr/src/lib/libshell/common/scripts/cpvprint.sh b/usr/src/lib/libshell/common/scripts/cpvprint.sh index bcf2daa985..1257d24876 100644 --- a/usr/src/lib/libshell/common/scripts/cpvprint.sh +++ b/usr/src/lib/libshell/common/scripts/cpvprint.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/crawlsrccomments.sh b/usr/src/lib/libshell/common/scripts/crawlsrccomments.sh index bdcecd00cf..bcc6bec0ae 100644 --- a/usr/src/lib/libshell/common/scripts/crawlsrccomments.sh +++ b/usr/src/lib/libshell/common/scripts/crawlsrccomments.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -697,8 +696,8 @@ function cat_http_body if [[ "${emode}" == "chunked" ]] ; then while IFS=$'\r' read hexchunksize && - [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]* ]] && - (( chunksize=16#${hexchunksize} )) && (( chunksize > 0 )) ; do + [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]+ ]] && + (( chunksize=$( printf "16#%s\n" "${hexchunksize}" ) )) && (( chunksize > 0 )) ; do dd bs=1 count="${chunksize}" 2>/dev/null done else @@ -764,7 +763,7 @@ function cat_url # send HTTP request request="GET /${path} HTTP/1.1\r\n" request+="Host: ${host}\r\n" - request+="User-Agent: crawlsrccomments/ksh93(ssl) (2009-05-08; $(uname -s -r -p))\r\n" + request+="User-Agent: crawlsrccomments/ksh93(ssl) (2010-03-27; $(uname -s -r -p))\r\n" request+="Connection: close\r\n" print -n -- "${request}\r\n" >> "${sslfifo.in}" @@ -784,7 +783,7 @@ function cat_url # send HTTP request request="GET /${path} HTTP/1.1\r\n" request+="Host: ${host}\r\n" - request+="User-Agent: crawlsrccomments/ksh93 (2009-05-08; $(uname -s -r -p))\r\n" + request+="User-Agent: crawlsrccomments/ksh93 (2010-03-27; $(uname -s -r -p))\r\n" request+="Connection: close\r\n" print -n -- "${request}\r\n" >&${netfd} @@ -1141,8 +1140,9 @@ function usage } typeset -r do_getcomments_usage=$'+ -[-?\n@(#)\$Id: getcomments (Roland Mainz) 2009-05-09 \$\n] +[-?\n@(#)\$Id: getcomments (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@sun.com>] +[-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?getcomments - extract license information from source files] [+DESCRIPTION?\bgetcomments\b is a small utilty script which extracts license information from the "\bgetcomments\b"-database @@ -1164,8 +1164,9 @@ typeset -r do_getcomments_usage=$'+ ' typeset -r do_crawl_usage=$'+ -[-?\n@(#)\$Id: crawl (Roland Mainz) 2009-05-09 \$\n] +[-?\n@(#)\$Id: crawl (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@sun.com>] +[-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?crawl - crawl comment information from source files] [+DESCRIPTION?\bcrawl\b is a small utilty script which reads a list of source code files from stdin, determinates the type of @@ -1180,8 +1181,9 @@ typeset -r do_crawl_usage=$'+ ' typeset -r crawlsrccomments_usage=$'+ -[-?\n@(#)\$Id: crawlsrccomments (Roland Mainz) 2009-05-09 \$\n] +[-?\n@(#)\$Id: crawlsrccomments (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@sun.com>] +[-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?crawlsrccomments - extract and filter comment information from source files] [+DESCRIPTION?\bcrawlsrccomments\b is a small utilty script which reads a list of source code files from stdin, determinates the type of diff --git a/usr/src/lib/libshell/common/scripts/filemutexdemo1.sh b/usr/src/lib/libshell/common/scripts/filemutexdemo1.sh index 1de54a92fc..1d09e4aeb3 100644 --- a/usr/src/lib/libshell/common/scripts/filemutexdemo1.sh +++ b/usr/src/lib/libshell/common/scripts/filemutexdemo1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/filetree1.sh b/usr/src/lib/libshell/common/scripts/filetree1.sh index 243c9758cf..9cbcb0c35d 100644 --- a/usr/src/lib/libshell/common/scripts/filetree1.sh +++ b/usr/src/lib/libshell/common/scripts/filetree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant diff --git a/usr/src/lib/libshell/common/scripts/gnaw.sh b/usr/src/lib/libshell/common/scripts/gnaw.sh index 878f2899ac..25445e7a4d 100644 --- a/usr/src/lib/libshell/common/scripts/gnaw.sh +++ b/usr/src/lib/libshell/common/scripts/gnaw.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/mandelbrotset1.sh b/usr/src/lib/libshell/common/scripts/mandelbrotset1.sh index b9ae173df9..082d519abe 100644 --- a/usr/src/lib/libshell/common/scripts/mandelbrotset1.sh +++ b/usr/src/lib/libshell/common/scripts/mandelbrotset1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -221,14 +220,17 @@ typeset symbollist=' .:0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQR typeset symbollistlen=$(( ${#symbollist} - 1)) typeset mode="parallel" -max_mag=400 -stepwidth=0.1 -numcpus=16 +(( max_mag=400 )) +(( stepwidth=0.1 )) + +# calculate number of worker CPUs and use 3 as fallback +(( numcpus=$(getconf NPROCESSORS_ONLN || print "3") )) +(( numcpus=numcpus*4 )) (( m_width=termsize.columns-1 , m_height=termsize.lines-2 )) typeset -r mandelbrotset1_usage=$'+ -[-?\n@(#)\$Id: mandelbrotset1 (Roland Mainz) 2009-06-14 \$\n] +[-?\n@(#)\$Id: mandelbrotset1 (Roland Mainz) 2010-03-31 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?mandelbrotset1 - generate mandelbrot set fractals with ksh93] [+DESCRIPTION?\bmandelbrotset1\b mandelbrot set fractal generator diff --git a/usr/src/lib/libshell/common/scripts/multifollow.sh b/usr/src/lib/libshell/common/scripts/multifollow.sh index b5d5cb7bb2..a14d34ee97 100644 --- a/usr/src/lib/libshell/common/scripts/multifollow.sh +++ b/usr/src/lib/libshell/common/scripts/multifollow.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant diff --git a/usr/src/lib/libshell/common/scripts/numtree1.sh b/usr/src/lib/libshell/common/scripts/numtree1.sh index beca4aae76..ba7783e91e 100644 --- a/usr/src/lib/libshell/common/scripts/numtree1.sh +++ b/usr/src/lib/libshell/common/scripts/numtree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -60,10 +59,14 @@ function add_number_to_tree integer i typeset nodepath # full name of compound variable integer -a pe # path elements + integer len + typeset revnums="$(rev <<<"${num}")" # first built an array containing the names of each path element # (e.g. "135" results in an array containing "( 1 3 5 )") - for (( i=$(rev <<<$num) ; i > 0 ; i=i/10 )) ; do + # 10#<number> is used to prevent leading zeros being interpreted + # as octals + for (( len=${#revnums} , i=$( printf "10#%s\n" "${revnums}" ) ; len > 0 ; len--, i=i/10 )) ; do pe+=( $((i % 10)) ) done @@ -72,15 +75,30 @@ function add_number_to_tree nodepath="${treename}" for (( i=0 ; i < ${#pe[@]} ; i++ )) ; do nameref x="${nodepath}" - [[ ! -v x.node ]] && compound -C -a x.nodes - + + # [[ -v ]] does not work for arrays because [[ -v ar ]] + # is equal to [[ -v ar[0] ]]. In this case we can + # use the output of typeset +p x.nodes + [[ "${ typeset +p x.nodes ;}" == "" ]] && compound -a x.nodes + nodepath+=".nodes[${pe[i]}]" done - # insert element + # insert element (leaf) nameref node="${nodepath}" - [[ ! -v node.elements ]] && integer -a node.elements + [[ "${ typeset +p node.elements ;}" == "" ]] && integer -a node.elements node.elements+=( ${num} ) + + # DEBUG only + [[ "${!node.elements[*]}" != "" ]] || fatal_error "assertion $LINENO FAILED" + [[ "${ typeset +p node.elements ;}" == *-a* ]] || fatal_error "assertion $LINENO FAILED" + [[ "${ typeset +p node.elements ;}" == *-i* ]] || fatal_error "assertion $LINENO FAILED" + [[ -v node ]] || fatal_error "assertion $LINENO FAILED" + [[ -R node ]] || fatal_error "assertion $LINENO FAILED" + [[ "${ typeset +p ${!node} ;}" == *-C* ]] || fatal_error "assertion $LINENO FAILED" + [[ "${!x.nodes[*]}" != "" ]] || fatal_error "assertion $LINENO FAILED" + [[ "${ typeset +p x.nodes ;}" == *-a* ]] || fatal_error "assertion $LINENO FAILED" + [[ "${ typeset +p x.nodes ;}" == *-C* ]] || fatal_error "assertion $LINENO FAILED" return 0 } @@ -147,7 +165,7 @@ integer i typeset progname="${ basename "${0}" ; }" typeset -r numtree1_usage=$'+ -[-?\n@(#)\$Id: numtree1 (Roland Mainz) 2009-08-17 \$\n] +[-?\n@(#)\$Id: numtree1 (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?numtree1 - generate sorted variable tree containing numbers] [+DESCRIPTION?\bnumtree1\b is a simple variable tree generator diff --git a/usr/src/lib/libshell/common/scripts/primenumbers1.sh b/usr/src/lib/libshell/common/scripts/primenumbers1.sh index aba6f5aeac..b408eb3049 100644 --- a/usr/src/lib/libshell/common/scripts/primenumbers1.sh +++ b/usr/src/lib/libshell/common/scripts/primenumbers1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/rssread.sh b/usr/src/lib/libshell/common/scripts/rssread.sh index 1010a7d873..05e703ac2c 100644 --- a/usr/src/lib/libshell/common/scripts/rssread.sh +++ b/usr/src/lib/libshell/common/scripts/rssread.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -124,7 +123,7 @@ typeset -T urlconnection_t=( hexchunksize="${hexchunksize//$'\r'/}" [[ "${hexchunksize}" != "" ]] || continue [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]+ ]] || break - (( chunksize=16#${hexchunksize} )) + (( chunksize=$( printf "16#%s\n" "${hexchunksize}" ) )) (( chunksize > 0 )) || break dd bs=1 count="${chunksize}" 2>/dev/null done @@ -178,7 +177,7 @@ typeset -T urlconnection_t=( function open_connection { if [[ "${_.protocol}" == "https" ]] ; then - _.ssl.fifo.dir="$(mktemp -d)" + _.ssl.fifo.dir="$(mktemp -t -d)" _.ssl.fifo.in="${_.ssl.fifo.dir}/in" _.ssl.fifo.out="${_.ssl.fifo.dir}/out" @@ -244,7 +243,7 @@ typeset -T urlconnection_t=( [[ "${_.host}" != "" ]] || { print -u2 -f "%s: host not set.\n" "$0" ; return 1 ; } [[ "${_.path}" != "" ]] || { print -u2 -f "%s: path not set.\n" "$0" ; return 1 ; } - _.open_connection + _.open_connection || return 1 # send HTTP request request="GET /${_.path} HTTP/1.1\r\n" @@ -563,7 +562,7 @@ function do_rssread set -o errexit urlconnection_t hc - hc.user_agent="rssread/ksh93(ssl) (2009-08-14; $(uname -s -r -p))" + hc.user_agent="rssread/ksh93(ssl) (2010-03-27; $(uname -s -r -p))" hc.init_url "$1" # need extra newline after cat_url to terminate line with $'\n' @@ -609,12 +608,6 @@ typeset -A bookmark_urls # "ramdom" urls for testing bookmark_urls=( ["google_blogs_ksh"]="http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&q=(%22ksh93%22%7C%22ksh+93%22+%7C+%22korn93%22+%7C+%22korn+93%22)&ie=utf-8&num=100&output=rss" - # OpenSolaris.org sites - ["ksh93_integration"]="http://www.opensolaris.org/rss/os/project/ksh93-integration/announcements/rss2.xml" - ["ksh93_integration_ssl"]="https://www.opensolaris.org/rss/os/project/ksh93-integration/announcements/rss2.xml" - ["shell"]="http://www.opensolaris.org/rss/os/project/shell/announcements/rss2.xml" - ["systemz"]="http://www.opensolaris.org/rss/os/project/systemz/announcements/rss2.xml" - ["systemz_ssl"]="https://www.opensolaris.org/rss/os/project/systemz/announcements/rss2.xml" # some Sun staff/sites ["blogs_sun_com"]="http://blogs.sun.com/main/feed/entries/rss" ["bigadmin"]="http://www.sun.com/bigadmin/content/rss/motd.xml" @@ -634,7 +627,7 @@ bookmark_urls=( typeset progname="${ basename "${0}" ; }" typeset -r rssread_usage=$'+ -[-?\n@(#)\$Id: rssread (Roland Mainz) 2009-08-14 \$\n] +[-?\n@(#)\$Id: rssread (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@sun.com>] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?rssread - fetch RSS messages and convert them to plain text] diff --git a/usr/src/lib/libshell/common/scripts/shcalc.sh b/usr/src/lib/libshell/common/scripts/shcalc.sh index db7149a0bd..50c9317ad4 100644 --- a/usr/src/lib/libshell/common/scripts/shcalc.sh +++ b/usr/src/lib/libshell/common/scripts/shcalc.sh @@ -22,8 +22,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/shircbot.sh b/usr/src/lib/libshell/common/scripts/shircbot.sh index 3c99355222..82903c53b1 100644 --- a/usr/src/lib/libshell/common/scripts/shircbot.sh +++ b/usr/src/lib/libshell/common/scripts/shircbot.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/shlint.sh b/usr/src/lib/libshell/common/scripts/shlint.sh index aea60a4951..7b6b609ac8 100644 --- a/usr/src/lib/libshell/common/scripts/shlint.sh +++ b/usr/src/lib/libshell/common/scripts/shlint.sh @@ -22,8 +22,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/shman.sh b/usr/src/lib/libshell/common/scripts/shman.sh index 56c2e42c12..1044d6a1bb 100644 --- a/usr/src/lib/libshell/common/scripts/shman.sh +++ b/usr/src/lib/libshell/common/scripts/shman.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -150,7 +149,7 @@ function browse_manpage # use "cat" here to avoid that "less" may try funny things cat <"${doc_filename}" | less -I -M $"--prompt=MManual\ page\ ${doc_title}\ ?ltline\ %lt?L/%L.:" else - tmpdirname="$(mktemp -d "/tmp/shman_${PPID}_$$_XXXXXX")" + tmpdirname="$(mktemp -t -d "shman_${PPID}_$$_XXXXXX")" mkdir -p "${tmpdirname}" || { print -u2 -f $"Couldn't create tmp. dir %s\n" "${tmpdirname}" ; return 1 ; } @@ -320,7 +319,7 @@ builtin date typeset progname="$(basename "${0}")" typeset -r man_usage=$'+ -[-?\n@(#)\$Id: shman (Roland Mainz) 2009-06-26 \$\n] +[-?\n@(#)\$Id: shman (Roland Mainz) 2009-12-02 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [-author?Roland Mainz <roland.mainz@sun.com>] [+NAME?man - find and display reference manual pages] diff --git a/usr/src/lib/libshell/common/scripts/shnote.sh b/usr/src/lib/libshell/common/scripts/shnote.sh index b449f257c0..217fc7daae 100644 --- a/usr/src/lib/libshell/common/scripts/shnote.sh +++ b/usr/src/lib/libshell/common/scripts/shnote.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -125,8 +124,8 @@ function cat_http_body if [[ "${emode}" == "chunked" ]] ; then while IFS=$'\r' read hexchunksize && - [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]* ]] && - (( chunksize=16#${hexchunksize} )) && (( chunksize > 0 )) ; do + [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]+ ]] && + (( chunksize=$( printf "16#%s\n" "${hexchunksize}" ) )) && (( chunksize > 0 )) ; do dd bs=1 count="${chunksize}" 2>/dev/null done else @@ -359,14 +358,14 @@ builtin uname typeset progname="${ basename "${0}" ; }" # HTTP protocol client identifer -typeset -r http_user_agent="shnote/ksh93 (2009-05-09; $(uname -s -r -p))" +typeset -r http_user_agent="shnote/ksh93 (2010-03-27; $(uname -s -r -p))" # name of history log (the number after "history" is some kind of version # counter to handle incompatible changes to the history file format) typeset -r history_file="${HOME}/.shnote/history0.txt" typeset -r shnote_usage=$'+ -[-?\n@(#)\$Id: shnote (Roland Mainz) 2009-05-09 \$\n] +[-?\n@(#)\$Id: shnote (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?shnote - read/write text data to internet clipboards] [+DESCRIPTION?\bshnote\b is a small utilty which can read and write text diff --git a/usr/src/lib/libshell/common/scripts/shpiano.sh b/usr/src/lib/libshell/common/scripts/shpiano.sh index e20813a75a..b6d511a6ba 100644 --- a/usr/src/lib/libshell/common/scripts/shpiano.sh +++ b/usr/src/lib/libshell/common/scripts/shpiano.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant diff --git a/usr/src/lib/libshell/common/scripts/shtinyurl.sh b/usr/src/lib/libshell/common/scripts/shtinyurl.sh index fb18627081..debd28949b 100644 --- a/usr/src/lib/libshell/common/scripts/shtinyurl.sh +++ b/usr/src/lib/libshell/common/scripts/shtinyurl.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -93,8 +92,8 @@ function cat_http_body if [[ "${emode}" == "chunked" ]] ; then while IFS=$'\r' read hexchunksize && - [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]* ]] && - (( chunksize=16#${hexchunksize} )) && (( chunksize > 0 )) ; do + [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]+ ]] && + (( chunksize=$( printf "16#%s\n" "${hexchunksize}" ) )) && (( chunksize > 0 )) ; do dd bs=1 count="${chunksize}" 2>/dev/null done else @@ -213,10 +212,10 @@ builtin uname typeset progname="${ basename "${0}" ; }" # HTTP protocol client identifer -typeset -r http_user_agent="shtinyurl/ksh93 (2009-08-12; ${ uname -s -r -p ; })" +typeset -r http_user_agent="shtinyurl/ksh93 (2010-03-27; ${ uname -s -r -p ; })" typeset -r shtinyurl_usage=$'+ -[-?\n@(#)\$Id: shtinyurl (Roland Mainz) 2009-08-12 \$\n] +[-?\n@(#)\$Id: shtinyurl (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?shtinyurl - create short alias URL from long URL] [+DESCRIPTION?\bshtinyurl\b is a small utility which passes a given URL diff --git a/usr/src/lib/libshell/common/scripts/shtwitter.sh b/usr/src/lib/libshell/common/scripts/shtwitter.sh index c7672dde6c..217b821e6a 100644 --- a/usr/src/lib/libshell/common/scripts/shtwitter.sh +++ b/usr/src/lib/libshell/common/scripts/shtwitter.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -147,8 +146,8 @@ function cat_http_body if [[ "${emode}" == "chunked" ]] ; then while IFS=$'\r' read hexchunksize && - [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]* ]] && - (( chunksize=16#${hexchunksize} )) && (( chunksize > 0 )) ; do + [[ "${hexchunksize}" == ~(Elri)[0-9abcdef]+ ]] && + (( chunksize=$( printf "16#%s\n" "${hexchunksize}" ) )) && (( chunksize > 0 )) ; do dd bs=1 count="${chunksize}" 2>/dev/null done else @@ -313,10 +312,10 @@ builtin uname typeset progname="${ basename "${0}" ; }" # HTTP protocol client identifer -typeset -r http_user_agent="shtwitter/ksh93 (2009-06-15; ${ uname -s -r -p ; })" +typeset -r http_user_agent="shtwitter/ksh93 (2010-03-27; ${ uname -s -r -p ; })" typeset -r shtwitter_usage=$'+ -[-?\n@(#)\$Id: shtwitter (Roland Mainz) 2009-06-15 \$\n] +[-?\n@(#)\$Id: shtwitter (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?shtwitter - read/write text data to internet clipboards] [+DESCRIPTION?\bshtwitter\b is a small utility which can read and write text diff --git a/usr/src/lib/libshell/common/scripts/simplefileattributetree1.sh b/usr/src/lib/libshell/common/scripts/simplefileattributetree1.sh index 95a36063dc..a7bc41097e 100644 --- a/usr/src/lib/libshell/common/scripts/simplefileattributetree1.sh +++ b/usr/src/lib/libshell/common/scripts/simplefileattributetree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -69,14 +68,18 @@ function add_file_to_tree nodepath="${treename}" for (( i=0 ; i < (${#pe[@]}-1) ; i++ )) ; do nameref x="${nodepath}" - [[ ! -v x.node ]] && compound -A x.nodes + + # [[ -v ]] does not work for arrays because [[ -v ar ]] + # is equal to [[ -v ar[0] ]]. In this case we can + # use the output of typeset +p x.nodes + [[ "${ typeset +p x.nodes ; }" == "" ]] && compound -A x.nodes nodepath+=".nodes[${pe[i]}]" done # insert element nameref node="${nodepath}" - [[ ! -v node.elements ]] && compound -A node.elements + [[ "${ typeset +p node.elements ; }" == "" ]] && compound -A node.elements node.elements[${pe[i]}]=( filepath="${filename}" ) @@ -146,7 +149,7 @@ integer i typeset progname="${ basename "${0}" ; }" typeset -r simplefileattributetree1_usage=$'+ -[-?\n@(#)\$Id: simplefileattributetree1 (Roland Mainz) 2009-06-26 \$\n] +[-?\n@(#)\$Id: simplefileattributetree1 (Roland Mainz) 2010-03-27 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?simplefileattributetree1 - generate compound variable tree which contains file names and their attributes] [+DESCRIPTION?\bsimplefileattributetree1\b is a simple variable tree diff --git a/usr/src/lib/libshell/common/scripts/simplefiletree1.sh b/usr/src/lib/libshell/common/scripts/simplefiletree1.sh index 5b79aae8f8..d2308394cf 100644 --- a/usr/src/lib/libshell/common/scripts/simplefiletree1.sh +++ b/usr/src/lib/libshell/common/scripts/simplefiletree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -68,14 +67,18 @@ function add_file_to_tree nodepath="${treename}" for (( i=0 ; i < (${#pe[@]}-1) ; i++ )) ; do nameref x="${nodepath}" - [[ ! -v x.node ]] && compound -A x.nodes + + # [[ -v ]] does not work for arrays because [[ -v ar ]] + # is equal to [[ -v ar[0] ]]. In this case we can + # use the output of typeset +p x.nodes + [[ "${ typeset +p x.nodes ; }" == "" ]] && compound -A x.nodes nodepath+=".nodes[${pe[i]}]" done # insert element nameref node="${nodepath}" - [[ ! -v node.elements ]] && typeset -a node.elements + [[ "${ typeset +p node.elements ; }" == "" ]] && typeset -a node.elements node.elements+=( "${pe[i]}" ) return 0 diff --git a/usr/src/lib/libshell/common/scripts/svcproptree1.sh b/usr/src/lib/libshell/common/scripts/svcproptree1.sh index d3f1ee9742..60974a361f 100644 --- a/usr/src/lib/libshell/common/scripts/svcproptree1.sh +++ b/usr/src/lib/libshell/common/scripts/svcproptree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant @@ -74,9 +73,7 @@ function svcproptovartree servicename="${servicename/~(El)svc:\//}" # strip "svc:/" propname="${name#~(El).*:properties/}" - if [[ "$(typeset -p "tree[${servicename}].properties")" == "" ]] ; then - compound -A tree[${servicename}].properties - fi + [[ "${ typeset +p "tree[${servicename}].properties" ; }" == "" ]] && compound -A tree[${servicename}].properties nameref node=tree[${servicename}].properties[${propname}] @@ -110,7 +107,7 @@ builtin uname typeset progname="${ basename "${0}" ; }" typeset -r svcproptree1_usage=$'+ -[-?\n@(#)\$Id: svcproptree1 (Roland Mainz) 2009-06-26 \$\n] +[-?\n@(#)\$Id: svcproptree1 (Roland Mainz) 2010-04-02 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [+NAME?svcproptree1 - SMF tree demo] [+DESCRIPTION?\bsvcproptree1\b is a small ksh93 compound variable demo diff --git a/usr/src/lib/libshell/common/scripts/termclock.sh b/usr/src/lib/libshell/common/scripts/termclock.sh index 582e70ad62..c1c4cb8092 100644 --- a/usr/src/lib/libshell/common/scripts/termclock.sh +++ b/usr/src/lib/libshell/common/scripts/termclock.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -268,7 +267,7 @@ hours.length=50 hours.scale=12 hours.ch=$"h" float update_interval=0.9 typeset -r termclock_usage=$'+ -[-?\n@(#)\$Id: termclock (Roland Mainz) 2009-05-09 \$\n] +[-?\n@(#)\$Id: termclock (Roland Mainz) 2009-12-02 \$\n] [-author?Roland Mainz <roland.mainz@nrubsig.org>] [-author?David Korn <dgk@research.att.com>] [+NAME?termclock - analog clock for terminals] @@ -295,7 +294,7 @@ which tput >/dev/null || fatal_error $"tput not found." # create temporary file for double-buffering and register an EXIT trap # to remove this file when the shell interpreter exits -scratchfile="${ mktemp "/tmp/termclock.ppid${PPID}_pid$$.XXXXXX" ; }" +scratchfile="${ mktemp -t "termclock.ppid${PPID}_pid$$.XXXXXX" ; }" [[ "${scratchfile}" != "" ]] || fatal_error $"Could not create temporary file name." trap 'rm -f "${scratchfile}"' EXIT rm -f "${scratchfile}" ; redirect 6<> "${scratchfile}" || fatal_error $"Could not create temporary file." diff --git a/usr/src/lib/libshell/common/scripts/test_net_sctp.sh b/usr/src/lib/libshell/common/scripts/test_net_sctp.sh index 92b805f2dd..97de72a9c6 100644 --- a/usr/src/lib/libshell/common/scripts/test_net_sctp.sh +++ b/usr/src/lib/libshell/common/scripts/test_net_sctp.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # diff --git a/usr/src/lib/libshell/common/scripts/xmldocumenttree1.sh b/usr/src/lib/libshell/common/scripts/xmldocumenttree1.sh index 9bb25b855a..fe7783b21c 100644 --- a/usr/src/lib/libshell/common/scripts/xmldocumenttree1.sh +++ b/usr/src/lib/libshell/common/scripts/xmldocumenttree1.sh @@ -22,8 +22,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # Solaris needs /usr/xpg6/bin:/usr/xpg4/bin because the tools in /usr/bin are not POSIX-conformant diff --git a/usr/src/lib/libshell/common/sh.1 b/usr/src/lib/libshell/common/sh.1 index 365b11fd5c..cf40299f82 100644 --- a/usr/src/lib/libshell/common/sh.1 +++ b/usr/src/lib/libshell/common/sh.1 @@ -1023,7 +1023,7 @@ subscripts must be in the range of 0 through 4,194,303. A negative subscript is treated as an offset from the maximum -current index +1 so that -1 refers to the last element. +current index +1 so that \-1 refers to the last element. Indexed arrays can be declared with the .B \-a option to @@ -5684,7 +5684,7 @@ for usage and description. .TP \(dg\(dg \f3enum\fP \*(OK \f3\-i\fP \*(CK \f2type\^\fP\*(OK=(\f2value\^\fP .\|.\|.) \*(CK Creates a declaration command named \f2type\^\fP that is an -integer type that allows one of the specifed \f2value\fPs as +integer type that allows one of the specified \f2value\fPs as enumeration names. If \f3=(\fP\f2value\^\ .\|.\|.\|\fP\f3)\fP is omitted, then \f2type\^\fP must be an indexed array variable with at least two elements and the values are taken from this array variable. @@ -7768,37 +7768,29 @@ then the line number is also printed in square brackets .RB ( "[]" ) after the command or function name. .SH FILES -/etc/profile +.TP +.B /etc/profile The system wide initialization file, executed for login shells. -.RE .if \nZ=2 \{.br -/etc/ksh.kshrc -.RS +.TP +.B /etc/ksh.kshrc The system wide startup file, executed for interactive shells. -.RE\} -.br -\s-1$HOME\s+1/\f3.\fPprofile -.RS +\} +.TP +.B \s-1$HOME\s+1/\f3.\fPprofile The personal initialization file, executed for login shells after /etc/profile. -.RE -.br +.TP \s-1$HOME\s+1/\f3.\fP.kshrc -.RS Default personal initialization file, executed for interactive shells when .SM .B ENV is not set. -.RE -.br -/etc/suid_profile -.RS +.TP +.B /etc/suid_profile Alternative initialization file, executed when instead of personal initialization file when the real and effective user or group id do not match. -.RE -.br -/dev/null -.RS +.TP +.B /dev/null NULL device -.RE .SH SEE ALSO cat(1), cd(1), diff --git a/usr/src/lib/libshell/common/sh/args.c b/usr/src/lib/libshell/common/sh/args.c index d70e58c048..32afeefa9e 100644 --- a/usr/src/lib/libshell/common/sh/args.c +++ b/usr/src/lib/libshell/common/sh/args.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/arith.c b/usr/src/lib/libshell/common/sh/arith.c index bb17fc936d..684670aae6 100644 --- a/usr/src/lib/libshell/common/sh/arith.c +++ b/usr/src/lib/libshell/common/sh/arith.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -58,14 +58,15 @@ static Namval_t FunNode = static Namval_t *scope(Shell_t *shp,register Namval_t *np,register struct lval *lvalue,int assign) { - register Namarr_t *ap; register int flag = lvalue->flag; register char *sub=0, *cp=(char*)np; register Namval_t *mp; int flags = HASH_NOSCOPE|HASH_SCOPE|HASH_BUCKET; + int nosub = lvalue->nosub; Dt_t *sdict = (shp->st.real_fun? shp->st.real_fun->sdict:0); Dt_t *root = shp->var_tree; assign = assign?NV_ASSIGN:NV_NOASSIGN; + lvalue->nosub = 0; if(cp>=lvalue->expr && cp < lvalue->expr+lvalue->elen) { int offset; @@ -100,7 +101,7 @@ static Namval_t *scope(Shell_t *shp,register Namval_t *np,register struct lval * } np = mp; } - if(flag || sub) + if(!nosub && (flag || sub)) { if(!sub) sub = (char*)&lvalue->expr[flag]; @@ -123,6 +124,7 @@ static Sfdouble_t arith(const char **ptr, struct lval *lvalue, int type, Sfdoubl np = scope(shp,np,lvalue,1); nv_putval(np, (char*)&n, NV_LDOUBLE); r=nv_getnum(np); + lvalue->value = (char*)np; break; } case LOOKUP: diff --git a/usr/src/lib/libshell/common/sh/array.c b/usr/src/lib/libshell/common/sh/array.c index 0346b9fb59..795d434eda 100644 --- a/usr/src/lib/libshell/common/sh/array.c +++ b/usr/src/lib/libshell/common/sh/array.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -286,8 +286,9 @@ static Namval_t *array_find(Namval_t *np,Namarr_t *arp, int flag) np->nvalue.cp = up->cp; if(!up->cp) { + char *xp = nv_setdisc(np,"get",np,(Namfun_t*)np); if(flag!=ARRAY_ASSIGN) - return(0); + return(xp && xp!=(char*)np?np:0); if(!array_covered(np,ap)) ap->header.nelem++; } @@ -922,9 +923,10 @@ int nv_nextsub(Namval_t *np) if(array_isbit(aq->bits, dot,ARRAY_CHILD)) { Namval_t *mp = aq->val[dot].np; - if((aq->header.nelem&ARRAY_NOCHILD) && nv_isvtree(mp)) + if((aq->header.nelem&ARRAY_NOCHILD) && nv_isvtree(mp) && !mp->nvfun->dsize) continue; - nv_putsub(mp,NIL(char*),ARRAY_UNDEF); + if(nv_isarray(mp)) + nv_putsub(mp,NIL(char*),ARRAY_UNDEF); } return(1); } @@ -1255,7 +1257,12 @@ void *nv_associative(register Namval_t *np,const char *sp,int mode) return((void*)ap->cur); case NV_ANAME: if(ap->cur) + { + Shell_t *shp = sh_getinterp(); + if(!shp->instance && nv_isnull(ap->cur)) + return(NIL(void*)); return((void*)ap->cur->nvname); + } return(NIL(void*)); default: if(sp) @@ -1269,7 +1276,7 @@ void *nv_associative(register Namval_t *np,const char *sp,int mode) mode = NV_ADD|HASH_NOSCOPE; else if(ap->header.nelem&ARRAY_NOSCOPE) mode = HASH_NOSCOPE; - if(*sp==0 && (mode&NV_ADD)) + if(*sp==0 && sh_isoption(SH_XTRACE) && (mode&NV_ADD)) errormsg(SH_DICT,ERROR_warn(0),"adding empty subscript"); if(sh.subshell && (mp=nv_search(sp,ap->header.table,0)) && nv_isnull(mp)) ap->cur = mp; @@ -1297,6 +1304,8 @@ void *nv_associative(register Namval_t *np,const char *sp,int mode) ap->pos = mp = (Namval_t*)dtprev(ap->header.table,&fake); ap->nextpos = (Namval_t*)dtnext(ap->header.table,mp); } + else if(!mp && *sp && mode==0) + mp = nv_search(sp,ap->header.table,NV_ADD); np = mp; if(ap->pos && ap->pos==np) ap->header.nelem |= ARRAY_SCAN; diff --git a/usr/src/lib/libshell/common/sh/bash.c b/usr/src/lib/libshell/common/sh/bash.c index 41945b4d53..5b4bdc4ae5 100644 --- a/usr/src/lib/libshell/common/sh/bash.c +++ b/usr/src/lib/libshell/common/sh/bash.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/defs.c b/usr/src/lib/libshell/common/sh/defs.c index b535ac2bce..69895c6778 100644 --- a/usr/src/lib/libshell/common/sh/defs.c +++ b/usr/src/lib/libshell/common/sh/defs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/deparse.c b/usr/src/lib/libshell/common/sh/deparse.c index 88b135262d..4526a84550 100644 --- a/usr/src/lib/libshell/common/sh/deparse.c +++ b/usr/src/lib/libshell/common/sh/deparse.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/env.c b/usr/src/lib/libshell/common/sh/env.c index 0e007ce796..d6db6851e7 100644 --- a/usr/src/lib/libshell/common/sh/env.c +++ b/usr/src/lib/libshell/common/sh/env.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/expand.c b/usr/src/lib/libshell/common/sh/expand.c index 49862d75cb..675e00ba34 100644 --- a/usr/src/lib/libshell/common/sh/expand.c +++ b/usr/src/lib/libshell/common/sh/expand.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/fault.c b/usr/src/lib/libshell/common/sh/fault.c index fc90ad573e..e7bb6f9fad 100644 --- a/usr/src/lib/libshell/common/sh/fault.c +++ b/usr/src/lib/libshell/common/sh/fault.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -362,7 +362,8 @@ void sh_sigclear(register int sig) flag &= ~(SH_SIGTRAP|SH_SIGSET); if(trap=sh.st.trapcom[sig]) { - free(trap); + if(!sh.subshell) + free(trap); sh.st.trapcom[sig]=0; } sh.sigflag[sig] = flag; @@ -404,11 +405,13 @@ void sh_chktrap(void) #ifdef SHOPT_BGX if((sh.sigflag[SIGCHLD]&SH_SIGTRAP) && sh.st.trapcom[SIGCHLD]) job_chldtrap(&sh,sh.st.trapcom[SIGCHLD],1); - while(--sig>=0 && sig!=SIGCHLD) -#else - while(--sig>=0) #endif /* SHOPT_BGX */ + while(--sig>=0) { +#ifdef SHOPT_BGX + if(sig==SIGCHLD) + continue; +#endif /* SHOPT_BGX */ if(sh.sigflag[sig]&SH_SIGTRAP) { sh.sigflag[sig] &= ~SH_SIGTRAP; @@ -437,9 +440,11 @@ int sh_trap(const char *trap, int mode) int was_verbose = sh_isstate(SH_VERBOSE); int staktop = staktell(); char *savptr = stakfreeze(0); + char ifstable[256]; struct checkpt buff; Fcin_t savefc; fcsave(&savefc); + memcpy(ifstable,shp->ifstable,sizeof(ifstable)); sh_offstate(SH_HISTORY); sh_offstate(SH_VERBOSE); shp->intrap++; @@ -477,6 +482,7 @@ int sh_trap(const char *trap, int mode) shp->exitval=savxit; stakset(savptr,staktop); fcrestore(&savefc); + memcpy(shp->ifstable,ifstable,sizeof(ifstable)); if(was_history) sh_onstate(SH_HISTORY); if(was_verbose) diff --git a/usr/src/lib/libshell/common/sh/fcin.c b/usr/src/lib/libshell/common/sh/fcin.c index 0fd7e7cd70..a340f43339 100644 --- a/usr/src/lib/libshell/common/sh/fcin.c +++ b/usr/src/lib/libshell/common/sh/fcin.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -186,7 +186,7 @@ int fcmbstate(const char *state, int *s, int *len) case -1: if(_Fcin._fcfile && (n=(_Fcin.fclast-_Fcin.fcptr)) < MB_LEN_MAX) { - memcmp(extra.buff, _Fcin.fcptr, n); + memcpy(extra.buff, _Fcin.fcptr, n); _Fcin.fcptr = _Fcin.fclast; for(i=n; i < MB_LEN_MAX+n; i++) { diff --git a/usr/src/lib/libshell/common/sh/init.c b/usr/src/lib/libshell/common/sh/init.c index 7371b8de98..97f060ae27 100644 --- a/usr/src/lib/libshell/common/sh/init.c +++ b/usr/src/lib/libshell/common/sh/init.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -360,12 +360,8 @@ static void put_cdpath(register Namval_t* np,const char *val,int flags,Namfun_t { Shell_t *shp = nv_shell(np); int type; - char *lc_all = nv_getval(LCALLNOD); + char *cp; char *name = nv_name(np); - if((shp->test&1) && !val && !nv_getval(np)) - return; - if(shp->test&2) - nv_putv(np, val, flags, fp); if(name==(LCALLNOD)->nvname) type = LC_ALL; else if(name==(LCTYPENOD)->nvname) @@ -381,25 +377,32 @@ static void put_cdpath(register Namval_t* np,const char *val,int flags,Namfun_t type = LC_LANG; #else #define LC_LANG LC_ALL - else if(name==(LANGNOD)->nvname && (!lc_all || !*lc_all)) + else if(name==(LANGNOD)->nvname && (!(cp=nv_getval(LCALLNOD)) || !*cp)) type = LC_LANG; #endif else type= -1; - if(sh_isstate(SH_INIT) && type>=0 && type!=LC_ALL && lc_all && *lc_all) - type= -1; - if(type>=0 || type==LC_ALL || type==LC_LANG) + if(!sh_isstate(SH_INIT) && (type>=0 || type==LC_ALL || type==LC_LANG)) { - if(!setlocale(type,val?val:"-") && val) + struct lconv* lc; + char* r; +#ifdef AST_LC_setenv + ast.locale.set |= AST_LC_setenv; +#endif + r = setlocale(type,val?val:""); +#ifdef AST_LC_setenv + ast.locale.set ^= AST_LC_setenv; +#endif + if(!r && val) { if(!sh_isstate(SH_INIT) || shp->login_sh==0) errormsg(SH_DICT,0,e_badlocale,val); return; } + shp->decomma = (lc=localeconv()) && lc->decimal_point && *lc->decimal_point==','; } - if(!(shp->test&2)) - nv_putv(np, val, flags, fp); - if(CC_NATIVE==CC_ASCII && (type==LC_ALL || type==LC_LANG || type==LC_CTYPE)) + nv_putv(np, val, flags, fp); + if(CC_NATIVE!=CC_ASCII && (type==LC_ALL || type==LC_LANG || type==LC_CTYPE)) { if(sh_lexstates[ST_BEGIN]!=sh_lexrstates[ST_BEGIN]) free((void*)sh_lexstates[ST_BEGIN]); @@ -1022,6 +1025,7 @@ Shell_t *sh_init(register int argc,register char *argv[], Shinit_f userinit) Shell_t *shp = &sh; register int n; int type; + long v; static char *login_files[3]; memfatal(); n = strlen(e_version); @@ -1107,6 +1111,8 @@ Shell_t *sh_init(register int argc,register char *argv[], Shinit_f userinit) shp->lim.arg_max = ARG_MAX; if(shp->lim.child_max <=0) shp->lim.child_max = CHILD_MAX; + if((v = getconf("PID_MAX")) > 0 && shp->lim.child_max > v) + shp->lim.child_max = v; if(shp->lim.open_max <0) shp->lim.open_max = OPEN_MAX; if(shp->lim.open_max > (SHRT_MAX-2)) @@ -1301,8 +1307,8 @@ Shell_t *sh_init(register int argc,register char *argv[], Shinit_f userinit) shp->bltindata.shexit = sh_exit; shp->bltindata.shbltin = sh_addbuiltin; #if _AST_VERSION >= 20080617L - shp->bltindata.shgetenv = getenv; - shp->bltindata.shsetenv = setenviron; + shp->bltindata.shgetenv = sh_getenv; + shp->bltindata.shsetenv = sh_setenviron; astintercept(&shp->bltindata,1); #endif #if 0 @@ -1732,7 +1738,7 @@ static void env_init(Shell_t *shp) np->nvenv = cp; nv_close(np); } - else /* swap with fron */ + else /* swap with front */ { ep[-1] = environ[shp->nenv]; environ[shp->nenv++] = cp; @@ -1743,7 +1749,7 @@ static void env_init(Shell_t *shp) if(next = strchr(++cp,'=')) *next = 0; np = nv_search(cp+2,shp->var_tree,NV_ADD); - if(nv_isattr(np,NV_IMPORT|NV_EXPORT)) + if(np!=SHLVL && nv_isattr(np,NV_IMPORT|NV_EXPORT)) { int flag = *(unsigned char*)cp-' '; int size = *(unsigned char*)(cp+1)-' '; @@ -1774,6 +1780,8 @@ static void env_init(Shell_t *shp) } nv_newattr(np,flag|NV_IMPORT|NV_EXPORT,size); } + else + cp += 2; } } #ifdef _ENV_H diff --git a/usr/src/lib/libshell/common/sh/io.c b/usr/src/lib/libshell/common/sh/io.c index 547a67aa27..fdf72e2b86 100644 --- a/usr/src/lib/libshell/common/sh/io.c +++ b/usr/src/lib/libshell/common/sh/io.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1294,7 +1294,7 @@ int sh_redirect(Shell_t *shp,struct ionod *iop, int flag) } if(fd<0) { - if(sh_inuse(fn) || fn==shp->infd) + if(sh_inuse(fn) || (fn && fn==shp->infd)) { if(fn>9 || !(shp->inuse_bits&(1<<fn))) io_preserve(shp,shp->sftable[fn],fn); diff --git a/usr/src/lib/libshell/common/sh/jobs.c b/usr/src/lib/libshell/common/sh/jobs.c index 778be37706..46d4a21b9f 100644 --- a/usr/src/lib/libshell/common/sh/jobs.c +++ b/usr/src/lib/libshell/common/sh/jobs.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -183,9 +183,11 @@ void job_chldtrap(Shell_t *shp, const char *trap, int unpost) { register struct process *pw,*pwnext; pid_t bckpid; - int oldexit; + int oldexit,trapnote; job_lock(); shp->sigflag[SIGCHLD] &= ~SH_SIGTRAP; + trapnote = shp->trapnote; + shp->trapnote = 0; for(pw=job.pwlist;pw;pw=pwnext) { pwnext = pw->p_nxtjob; @@ -199,11 +201,12 @@ void job_chldtrap(Shell_t *shp, const char *trap, int unpost) if(pw->p_flag&P_SIGNALLED) shp->savexit |= SH_EXITSIG; sh_trap(trap,0); + if(pw->p_pid==bckpid && unpost) + job_unpost(pw,0); shp->savexit = oldexit; shp->bckpid = bckpid; - if(unpost) - job_unpost(pw,0); } + shp->trapnote = trapnote; job_unlock(); } #endif /* SHOPT_BGX */ @@ -285,7 +288,7 @@ int job_reap(register int sig) if (pid<0 && errno==EINVAL && (flags&WCONTINUED)) pid = waitpid((pid_t)-1,&wstat,flags&=~WCONTINUED); sh_sigcheck(); - if(sig && pid<0 && errno==EINTR) + if(pid<0 && errno==EINTR && (sig||job.savesig)) continue; if(pid<=0) break; @@ -569,9 +572,15 @@ void job_init(Shell_t *shp, int lflag) #ifdef SIGTSTP /* make sure that we are a process group leader */ setpgid(0,shp->pid); -# if defined(SA_NOCLDWAIT) && defined(_lib_sigflag) +# if defined(SA_NOCLDSTOP) || defined(SA_NOCLDWAIT) +# if !defined(SA_NOCLDSTOP) +# define SA_NOCLDSTOP 0 +# endif +# if !defined(SA_NOCLDWAIT) +# define SA_NOCLDWAIT 0 +# endif sigflag(SIGCHLD, SA_NOCLDSTOP|SA_NOCLDWAIT, 0); -# endif /* SA_NOCLDWAIT */ +# endif /* SA_NOCLDSTOP || SA_NOCLDWAIT */ signal(SIGTTIN,SIG_IGN); signal(SIGTTOU,SIG_IGN); /* The shell now handles ^Z */ @@ -1177,7 +1186,7 @@ int job_post(pid_t pid, pid_t join) job.pwlist = pw; pw->p_env = sh.curenv; pw->p_pid = pid; - if(!sh.outpipe || sh_isoption(SH_PIPEFAIL)) + if(!sh.outpipe || (sh_isoption(SH_PIPEFAIL) && job.waitall)) pw->p_flag = P_EXITSAVE; pw->p_exitmin = sh.xargexit; pw->p_exit = 0; @@ -1413,7 +1422,7 @@ int job_wait(register pid_t pid) } } px = job_unpost(pw,1); - if(!px || !sh_isoption(SH_PIPEFAIL)) + if(!px || !sh_isoption(SH_PIPEFAIL) || !job.waitall) break; pw = px; continue; @@ -1623,6 +1632,7 @@ static struct process *job_unpost(register struct process *pwtop,int notify) pw->p_nxtjob = freelist; freelist = pw; } + pwtop->p_pid = 0; #ifdef DEBUG sfprintf(sfstderr,"ksh: job line %4d: free pid=%d critical=%d job=%d\n",__LINE__,getpid(),job.in_critical,pwtop->p_job); sfsync(sfstderr); @@ -1837,6 +1847,7 @@ void job_fork(pid_t parent) job.in_critical = 0; break; default: + job_chksave(parent); job_unlock(); break; } diff --git a/usr/src/lib/libshell/common/sh/lex.c b/usr/src/lib/libshell/common/sh/lex.c index b5a0761dae..5a2f7c239f 100644 --- a/usr/src/lib/libshell/common/sh/lex.c +++ b/usr/src/lib/libshell/common/sh/lex.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -273,6 +273,7 @@ Lex_t *sh_lexopen(Lex_t *lp, Shell_t *sp, int mode) { lp->lexd.noarg = lp->lexd.level= lp->lexd.dolparen = lp->lexd.balance = 0; lp->lexd.nocopy = lp->lexd.docword = lp->lexd.nest = lp->lexd.paren = 0; + lp->lexd.lex_state = lp->lexd.lastc=0; } lp->comsub = 0; return(lp); @@ -1080,9 +1081,6 @@ int sh_lex(Lex_t* lp) return(lp->token=EXPRSYM); } /* backward compatibility */ - if(lp->lexd.dolparen) - fcseek(-1); - else { if(lp->lexd.warn) errormsg(SH_DICT,ERROR_warn(0),e_lexnested,shp->inlineno); @@ -1487,7 +1485,7 @@ static int comsub(register Lex_t *lp, int endtok) register int n,c,count=1; register int line=lp->sh->inlineno; char word[5]; - int messages=0, assignok=lp->assignok, csub; + int off, messages=0, assignok=lp->assignok, csub; struct lexstate save; save = lp->lex; csub = lp->comsub; @@ -1496,8 +1494,15 @@ static int comsub(register Lex_t *lp, int endtok) lp->lex.incase=0; pushlevel(lp,0,0); lp->comsub = (endtok==LBRACE); + off = fcseek(0) - lp->lexd.first; if(sh_lex(lp)==endtok) { + if(endtok==LPAREN && fcseek(0)==lp->lexd.first) + { + count++; + lp->lexd.paren = 0; + fcseek(off+2); + } while(1) { /* look for case and esac */ diff --git a/usr/src/lib/libshell/common/sh/macro.c b/usr/src/lib/libshell/common/sh/macro.c index 684e2d0464..2af54f88f7 100644 --- a/usr/src/lib/libshell/common/sh/macro.c +++ b/usr/src/lib/libshell/common/sh/macro.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1852,7 +1852,7 @@ retry2: mac_error(np); } } - else if(var && sh_isoption(SH_NOUNSET) && (!np || nv_isnull(np) || (nv_isarray(np) && !np->nvalue.cp))) + else if(var && sh_isoption(SH_NOUNSET) && type<=M_TREE && (!np || nv_isnull(np) || (nv_isarray(np) && !np->nvalue.cp))) { if(np) { diff --git a/usr/src/lib/libshell/common/sh/main.c b/usr/src/lib/libshell/common/sh/main.c index 54949b0d85..a1dc119bcb 100644 --- a/usr/src/lib/libshell/common/sh/main.c +++ b/usr/src/lib/libshell/common/sh/main.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -443,7 +443,10 @@ static void exfile(register Shell_t *shp, register Sfio_t *iop,register int fno) shp->st.execbrk = shp->st.breakcnt = 0; /* check for return from profile or env file */ if(sh_isstate(SH_PROFILE) && (jmpval==SH_JMPFUN || jmpval==SH_JMPEXIT)) + { + sh_setstate(states); goto done; + } if(!sh_isoption(SH_INTERACTIVE) || sh_isstate(SH_FORKED) || (jmpval > SH_JMPERREXIT && job_close(shp) >=0)) { sh_offstate(SH_INTERACTIVE); diff --git a/usr/src/lib/libshell/common/sh/name.c b/usr/src/lib/libshell/common/sh/name.c index 2189a3a42a..84e9cced11 100644 --- a/usr/src/lib/libshell/common/sh/name.c +++ b/usr/src/lib/libshell/common/sh/name.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -53,8 +53,8 @@ pathnative(const char* path, char* buf, size_t siz) static void attstore(Namval_t*,void*); #ifndef _ENV_H -static void pushnam(Namval_t*,void*); -static char *staknam(Namval_t*, char*); + static void pushnam(Namval_t*,void*); + static char *staknam(Namval_t*, char*); #endif static void ltou(char*); static void utol(char*); @@ -538,7 +538,11 @@ void nv_setlist(register struct argnod *arg,register int flags, Namval_t *typ) } if(!nv_isarray(np) && !typ && (tp->com.comarg || !tp->com.comset || tp->com.comset->argval[0]!='[')) + { nv_setvtree(np); + if(tp->com.comarg || tp->com.comset) + np->nvfun->dsize = 0; + } #if SHOPT_TYPEDEF goto check_type; #else @@ -753,7 +757,7 @@ Namval_t *nv_create(const char *name, Dt_t *root, int flags, Namfun_t *dp) if(shp->var_tree->walk == shp->var_base) { nq = np; - if(flags&NV_NOSCOPE) + if((flags&NV_NOSCOPE) && *cp!='.') { if(mode==0) root = shp->var_base; @@ -857,7 +861,7 @@ Namval_t *nv_create(const char *name, Dt_t *root, int flags, Namfun_t *dp) } shp->last_root = root; - if(cp[1]=='.') + if(*cp && cp[1]=='.') cp++; if(c=='.' && (cp[1]==0 || cp[1]=='=' || cp[1]=='+')) { @@ -1357,9 +1361,7 @@ void nv_putval(register Namval_t *np, const char *string, int flags) register char *cp; register int size = 0; register int dot; -#ifdef _ENV_H int was_local = nv_local; -#endif union Value u; if(!(flags&NV_RDONLY) && nv_isattr (np, NV_RDONLY)) errormsg(SH_DICT,ERROR_exit(1),e_readonly, nv_name(np)); @@ -1376,10 +1378,8 @@ void nv_putval(register Namval_t *np, const char *string, int flags) { nv_local=1; nv_putv(np,sp,flags,np->nvfun); -#ifdef _ENV_H if(sp && ((flags&NV_EXPORT) || nv_isattr(np,NV_EXPORT))) sh_envput(sh.env,np); -#endif return; } /* called from disc, assign the actual value */ @@ -1639,7 +1639,7 @@ void nv_putval(register Namval_t *np, const char *string, int flags) } if(nv_isattr(np,NV_BINARY) && !(flags&NV_RAW)) tofree = 0; - if(nv_isattr(np,NV_LJUST|NV_RJUST)) + if(nv_isattr(np,NV_LJUST|NV_RJUST) && nv_isattr(np,NV_LJUST|NV_RJUST)!=(NV_LJUST|NV_RJUST)) tofree = 0; if (sp) { @@ -1680,11 +1680,11 @@ void nv_putval(register Namval_t *np, const char *string, int flags) } else #endif - if(size==0 && nv_isattr(np,NV_LJUST|NV_RJUST|NV_ZFILL)) + if(size==0 && nv_isattr(np,NV_HOST)!=NV_HOST &&nv_isattr(np,NV_LJUST|NV_RJUST|NV_ZFILL)) nv_setsize(np,size=dot); else if(size > dot) dot = size; - else if(nv_isattr(np,NV_LJUST) && dot>size) + else if(nv_isattr(np,NV_LJUST|NV_RJUST)==NV_LJUST && dot>size) dot = size; if(size==0 || tofree || !(cp=(char*)up->cp)) { @@ -1709,9 +1709,9 @@ void nv_putval(register Namval_t *np, const char *string, int flags) cp[dot] = c; if(nv_isattr(np, NV_RJUST) && nv_isattr(np, NV_ZFILL)) rightjust(cp,size,'0'); - else if(nv_isattr(np, NV_RJUST)) + else if(nv_isattr(np, NV_LJUST|NV_RJUST)==NV_RJUST) rightjust(cp,size,' '); - else if(nv_isattr(np, NV_LJUST)) + else if(nv_isattr(np, NV_LJUST|NV_RJUST)==NV_LJUST) { register char *dp; dp = strlen (cp) + cp; @@ -1729,10 +1729,8 @@ void nv_putval(register Namval_t *np, const char *string, int flags) if(tofree && tofree!=Empty) free((void*)tofree); } -#ifdef _ENV_H if(!was_local && ((flags&NV_EXPORT) || nv_isattr(np,NV_EXPORT))) sh_envput(sh.env,np); -#endif return; } @@ -1920,11 +1918,8 @@ static void pushnam(Namval_t *np, void *data) register struct adata *ap = (struct adata*)data; ap->sh = &sh; ap->tp = 0; - if(nv_isattr(np,NV_IMPORT)) - { - if(np->nvenv) - *ap->argnam++ = np->nvenv; - } + if(nv_isattr(np,NV_IMPORT) && np->nvenv) + *ap->argnam++ = np->nvenv; else if(value=nv_getval(np)) *ap->argnam++ = staknam(np,value); if(nv_isattr(np,NV_RDONLY|NV_UTOL|NV_LTOU|NV_RJUST|NV_LJUST|NV_ZFILL|NV_INTEGER)) @@ -2001,7 +1996,7 @@ static int scanfilter(Dt_t *dict, void *arg, void *data) register struct adata *tp = (struct adata*)sp->scandata; NOT_USED(dict); #if SHOPT_TYPEDEF - if(tp && !is_abuiltin(np) && tp && tp->tp && nv_type(np)!=tp->tp) + if(!is_abuiltin(np) && tp && tp->tp && nv_type(np)!=tp->tp) return(0); #endif /*SHOPT_TYPEDEF */ if(sp->scanmask?(k&sp->scanmask)==sp->scanflags:(!sp->scanflags || (k&sp->scanflags))) @@ -2153,10 +2148,8 @@ static void table_unset(Shell_t *shp, register Dt_t *root, int flags, Dt_t *oroo shp->subshell = subshell; np->nvfun = 0; } -#ifdef _ENV_H if(nv_isattr(nq,NV_EXPORT)) sh_envput(shp->env,nq); -#endif } npnext = (Namval_t*)dtnext(root,np); shp->last_root = root; @@ -2556,8 +2549,10 @@ done: if(up->cp && nv_isattr(np,NV_BINARY) && !nv_isattr(np,NV_RAW)) { char *cp; + char *ep; int size= nv_size(np), insize=(4*size)/3+size/45+8; - base64encode(up->cp, size, (void**)0, cp=getbuf(insize), insize, (void**)0); + base64encode(up->cp, size, (void**)0, cp=getbuf(insize), insize, (void**)&ep); + *ep = 0; return(cp); } #endif @@ -2673,7 +2668,6 @@ void nv_newattr (register Namval_t *np, unsigned newatts, int size) n = np->nvflag; if(newatts&NV_EXPORT) nv_offattr(np,NV_IMPORT); -#ifdef _ENV_H if(((n^newatts)&NV_EXPORT)) { /* record changes to the environment */ @@ -2682,7 +2676,6 @@ void nv_newattr (register Namval_t *np, unsigned newatts, int size) else sh_envput(sh.env,np); } -#endif oldsize = nv_size(np); if((size==oldsize|| (n&NV_INTEGER)) && ((n^newatts)&~NV_NOCHANGE)==0) { @@ -2726,7 +2719,7 @@ void nv_newattr (register Namval_t *np, unsigned newatts, int size) } else nv_unset(np); - if(size==0 && (newatts&(NV_LJUST|NV_RJUST|NV_ZFILL))) + if(size==0 && (newatts&NV_HOST)!=NV_HOST && (newatts&(NV_LJUST|NV_RJUST|NV_ZFILL))) size = n; } else @@ -2749,7 +2742,6 @@ void nv_newattr (register Namval_t *np, unsigned newatts, int size) return; } -#ifndef _NEXT_SOURCE static char *oldgetenv(const char *string) { register char c0,c1; @@ -2774,20 +2766,34 @@ static char *oldgetenv(const char *string) /* * This version of getenv uses the hash storage to access environment values */ -char *getenv(const char *name) +char *sh_getenv(const char *name) /*@ assume name!=0; @*/ { register Namval_t *np; if(!sh.var_tree) - return(oldgetenv(name)); - if((np = nv_search(name,sh.var_tree,0)) && nv_isattr(np,NV_EXPORT)) + { +#if 0 + if(name[0] == 'P' && name[1] == 'A' && name[2] == 'T' && name[3] == 'H' && name[4] == 0 || name[0] == 'L' && ((name[1] == 'C' || name[1] == 'D') && name[2] == '_' || name[1] == 'A' && name[1] == 'N') || name[0] == 'V' && name[1] == 'P' && name[2] == 'A' && name[3] == 'T' && name[4] == 'H' && name[5] == 0 || name[0] == '_' && name[1] == 'R' && name[2] == 'L' && name[3] == 'D' || name[0] == '_' && name[1] == 'A' && name[2] == 'S' && name[3] == 'T' && name[4] == '_') +#endif + return(oldgetenv(name)); + } + else if((np = nv_search(name,sh.var_tree,0)) && nv_isattr(np,NV_EXPORT)) return(nv_getval(np)); - if(name[0] == 'P' && name[1] == 'A' && name[2] == 'T' && name[3] == 'H' && name[4] == 0) - return(oldgetenv(name)); return(0); } + +#ifndef _NEXT_SOURCE +/* + * Some dynamic linkers will make this file see the libc getenv(), + * so sh_getenv() is used for the astintercept() callback. Plain + * getenv() is provided for static links. + */ +char *getenv(const char *name) +{ + return sh_getenv(name); +} #endif /* _NEXT_SOURCE */ #undef putenv @@ -2806,11 +2812,10 @@ int putenv(const char *name) return(0); } - /* - * Override libast setenv() + * Override libast setenviron(). */ -char* setenviron(const char *name) +char* sh_setenviron(const char *name) { register Namval_t *np; if(name) @@ -2824,6 +2829,14 @@ char* setenviron(const char *name) } /* + * Same linker dance as with getenv() above. + */ +char* setenviron(const char *name) +{ + return sh_setenviron(name); +} + +/* * convert <str> to upper case */ static void ltou(register char *str) diff --git a/usr/src/lib/libshell/common/sh/nvdisc.c b/usr/src/lib/libshell/common/sh/nvdisc.c index 94b2d28ca9..7c8918ef1f 100644 --- a/usr/src/lib/libshell/common/sh/nvdisc.c +++ b/usr/src/lib/libshell/common/sh/nvdisc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -431,6 +431,12 @@ char *nv_setdisc(register Namval_t* np,register const char *event,Namval_t *acti register struct vardisc *vp = (struct vardisc*)np->nvfun; register int type; char *empty = ""; + while(vp) + { + if(vp->fun.disc && (vp->fun.disc->setdisc || vp->fun.disc->putval == assign)) + break; + vp = (struct vardisc*)vp->fun.next; + } if(vp && !vp->fun.disc) vp = 0; if(np == (Namval_t*)fp) @@ -494,6 +500,8 @@ char *nv_setdisc(register Namval_t* np,register const char *event,Namval_t *acti memset(dp,0,sizeof(*dp)); dp->dsize = sizeof(struct vardisc); dp->putval = assign; + if(nv_isarray(np) && !nv_arrayptr(np)) + nv_putsub(np,(char*)0, 1); nv_stack(np, (Namfun_t*)vp); } if(action==np) @@ -907,6 +915,8 @@ int nv_clone(Namval_t *np, Namval_t *mp, int flags) nv_setsize(mp,nv_size(np)); if(mp->nvflag == flag) mp->nvflag = (np->nvflag&~(NV_MINIMAL))|(mp->nvflag&NV_MINIMAL); + if(nv_isattr(np,NV_EXPORT)) + mp->nvflag |= (np->nvflag&NV_MINIMAL); if(mp->nvalue.cp==val && !nv_isattr(np,NV_INTEGER)) { if(np->nvalue.cp && np->nvalue.cp!=Empty && (flags&NV_COMVAR) && !(flags&NV_MOVE)) @@ -927,8 +937,13 @@ int nv_clone(Namval_t *np, Namval_t *mp, int flags) np->nvfun = 0; np->nvalue.cp = 0; if(!nv_isattr(np,NV_MINIMAL) || nv_isattr(mp,NV_EXPORT)) + { + mp->nvenv = np->nvenv; np->nvenv = 0; - np->nvflag &= NV_MINIMAL; + np->nvflag = 0; + } + else + np->nvflag &= NV_MINIMAL; nv_setsize(np,0); return(1); } @@ -1368,3 +1383,14 @@ const Namdisc_t *nv_discfun(int which) return(0); } +int nv_hasget(Namval_t *np) +{ + register Namfun_t *fp; + for(fp=np->nvfun; fp; fp=fp->next) + { + if(!fp->disc || (!fp->disc->getnum && !fp->disc->getval)) + continue; + return(1); + } + return(0); +} diff --git a/usr/src/lib/libshell/common/sh/nvtree.c b/usr/src/lib/libshell/common/sh/nvtree.c index 36d7d933e3..eaa0dc99d2 100644 --- a/usr/src/lib/libshell/common/sh/nvtree.c +++ b/usr/src/lib/libshell/common/sh/nvtree.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -69,6 +69,7 @@ static int read_tree(Namval_t* np, Sfio_t *iop, int n, Namfun_t *dp) static Namval_t *create_tree(Namval_t *np,const char *name,int flag,Namfun_t *dp) { register Namfun_t *fp=dp; + fp->dsize = 0; while(fp=fp->next) { if(fp->disc && fp->disc->createf) @@ -723,7 +724,10 @@ static void outval(char *name, const char *vname, struct Walk *wp) nv_attribute(np,wp->out,"typeset",'='); nv_outname(wp->out,name,-1); if((np->nvalue.cp && np->nvalue.cp!=Empty) || nv_isattr(np,~(NV_MINIMAL|NV_NOFREE)) || nv_isvtree(np)) - sfputc(wp->out,(isarray==2?'\n':'=')); + { + if(wp->indent>=0 || isarray!=2) + sfputc(wp->out,(isarray==2?'\n':'=')); + } if(isarray==2) return; } @@ -1015,7 +1019,7 @@ Namfun_t *nv_isvtree(Namval_t *np) */ char *nv_getvtree(register Namval_t *np, Namfun_t *fp) { - int flags=0; + int flags=0, dsize=fp->dsize; for(; fp && fp->next; fp=fp->next) { if(fp->next->disc && (fp->next->disc->getnum || fp->next->disc->getval)) @@ -1027,6 +1031,8 @@ char *nv_getvtree(register Namval_t *np, Namfun_t *fp) return(nv_getv(np,fp)); if(flags = nv_isattr(np,NV_EXPORT)) nv_offattr(np,NV_EXPORT); + if(dsize && (flags&NV_EXPORT)) + return("()"); return(walk_tree(np,(Namval_t*)0,flags)); } @@ -1083,6 +1089,7 @@ void nv_setvtree(register Namval_t *np) return; nfp = newof(NIL(void*),Namfun_t,1,0); nfp->disc = &treedisc; + nfp->dsize = sizeof(Namfun_t); nv_stack(np, nfp); } diff --git a/usr/src/lib/libshell/common/sh/nvtype.c b/usr/src/lib/libshell/common/sh/nvtype.c index 82eab00d83..603f72111e 100644 --- a/usr/src/lib/libshell/common/sh/nvtype.c +++ b/usr/src/lib/libshell/common/sh/nvtype.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -1140,6 +1140,7 @@ else sfprintf(sfstderr,"tp==NULL\n"); { sp= (char*)&np->nvalue; nv_onattr(nq,NV_INT16P); + j = 1; } if(sp) memcpy((char*)nq->nvalue.cp,sp,dsize); diff --git a/usr/src/lib/libshell/common/sh/parse.c b/usr/src/lib/libshell/common/sh/parse.c index c7290d20e7..28d52ac769 100644 --- a/usr/src/lib/libshell/common/sh/parse.c +++ b/usr/src/lib/libshell/common/sh/parse.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -247,6 +247,34 @@ static Shnode_t *makeparent(Lex_t *lp, int flag, Shnode_t *child) return(par); } +static int paramsub(const char *str) +{ + register int c,sub=0,lit=0; + while(c= *str++) + { + if(c=='$' && !lit) + { + if(*str=='(') + return(0); + if(sub) + continue; + if(*str=='{') + str++; + if(!isdigit(*str) && strchr("?#@*!$ ",*str)==0) + return(1); + } + else if(c=='`') + return(0); + else if(c=='[' && !lit) + sub++; + else if(c==']' && !lit) + sub--; + else if(c=='\'') + lit = !lit; + } + return(0); +} + static Shnode_t *getanode(Lex_t *lp, struct argnod *ap) { register Shnode_t *t = getnode(arithnod); @@ -256,7 +284,11 @@ static Shnode_t *getanode(Lex_t *lp, struct argnod *ap) if(ap->argflag&ARG_RAW) t->ar.arcomp = sh_arithcomp(ap->argval); else + { + if(sh_isoption(SH_NOEXEC) && (ap->argflag&ARG_MAC) && paramsub(ap->argval)) + errormsg(SH_DICT,ERROR_warn(0),"%d: parameter substitution requires unnecessary string to number conversion",lp->sh->inlineno-(lp->token=='\n')); t->ar.arcomp = 0; + } return(t); } @@ -797,6 +829,8 @@ static Shnode_t *funct(Lex_t *lexp) } t->funct.functtre = item(lexp,SH_NOIO); } + else if(shp->shcomp) + exit(1); sh_popcontext(&buff); loop_level = saveloop; label_last = savelabel; @@ -1413,7 +1447,7 @@ static Shnode_t *simple(Lex_t *lexp,int flag, struct ionod *io) *argtail = 0; if(argno>0) argmax = argno; - t->comtyp = TCOM | (argmax<<(COMBITS+2)); + t->comtyp = TCOM; #if SHOPT_KIA if(lexp->kiafile && !(flag&SH_NOIO)) { diff --git a/usr/src/lib/libshell/common/sh/path.c b/usr/src/lib/libshell/common/sh/path.c index 94af2fe682..c6f691aef4 100644 --- a/usr/src/lib/libshell/common/sh/path.c +++ b/usr/src/lib/libshell/common/sh/path.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -39,8 +39,6 @@ #if SHOPT_PFSH # ifdef _hdr_exec_attr # include <exec_attr.h> -# else -# undef SHOPT_PFSH # endif # if _lib_vfork # include <ast_vfork.h> @@ -139,7 +137,10 @@ static pid_t _spawnveg(const char *path, char* const argv[], char* const envp[], _sh_fork(pid, 0, (int*)0); } job.waitsafe = waitsafe; - job_unlock(); + if(pid>0) + job_fork(pid); + else + job_unlock(); return(pid); } /* @@ -1497,7 +1498,7 @@ static int path_chkpaths(Pathcomp_t *first, Pathcomp_t* old,Pathcomp_t *pp, int } *cp = 0; m = ep ? (ep-sp) : 0; - if(!m || m==6 && memcmp((void*)sp,(void*)"FPATH=",6)==0) + if(m==0 || m==6 && memcmp((void*)sp,(void*)"FPATH=",6)==0) { if(first) { @@ -1509,8 +1510,13 @@ static int path_chkpaths(Pathcomp_t *first, Pathcomp_t* old,Pathcomp_t *pp, int } else if(m==12 && memcmp((void*)sp,(void*)"BUILTIN_LIB=",12)==0) { - if(!(pp->flags & PATH_BUILTIN_LIB)) + if(!(pp->flags & PATH_BUILTIN_LIB) || strchr(ep,'-')) { + if ((pp->flags & (PATH_BUILTIN_LIB|PATH_STD_DIR)) == PATH_BUILTIN_LIB) + { + free(pp->blib); + pp->blib = 0; + } pp->flags |= PATH_BUILTIN_LIB; if (*ep == '.' && !*(ep + 1)) pp->flags |= PATH_STD_DIR; diff --git a/usr/src/lib/libshell/common/sh/pmain.c b/usr/src/lib/libshell/common/sh/pmain.c index 8cab334192..f04a799719 100644 --- a/usr/src/lib/libshell/common/sh/pmain.c +++ b/usr/src/lib/libshell/common/sh/pmain.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/shcomp.c b/usr/src/lib/libshell/common/sh/shcomp.c index 1cd0383673..6ba9c0c3e7 100644 --- a/usr/src/lib/libshell/common/sh/shcomp.c +++ b/usr/src/lib/libshell/common/sh/shcomp.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -36,7 +36,7 @@ USAGE_LICENSE "script.]" "[+?Since aliases are processed as the script is read, alias definitions " "whose value requires variable expansion will not work correctly.]" -"[+?If \b-D\b is specifed, all double quoted strings that are preceded by " +"[+?If \b-D\b is specified, all double quoted strings that are preceded by " "\b$\b are output. These are the messages that need to be " "translated to locale specific versions for internationalization.]" "[+?If \aoutfile\a is omitted, then the results will be written to " diff --git a/usr/src/lib/libshell/common/sh/streval.c b/usr/src/lib/libshell/common/sh/streval.c index 92a8256594..7053831da0 100644 --- a/usr/src/lib/libshell/common/sh/streval.c +++ b/usr/src/lib/libshell/common/sh/streval.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -34,6 +34,7 @@ #include <error.h> #include <stak.h> #include "FEATURE/externs" +#include "defs.h" /* for sh.decomma */ #ifndef ERROR_dictionary # define ERROR_dictionary(s) (s) @@ -162,6 +163,8 @@ Sfdouble_t arith_exec(Arith_t *ep) node.emode = ep->emode; node.expr = ep->expr; node.elen = ep->elen; + node.value = 0; + node.nosub = 0; if(level++ >=MAXLEVEL) { arith_error(e_recursive,ep->expr,ep->emode); @@ -195,17 +198,21 @@ Sfdouble_t arith_exec(Arith_t *ep) type=0; break; case A_PLUSPLUS: + node.nosub = 1; (*ep->fun)(&ptr,&node,ASSIGN,num+1); break; case A_MINUSMINUS: + node.nosub = 1; (*ep->fun)(&ptr,&node,ASSIGN,num-1); break; case A_INCR: num = num+1; + node.nosub = 1; num = (*ep->fun)(&ptr,&node,ASSIGN,num); break; case A_DECR: num = num-1; + node.nosub = 1; num = (*ep->fun)(&ptr,&node,ASSIGN,num); break; case A_SWAP: @@ -248,6 +255,8 @@ Sfdouble_t arith_exec(Arith_t *ep) *++tp = type; c = 0; break; + case A_ASSIGNOP: + node.nosub = 1; case A_STORE: cp = roundptr(ep,cp,Sfdouble_t*); dp = *((Sfdouble_t**)cp); @@ -430,15 +439,21 @@ static int gettok(register struct vars *vp) case A_EOF: vp->nextchr--; break; - /*FALL THRU*/ - case A_DIG: case A_REG: case A_DOT: case A_LIT: - if(op==A_DOT) + case A_COMMA: + if(sh.decomma && (c=peekchr(vp))>='0' && c<='9') { - if((c=peekchr(vp))>='0' && c<='9') - op = A_DIG; - else - op = A_REG; + op = A_DIG; + goto keep; } + break; + case A_DOT: + if((c=peekchr(vp))>='0' && c<='9') + op = A_DIG; + else + op = A_REG; + /*FALL THRU*/ + case A_DIG: case A_REG: case A_LIT: + keep: ungetchr(vp); break; case A_QUEST: @@ -483,7 +498,7 @@ static int expr(register struct vars *vp,register int precedence) int invalid,wasop=0; struct lval lvalue,assignop; const char *pos; - Sfdouble_t d; + Sfdouble_t d; lvalue.value = 0; lvalue.fun = 0; @@ -603,7 +618,7 @@ again: } if(!expr(vp,c)) { - stakseek(-1); + stakseek(staktell()-1); return(0); } lvalue.value = 0; @@ -784,7 +799,7 @@ again: vp->stakmaxsize = vp->staksize; if(assignop.flag<0) assignop.flag = 0; - stakputc(A_STORE); + stakputc(c&1?A_ASSIGNOP:A_STORE); stakpush(vp,assignop.value,char*); stakpush(vp,assignop.flag,short); } diff --git a/usr/src/lib/libshell/common/sh/string.c b/usr/src/lib/libshell/common/sh/string.c index 89b34159e5..648e40ee05 100644 --- a/usr/src/lib/libshell/common/sh/string.c +++ b/usr/src/lib/libshell/common/sh/string.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/subshell.c b/usr/src/lib/libshell/common/sh/subshell.c index 9f6eeafdd9..23ad7c3cac 100644 --- a/usr/src/lib/libshell/common/sh/subshell.c +++ b/usr/src/lib/libshell/common/sh/subshell.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -213,6 +213,7 @@ void sh_subfork(void) /* setting subpid to 1 causes subshell to exit when reached */ sh_onstate(SH_FORKED); sh_onstate(SH_NOLOG); + sh_offoption(SH_MONITOR); sh_offstate(SH_MONITOR); subshell_data = 0; shp->subshell = 0; diff --git a/usr/src/lib/libshell/common/sh/suid_exec.c b/usr/src/lib/libshell/common/sh/suid_exec.c index 04fad8051e..a29a744dec 100644 --- a/usr/src/lib/libshell/common/sh/suid_exec.c +++ b/usr/src/lib/libshell/common/sh/suid_exec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/tdump.c b/usr/src/lib/libshell/common/sh/tdump.c index afdd6336dd..444ed340db 100644 --- a/usr/src/lib/libshell/common/sh/tdump.c +++ b/usr/src/lib/libshell/common/sh/tdump.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -26,11 +26,11 @@ * */ -#include <ccode.h> #include "defs.h" #include "shnodes.h" #include "path.h" #include "io.h" +#include <ccode.h> static int p_comlist(const struct dolnod*); static int p_arg(const struct argnod*); diff --git a/usr/src/lib/libshell/common/sh/timers.c b/usr/src/lib/libshell/common/sh/timers.c index 7508525834..cd69eb220d 100644 --- a/usr/src/lib/libshell/common/sh/timers.c +++ b/usr/src/lib/libshell/common/sh/timers.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/trestore.c b/usr/src/lib/libshell/common/sh/trestore.c index 98ae02a004..1034f1f3f9 100644 --- a/usr/src/lib/libshell/common/sh/trestore.c +++ b/usr/src/lib/libshell/common/sh/trestore.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -26,11 +26,11 @@ * */ -#include <ccode.h> #include "defs.h" #include "shnodes.h" #include "path.h" #include "io.h" +#include <ccode.h> static struct dolnod *r_comlist(Shell_t*); static struct argnod *r_arg(Shell_t*); diff --git a/usr/src/lib/libshell/common/sh/waitevent.c b/usr/src/lib/libshell/common/sh/waitevent.c index d04ea1d809..ae246b4727 100644 --- a/usr/src/lib/libshell/common/sh/waitevent.c +++ b/usr/src/lib/libshell/common/sh/waitevent.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/common/sh/xec.c b/usr/src/lib/libshell/common/sh/xec.c index 2e59e8a8f2..e6ba69dd74 100644 --- a/usr/src/lib/libshell/common/sh/xec.c +++ b/usr/src/lib/libshell/common/sh/xec.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -608,7 +608,7 @@ static void free_list(struct openlist *olist) * set ${.sh.name} and ${.sh.subscript} * set _ to reference for ${.sh.name}[$.sh.subscript] */ -static int set_instance(Namval_t *nq, Namval_t *node, struct Namref *nr) +static int set_instance(Shell_t *shp,Namval_t *nq, Namval_t *node, struct Namref *nr) { char *sp=0,*cp = nv_name(nq); Namarr_t *ap; @@ -616,8 +616,10 @@ static int set_instance(Namval_t *nq, Namval_t *node, struct Namref *nr) nr->np = nq; nr->root = sh.var_tree; nr->table = sh.last_table; + shp->instance = 1; if((ap=nv_arrayptr(nq)) && (sp = nv_getsub(nq))) sp = strdup(sp); + shp->instance = 0; if(sh.var_tree!=sh.var_base && !nv_open(cp,nr->root,NV_VARNAME|NV_NOREF|NV_NOSCOPE|NV_NOADD|NV_NOFAIL)) nr->root = sh.var_base; nv_putval(SH_NAMENOD, cp, NV_NOFREE); @@ -1121,7 +1123,7 @@ int sh_exec(register const Shnode_t *t, int flags) if(nq) { shp->last_table = last_table; - mode = set_instance(nq,&node,&nr); + mode = set_instance(shp,nq,&node,&nr); } if(io) { @@ -1172,6 +1174,7 @@ int sh_exec(register const Shnode_t *t, int flags) } no_fork = !ntflag && !(type&(FAMP|FPOU)) && !shp->st.trapcom[0] && !shp->st.trap[SH_ERRTRAP] && + ((struct checkpt*)shp->jmplist)->mode!=SH_JMPEVAL && (execflg2 || (execflg && !shp->subshell && shp->fn_depth==0 && !(pipejob && sh_isoption(SH_PIPEFAIL)) @@ -1333,8 +1336,10 @@ int sh_exec(register const Shnode_t *t, int flags) sh_redirect(shp,t->tre.treio,1); if(shp->topfd > topfd) { + job_lock(); while((parent = vfork()) < 0) _sh_fork(parent, 0, (int*)0); + job_fork(parent); if(parent) { job_clear(); @@ -2668,6 +2673,8 @@ int sh_funscope(int argn, char *argv[],int(*fun)(void*),void *arg,int execflg) stakset(savstak,0); shp->options = options; shp->last_root = last_root; + if(jmpval == SH_JMPSUB) + siglongjmp(*shp->jmplist,jmpval); if(trap) { sh_trap(trap,0); @@ -2766,7 +2773,7 @@ int sh_fun(Namval_t *np, Namval_t *nq, char *argv[]) while(argv[n]) n++; if(nq) - mode = set_instance(nq,&node, &nr); + mode = set_instance(shp,nq,&node, &nr); if(is_abuiltin(np)) { int jmpval; diff --git a/usr/src/lib/libshell/common/tests/alias.sh b/usr/src/lib/libshell/common/tests/alias.sh index f527faf23e..d4bcb73f67 100644 --- a/usr/src/lib/libshell/common/tests/alias.sh +++ b/usr/src/lib/libshell/common/tests/alias.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/append.sh b/usr/src/lib/libshell/common/tests/append.sh index d3e10c9100..947d6d7e29 100644 --- a/usr/src/lib/libshell/common/tests/append.sh +++ b/usr/src/lib/libshell/common/tests/append.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/arith.sh b/usr/src/lib/libshell/common/tests/arith.sh index 47c9619c75..457826fcfb 100644 --- a/usr/src/lib/libshell/common/tests/arith.sh +++ b/usr/src/lib/libshell/common/tests/arith.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -529,4 +529,34 @@ i=0 j=1 [[ $(printf "%d" N[j]-N[i]) == 6 ]] || err_exit 'printf %d N[i]-N[j] failed' [[ $((N[j]-N[i])) == 6 ]] || err_exit '$((N[j]-N[i])) incorrect' +unset a x +x=0 +((a[++x]++)) +(( x==1)) || err_exit '((a[++x]++)) should only increment x once' +(( a[1]==1)) || err_exit 'a[1] not incremented' +unset a +x=0 +((a[x++]++)) +(( x==1)) || err_exit '((a[x++]++)) should only increment x once' +(( a[0]==1)) || err_exit 'a[0] not incremented' +unset a +x=0 +((a[x+=2]+=1)) +(( x==2)) || err_exit '((a[x+=2]++)) should result in x==2' +(( a[2]==1)) || err_exit 'a[0] not 1' + +unset a i +typeset -a a +i=1 +(( a[i]=1 )) +(( a[0] == 0 )) || err_exit 'a[0] not 0' +(( a[1] == 1 )) || err_exit 'a[1] not 1' + +unset a +typeset -i a +for ((i=0;i<1000;i++)) +do ((a[RANDOM%2]++)) +done +(( (a[0]+a[1])==1000)) || err_exit '(a[0]+a[1])!=1000' + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/arrays.sh b/usr/src/lib/libshell/common/tests/arrays.sh index 996101409f..a483b50072 100644 --- a/usr/src/lib/libshell/common/tests/arrays.sh +++ b/usr/src/lib/libshell/common/tests/arrays.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -336,18 +336,20 @@ unset bam print 'print ${var[0]} ${var[1]}' > $tmp/script chmod +x $tmp/script [[ $($SHELL -c "var=(foo bar);export var;$tmp/script") == foo ]] || err_exit 'export array not exporting just first element' + unset foo -set -o allexport +set --allexport foo=one foo[1]=two foo[0]=three -[[ $foo == three ]] || err_exit 'export all not working with arrays' +[[ $foo == three ]] || err_exit '--allexport not working with arrays' +set --noallexport +unset foo + cat > $tmp/script <<- \! typeset -A foo print foo${foo[abc]} ! -# 04-05-24 bug fix -unset foo [[ $($SHELL -c "typeset -A foo;$tmp/script") == foo ]] 2> /dev/null || err_exit 'empty associative arrays not being cleared correctly before scripts' [[ $($SHELL -c "typeset -A foo;foo[abc]=abc;$tmp/script") == foo ]] 2> /dev/null || err_exit 'associative arrays not being cleared correctly before scripts' unset foo @@ -378,8 +380,12 @@ foo=bar set -- "${foo[@]:1}" (( $# == 0 )) || err_exit '${foo[@]:1} should not have any values' unset bar +exp=4 : ${_foo[bar=4]} -(( bar == 4 )) || err_exit 'subscript of unset variable not evaluated' +(( bar == 4 )) || err_exit "subscript of unset variable not evaluated -- expected '4', got '$got'" +unset bar +: ${_foo[bar=$exp]} +(( bar == $exp )) || err_exit "subscript of unset variable not evaluated -- expected '$exp', got '$got'" unset foo bar foo[5]=4 bar[4]=3 @@ -473,4 +479,23 @@ FILTER[0].scope=include FILTER[1].scope=exclude [[ ${#FILTER[@]} == 2 ]] || err_exit "FILTER array should have two elements not ${#FILTER[@]}" +unset x +function x.get +{ + print sub=${.sh.subscript} +} +x[2]= +z=$(: ${x[1]} ) +[[ $z == sub=1 ]] || err_exit 'get function not invoked for index array' + +unset x +typeset -A x +function x.get +{ + print sub=${.sh.subscript} +} +x[2]= +z=$(: ${x[1]} ) +[[ $z == sub=1 ]] || err_exit 'get function not invoked for associative array' + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/arrays2.sh b/usr/src/lib/libshell/common/tests/arrays2.sh index ee8f0ae315..21037f1075 100644 --- a/usr/src/lib/libshell/common/tests/arrays2.sh +++ b/usr/src/lib/libshell/common/tests/arrays2.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/attributes.sh b/usr/src/lib/libshell/common/tests/attributes.sh index 474972c03b..da6c2292d0 100644 --- a/usr/src/lib/libshell/common/tests/attributes.sh +++ b/usr/src/lib/libshell/common/tests/attributes.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -324,4 +324,40 @@ unset foo $SHELL 2> /dev/null -c 'export foo=(bar=3)' && err_exit 'compound variables cannot be exported' +$SHELL -c 'builtin date' >/dev/null 2>&1 && +{ + +# check env var changes against a builtin that uses the env var + +SEC=1234252800 +ETZ=EST5EDT +EDT=03 +PTZ=PST8PDT +PDT=00 + +CMD="date -f%H \\#$SEC" + +export TZ=$ETZ + +set -- \ + "$EDT $PDT $EDT" "" "TZ=$PTZ" "" \ + "$EDT $PDT $EDT" "" "TZ=$PTZ" "TZ=$ETZ" \ + "$EDT $PDT $EDT" "TZ=$ETZ" "TZ=$PTZ" "TZ=$ETZ" \ + "$PDT $EDT $PDT" "TZ=$PTZ" "" "TZ=$PTZ" \ + "$PDT $EDT $PDT" "TZ=$PTZ" "TZ=$ETZ" "TZ=$PTZ" \ + "$EDT $PDT $EDT" "foo=bar" "TZ=$PTZ" "TZ=$ETZ" \ + +while (( $# >= 4 )) +do exp=$1 + got=$(print $($SHELL -c "builtin date; $2 $CMD; $3 $CMD; $4 $CMD")) + [[ $got == $exp ]] || err_exit "[ '$2' '$3' '$4' ] env sequence failed -- expected '$exp', got '$got'" + shift 4 +done + +} + +unset v +typeset -H v=/dev/null +[[ $v == *nul* ]] || err_exit 'typeset -H for /dev/null not working' + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/basic.sh b/usr/src/lib/libshell/common/tests/basic.sh index 597833e74f..04d2532b68 100644 --- a/usr/src/lib/libshell/common/tests/basic.sh +++ b/usr/src/lib/libshell/common/tests/basic.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -465,4 +465,18 @@ got=$( ( $SHELL -c 'trap : DEBUG; x=( $foo); exit 0') 2> /dev/null || err_exit 'trap DEBUG fails' +true=$(whence -p true) +set -o pipefail +float start=$SECONDS end +for ((i=0; i < 2; i++)) +do print foo + sleep 1.5 +done | { read; $true; end=$SECONDS ;} +(( (SECONDS-start) < 1 )) && err_exit "pipefail not waiting for pipe to finish" +set +o pipefail +(( (SECONDS-start) > 2 )) && err_exit "pipefail causing /bin/true to wait for other end of pipe" + + +{ env A__z=C+SHLVL $SHELL -c : ;} 2> /dev/null || err_exit "SHLVL with wrong attribute fails" + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/bracket.sh b/usr/src/lib/libshell/common/tests/bracket.sh index 496fdae5a4..f43e10ed03 100644 --- a/usr/src/lib/libshell/common/tests/bracket.sh +++ b/usr/src/lib/libshell/common/tests/bracket.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/builtins.sh b/usr/src/lib/libshell/common/tests/builtins.sh index cbd78fa98b..810551a806 100644 --- a/usr/src/lib/libshell/common/tests/builtins.sh +++ b/usr/src/lib/libshell/common/tests/builtins.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/case.sh b/usr/src/lib/libshell/common/tests/case.sh index 1f04cfd30d..40a2a32941 100644 --- a/usr/src/lib/libshell/common/tests/case.sh +++ b/usr/src/lib/libshell/common/tests/case.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/comvar.sh b/usr/src/lib/libshell/common/tests/comvar.sh index 00eac1d188..810ceb14c8 100644 --- a/usr/src/lib/libshell/common/tests/comvar.sh +++ b/usr/src/lib/libshell/common/tests/comvar.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/coprocess.sh b/usr/src/lib/libshell/common/tests/coprocess.sh index dde9a49805..f24697e55f 100644 --- a/usr/src/lib/libshell/common/tests/coprocess.sh +++ b/usr/src/lib/libshell/common/tests/coprocess.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/cubetype.sh b/usr/src/lib/libshell/common/tests/cubetype.sh index 4a718d4a38..2be2dc605d 100644 --- a/usr/src/lib/libshell/common/tests/cubetype.sh +++ b/usr/src/lib/libshell/common/tests/cubetype.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/enum.sh b/usr/src/lib/libshell/common/tests/enum.sh index 1929472bb5..b5e2aefa1a 100644 --- a/usr/src/lib/libshell/common/tests/enum.sh +++ b/usr/src/lib/libshell/common/tests/enum.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/exit.sh b/usr/src/lib/libshell/common/tests/exit.sh index a14b0dcbec..47e05aa6eb 100644 --- a/usr/src/lib/libshell/common/tests/exit.sh +++ b/usr/src/lib/libshell/common/tests/exit.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/expand.sh b/usr/src/lib/libshell/common/tests/expand.sh index c63e7eb3e2..69637f7617 100644 --- a/usr/src/lib/libshell/common/tests/expand.sh +++ b/usr/src/lib/libshell/common/tests/expand.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/functions.sh b/usr/src/lib/libshell/common/tests/functions.sh index 146b537743..5ee9d69015 100644 --- a/usr/src/lib/libshell/common/tests/functions.sh +++ b/usr/src/lib/libshell/common/tests/functions.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -1068,4 +1068,29 @@ unset -f foo bar [[ $(typeset +f) == *foo* ]] && err_exit 'function in subshell leaving side effects of function foo after reload' [[ $(typeset +f) == *bar* ]] && err_exit 'function in subshell leaving side effects of function bar after reload' +unset -f foo +typeset -A bar +function foo +{ + typeset -i bar[$1].x + bar[$1].x=5 +} +foo sub +[[ ${!bar[@]} == sub ]] || err_exit 'scoping problem with compound array variables' + +function A +{ + trap "> /dev/null;print TRAP A" EXIT + # (( stderr )) && print >&2 +} + +function B +{ + trap "> /dev/null;print TRAP B" EXIT + A +} + +x=$(B) +[[ $x == $'TRAP A\nTRAP B' ]] || err_exit "trap from funtions in subshells fails got" $x + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/glob.sh b/usr/src/lib/libshell/common/tests/glob.sh index fa22291c96..e63efda318 100644 --- a/usr/src/lib/libshell/common/tests/glob.sh +++ b/usr/src/lib/libshell/common/tests/glob.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/grep.sh b/usr/src/lib/libshell/common/tests/grep.sh index 40a80a07a7..632c9eceea 100644 --- a/usr/src/lib/libshell/common/tests/grep.sh +++ b/usr/src/lib/libshell/common/tests/grep.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/heredoc.sh b/usr/src/lib/libshell/common/tests/heredoc.sh index 7b3c923bf0..cd68e697c7 100644 --- a/usr/src/lib/libshell/common/tests/heredoc.sh +++ b/usr/src/lib/libshell/common/tests/heredoc.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/io.sh b/usr/src/lib/libshell/common/tests/io.sh index 3468fe9429..3d8b8cbd34 100644 --- a/usr/src/lib/libshell/common/tests/io.sh +++ b/usr/src/lib/libshell/common/tests/io.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -367,7 +367,7 @@ fi read -t2 -n 1000 line3 read -t2 -n 1000 line4 } -[[ $? == 0 ]] && err_exit 'should have time out' +[[ $? == 0 ]] && err_exit 'should have timed out' [[ $line1 == 'prompt1: ' ]] || err_exit "line1 should be 'prompt1: '" [[ $line2 == line2 ]] || err_exit "line2 should be line2" [[ $line3 == 'prompt2: ' ]] || err_exit "line3 should be 'prompt2: '" diff --git a/usr/src/lib/libshell/common/tests/nameref.sh b/usr/src/lib/libshell/common/tests/nameref.sh index 7bb9ec2c91..fe4bc2998b 100644 --- a/usr/src/lib/libshell/common/tests/nameref.sh +++ b/usr/src/lib/libshell/common/tests/nameref.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/options.sh b/usr/src/lib/libshell/common/tests/options.sh index cebb405a27..8584e726f0 100644 --- a/usr/src/lib/libshell/common/tests/options.sh +++ b/usr/src/lib/libshell/common/tests/options.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/path.sh b/usr/src/lib/libshell/common/tests/path.sh index edf7621663..e7d9d4f906 100644 --- a/usr/src/lib/libshell/common/tests/path.sh +++ b/usr/src/lib/libshell/common/tests/path.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/pointtype.sh b/usr/src/lib/libshell/common/tests/pointtype.sh index 28b60c499c..1f845f969e 100644 --- a/usr/src/lib/libshell/common/tests/pointtype.sh +++ b/usr/src/lib/libshell/common/tests/pointtype.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/quoting.sh b/usr/src/lib/libshell/common/tests/quoting.sh index a1df26a230..6f6b231630 100644 --- a/usr/src/lib/libshell/common/tests/quoting.sh +++ b/usr/src/lib/libshell/common/tests/quoting.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/quoting2.sh b/usr/src/lib/libshell/common/tests/quoting2.sh index dab0992f6b..5f40be2256 100644 --- a/usr/src/lib/libshell/common/tests/quoting2.sh +++ b/usr/src/lib/libshell/common/tests/quoting2.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/recttype.sh b/usr/src/lib/libshell/common/tests/recttype.sh index b2bca80f50..a1185c0831 100644 --- a/usr/src/lib/libshell/common/tests/recttype.sh +++ b/usr/src/lib/libshell/common/tests/recttype.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/restricted.sh b/usr/src/lib/libshell/common/tests/restricted.sh index eca93ce6f2..0306c443a6 100644 --- a/usr/src/lib/libshell/common/tests/restricted.sh +++ b/usr/src/lib/libshell/common/tests/restricted.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/return.sh b/usr/src/lib/libshell/common/tests/return.sh index c9bbf0f33c..90a9e8e832 100644 --- a/usr/src/lib/libshell/common/tests/return.sh +++ b/usr/src/lib/libshell/common/tests/return.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/select.sh b/usr/src/lib/libshell/common/tests/select.sh index 2728f85a40..136d87400b 100644 --- a/usr/src/lib/libshell/common/tests/select.sh +++ b/usr/src/lib/libshell/common/tests/select.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/shtests b/usr/src/lib/libshell/common/tests/shtests index 37a36c29ef..645d290574 100644 --- a/usr/src/lib/libshell/common/tests/shtests +++ b/usr/src/lib/libshell/common/tests/shtests @@ -9,7 +9,7 @@ LC_ALL=C compile=1 script=1 time=1 -vmdebug=a +vmalloc_options=abort while : do case $1 in -a|--a*)compile=2 @@ -23,7 +23,7 @@ do case $1 in ;; -t|--not*)time= ;; - -v|--nov*)vmdebug= + -v|--nov*)vmalloc_options= ;; -*) echo $0: $1: invalid option >&2 exit 2 @@ -38,14 +38,12 @@ do case $1 in esac shift done -if [[ ! $vmdebug ]] -then unset VMDEBUG -elif [[ $VMDEBUG ]] -then vmdebug=$VMDEBUG -else export VMDEBUG=$vmdebug +if [[ $VMALLOC_OPTIONS ]] +then vmalloc_options=$VMALLOC_OPTIONS +else VMALLOC_OPTIONS=$vmalloc_options fi -[[ $VMDEBUG ]] || timesensitive=. -export LANG LC_ALL PATH PWD SHELL +[[ $VMALLOC_OPTIONS ]] || timesensitive=. +export LANG LC_ALL PATH PWD SHELL VMALLOC_OPTIONS PWD=`pwd` SHELL=${SHELL-ksh} case $0 in @@ -79,7 +77,11 @@ then SHCOMP=${SHCOMP:-shcomp} fi typeset -A tests for i in ${*-*.sh} -do t=$(grep -c err_exit $i) +do if [[ ! -r $i ]] + then echo $0: $i: not found >&2 + continue + fi + t=$(grep -c err_exit $i) if (( $t > 2 )) then (( t = $t - 2 )) fi @@ -92,7 +94,7 @@ do t=$(grep -c err_exit $i) if [[ $script ]] then echo test $i begins ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} if [[ $i == $timesensitive ]] - then unset VMDEBUG + then VMALLOC_OPTIONS= fi if $SHELL $i then echo test $i passed ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} "[ $t $T 0 ${E}s ]" @@ -107,13 +109,16 @@ do t=$(grep -c err_exit $i) echo test $i failed ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} with exit code $e "[ $t $T $e $E ]" fi if [[ $i == $timesensitive ]] - then export VMDEBUG=$vmdebug + then VMALLOC_OPTIONS=$vmalloc_options fi fi done if [[ $compile ]] then for i in ${*-*.sh} - do t=${tests[$i]} + do if [[ ! -r $i ]] + then continue + fi + t=${tests[$i]} T=test if (( $t != 1 )) then T=${T}s @@ -124,7 +129,7 @@ then for i in ${*-*.sh} E=error if $SHCOMP $i > $tmp/$o then if [[ $i == $timesensitive ]] - then unset VMDEBUG + then VMALLOC_OPTIONS= fi if $SHELL $tmp/$o then echo test $o passed ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} "[ $t $T 0 ${E}s ]" @@ -139,7 +144,7 @@ then for i in ${*-*.sh} echo test $o failed ${time:+"at $(date +%Y-%m-%d+%H:%M:%S)"} with exit code $e "[ $t $T $e $E ]" fi if [[ $i == $timesensitive ]] - then export VMDEBUG=$vmdebug + then VMALLOC_OPTIONS=$vmalloc_options fi else e=$? t=1 diff --git a/usr/src/lib/libshell/common/tests/sigchld.sh b/usr/src/lib/libshell/common/tests/sigchld.sh index 0b2bf8e03f..f57ed6f5a7 100644 --- a/usr/src/lib/libshell/common/tests/sigchld.sh +++ b/usr/src/lib/libshell/common/tests/sigchld.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -26,7 +26,7 @@ function err_exit alias err_exit='err_exit $LINENO' -float DELAY=${1:-0.5} +float DELAY=${1:-0.2} integer FOREGROUND=10 BACKGROUND=2 Errors=0 s=$($SHELL -c ' @@ -110,4 +110,30 @@ then fi +{ +got=$( ( sleep 1;print $'\n') | $SHELL -c 'function handler { : ;} + trap handler CHLD; sleep .3 & IFS= read; print good') +} 2> /dev/null +[[ $got == good ]] || err_exit 'SIGCLD handler effects read behavior' + +set -- $( + ( + $SHELL -xc $' + trap \'wait $!; print $! $?\' CHLD + { sleep 0.1; exit 9; } & + print $! + sleep 0.5 + ' + ) 2>/dev/null; print $? +) +if (( $# != 4 )) +then err_exit "CHLD trap failed -- expected 4 args, got $#" +elif (( $4 != 0 )) +then err_exit "CHLD trap failed -- exit code $4" +elif (( $1 != $2 )) +then err_exit "child pid mismatch -- got '$1' != '$2'" +elif (( $3 != 9 )) +then err_exit "child status mismatch -- expected '9', got '$3'" +fi + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/signal.sh b/usr/src/lib/libshell/common/tests/signal.sh index bab844fc4d..1538488c84 100644 --- a/usr/src/lib/libshell/common/tests/signal.sh +++ b/usr/src/lib/libshell/common/tests/signal.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/statics.sh b/usr/src/lib/libshell/common/tests/statics.sh index 21175c08db..ee13cbebba 100644 --- a/usr/src/lib/libshell/common/tests/statics.sh +++ b/usr/src/lib/libshell/common/tests/statics.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/subshell.sh b/usr/src/lib/libshell/common/tests/subshell.sh index bc63bde995..1a7794d7d3 100644 --- a/usr/src/lib/libshell/common/tests/subshell.sh +++ b/usr/src/lib/libshell/common/tests/subshell.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -450,4 +450,23 @@ fi $SHELL -c '( sleep 5 </dev/null >/dev/null 2>&1 & );exit 0' | cat (( (SECONDS-t1) > 4 )) && err_exit 'sleep& in subshell hanging' +exp=HOME=$HOME +( HOME=/bin/sh ) +got=$(env | grep ^HOME=) +[[ $got == "$exp" ]] || err_exit "( HOME=/bin/sh ) cleanup failed -- expected '$exp', got '$got'" + +cmd='echo $((case x in x)echo ok;esac);:)' +exp=ok +got=$($SHELL -c "$cmd" 2>&1) +[[ $got == "$exp" ]] || err_exit "'$cmd' failed -- expected '$exp', got '$got'" + +cmd='eval "for i in 1 2; do eval /bin/echo x; done"' +exp=$'x\nx' +got=$($SHELL -c "$cmd") +if [[ $got != "$exp" ]] +then EXP=$(printf %q "$exp") + GOT=$(printf %q "$got") + err_exit "'$cmd' failed -- expected $EXP, got $GOT" +fi + exit $Errors diff --git a/usr/src/lib/libshell/common/tests/substring.sh b/usr/src/lib/libshell/common/tests/substring.sh index 0d7fc384a7..d1dda6521f 100644 --- a/usr/src/lib/libshell/common/tests/substring.sh +++ b/usr/src/lib/libshell/common/tests/substring.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_array_default_datatype.sh b/usr/src/lib/libshell/common/tests/sun_solaris_array_default_datatype.sh index 45b3851f19..b2efb2c2a4 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_array_default_datatype.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_array_default_datatype.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -36,7 +35,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_builtin_sum.sh b/usr/src/lib/libshell/common/tests/sun_solaris_builtin_sum.sh index e80111a538..9dd209cc74 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_builtin_sum.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_builtin_sum.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -34,7 +33,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_builtin_tail.sh b/usr/src/lib/libshell/common/tests/sun_solaris_builtin_tail.sh index 69a7f1a6b9..4506698058 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_builtin_tail.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_builtin_tail.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -35,7 +34,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' @@ -99,6 +98,16 @@ function myintseq return 0 } +# quote input string but use single-backslash that "err_exit" prints +# the strings correctly +function singlebackslashquote +{ + typeset s + s="$(printf "%q\n" "$1")" + print -r "$s" + return 0 +} + # quote input string but use double-backslash that "err_exit" prints # the strings correctly function doublebackslashquote @@ -121,9 +130,9 @@ typeset tmpdir # create temporary test directory ocwd="$PWD" -tmpdir="$(mktemp -d "test_sun_solaris_builtin_tail.XXXXXXXX")" || err_exit "Cannot create temporary directory" +tmpdir="$(mktemp -t -d "test_sun_solaris_builtin_tail.XXXXXXXX")" || err_exit "Cannot create temporary directory" -cd "${tmpdir}" || err_exit "cd ${tmpdir} failed." +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } # run tests: @@ -282,8 +291,8 @@ for testid in "${!testcases[@]}" ; do for argv_variants in "${!tc.tail_args[@]}" ; do nameref argv=tc.tail_args[${argv_variants}].argv output=$( - #set -o pipefail - print -r -- "${tc.input}" | tail "${argv[@]}" + set -o pipefail + (trap "" PIPE ; print -r -- "${tc.input}") | tail "${argv[@]}" ) || err_exit "test ${tc.name}/${argv_variants}: command failed with exit code $?" [[ "${output}" == "${tc.expected_output}" ]] || err_exit "test ${tc.name}/${argv_variants}: Expected $(doublebackslashquote "${tc.expected_output}"), got $(doublebackslashquote "${output}")" @@ -412,8 +421,8 @@ function followtest1 [[ "$( < "${OUTFILE}")" == "${followstr}" ]] || err_exit "${title}: Expected $(doublebackslashquote "${followstr}"), got "$(doublebackslashquote "$( < "${OUTFILE}")")"" done - #kill -TERM ${tailchild} 2>/dev/null kill -KILL ${tailchild} 2>/dev/null + #kill -TERM ${tailchild} 2>/dev/null waitpidtimeout ${tailchild} 5 if isvalidpid ${tailchild} ; then @@ -437,6 +446,51 @@ followtest1 "test5a" "tail" true #followtest1 "test5f" "/usr/bin/tail" false +# test 6: "tail -f" tests +function followtest2 +{ + typeset -r FOLLOWFILE="followfile.txt" + typeset -r OUTFILE="outfile.txt" + + typeset title="$1" + typeset testcmd="$2" + integer tailchild=-1 + + rm -f "${FOLLOWFILE}" "${OUTFILE}" + + myintseq 50000 >"${FOLLOWFILE}" + + ${testcmd} -n 60000 -f "${FOLLOWFILE}" >"${OUTFILE}" & + (( tailchild=$! )) + + sleep 10 + + kill -KILL ${tailchild} 2>/dev/null + #kill -TERM ${tailchild} 2>/dev/null + waitpidtimeout ${tailchild} 5 + + if isvalidpid ${tailchild} ; then + err_exit "${title}: tail pid=${tailchild} hung." + kill -KILL ${tailchild} 2>/dev/null + fi + + wait ${tailchild} 2>/dev/null + + # this tail should be an external process + outstr=$(/usr/bin/tail "${OUTFILE}") || err_exit "tail returned non-zero exit code $?" + [[ "${outstr}" == 49991*50000 ]] || err_exit "${title}: Expected match for 49991*50000, got "$(singlebackslashquote "${outstr}")"" + + rm -f "${FOLLOWFILE}" "${OUTFILE}" + + return 0 +} + +followtest2 "test6a" "tail" +followtest2 "test6b" "/usr/xpg4/bin/tail" +# fixme: later we should test this, too: +#followtest2 "test6c" "/usr/bin/tail" + + # cleanup cd "${ocwd}" rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_command_substitution.sh b/usr/src/lib/libshell/common/tests/sun_solaris_command_substitution.sh index 77ab14714e..468b533900 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_command_substitution.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_command_substitution.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -33,7 +32,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' @@ -58,7 +57,7 @@ integer testid # (Please keep this test syncted with sun_solaris_cr_6800929_large_command_substitution_hang.sh) # test 1: run loop and check various temp filesizes -tmpfile="$(mktemp "/tmp/ksh93_tests_command_substitution.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." +tmpfile="$(mktemp -t "ksh93_tests_command_substitution.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." compound test1=( compound -a testcases=( diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_compound_misc.sh b/usr/src/lib/libshell/common/tests/sun_solaris_compound_misc.sh new file mode 100644 index 0000000000..96009acafc --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_compound_misc.sh @@ -0,0 +1,163 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test module contains misc compound tests which do not have +# their own module yet. +# +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +# global utility functions +compound bracketstat=( + integer bopen=0 + integer bclose=0 +) + +function count_brackets +{ + typeset x="$1" + typeset c + + integer i + (( bracketstat.bopen=0 , bracketstat.bclose=0 )) + + for (( i=0 ; i < ${#x} ; i++ )) ; do + c="${x:i:1}" + [[ "$c" == "(" ]] && (( bracketstat.bopen++ )) + [[ "$c" == ")" ]] && (( bracketstat.bclose++ )) + done + + (( bracketstat.bopen != bracketstat.bclose )) && return 1 + + return 0 +} + + +typeset ocwd +typeset tmpdir + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_compound_misc.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + +# ksh93 <= ast-ksh.2010-03-09 prints garbage for compound x=( compound -a nodes=( [4]=( ) ) );typeset -p x +function test_compound_indexed_array_init_1 +{ + compound vx=( compound -a nodes=( [4]=( ) ) ) + compound vy + compound -a vy.nodes=( [4]=( ) ) + compound vz + compound -a vz.nodes + vz.nodes[4]=( ) + + cx="$(typeset -p vx)" ; cx="${cx//vx/tt}" + cy="$(typeset -p vy)" ; cy="${cy//vy/tt}" + cz="$(typeset -p vz)" ; cz="${cz//vz/tt}" + [[ "$cx" == "$cy" ]] || err_exit "'$cx' != '$cy'" + [[ "$cx" == "$cz" ]] || err_exit "'$cx' != '$cz'" + [[ "$cy" == "$cz" ]] || err_exit "'$cy' != '$cz'" + + count_brackets "$cx" || err_exit "Brackets not balanced for '$cx'" + count_brackets "$cy" || err_exit "Brackets not balanced for '$cy'" + count_brackets "$cz" || err_exit "Brackets not balanced for '$cz'" + count_brackets "$(print -v vx)" || err_exit "Brackets not balanced for '$(print -v vx)'" + count_brackets "$(print -v vy)" || err_exit "Brackets not balanced for '$(print -v vy)'" + count_brackets "$(print -v vz)" || err_exit "Brackets not balanced for '$(print -v vz)'" + count_brackets "$(print -C vx)" || err_exit "Brackets not balanced for '$(print -C vx)'" + count_brackets "$(print -C vy)" || err_exit "Brackets not balanced for '$(print -C vy)'" + count_brackets "$(print -C vz)" || err_exit "Brackets not balanced for '$(print -C vz)'" + + cx="$(typeset +p vx.nodes)" ; [[ "$cx" == *-C* && "$cx" == *-a* ]] || err_exit "'$cx' lacks -C/-a attribute" + cy="$(typeset +p vy.nodes)" ; [[ "$cy" == *-C* && "$cy" == *-a* ]] || err_exit "'$cy' lacks -C/-a attribute" + cz="$(typeset +p vz.nodes)" ; [[ "$cz" == *-C* && "$cz" == *-a* ]] || err_exit "'$cz' lacks -C/-a attribute" + cx="$(typeset +p vx.nodes[4])" ; [[ "$cx" == *-C* ]] || err_exit "'$cx' lacks -C attribute" + cy="$(typeset +p vy.nodes[4])" ; [[ "$cy" == *-C* ]] || err_exit "'$cy' lacks -C attribute" + cz="$(typeset +p vz.nodes[4])" ; [[ "$cz" == *-C* ]] || err_exit "'$cz' lacks -C attribute" + + return 0 +} + +# ksh93 <= ast-ksh.2010-03-09 prints garbage for compound x=( compound -a nodes=( [4]=( ) ) );typeset -p x +# this test is the same as test_compound_indexed_array_init_1 but "-a" was replaced with "-A" +function test_compound_associative_array_init_1 +{ + compound vx=( compound -A nodes=( [4]=( ) ) ) + compound vy + compound -A vy.nodes=( [4]=( ) ) + compound vz + compound -A vz.nodes + vz.nodes[4]=( ) + + cx="$(typeset -p vx)" ; cx="${cx//vx/tt}" + cy="$(typeset -p vy)" ; cy="${cy//vy/tt}" + cz="$(typeset -p vz)" ; cz="${cz//vz/tt}" + [[ "$cx" == "$cy" ]] || err_exit "'$cx' != '$cy'" + [[ "$cx" == "$cz" ]] || err_exit "'$cx' != '$cz'" + [[ "$cy" == "$cz" ]] || err_exit "'$cy' != '$cz'" + + count_brackets "$cx" || err_exit "Brackets not balanced for '$cx'" + count_brackets "$cy" || err_exit "Brackets not balanced for '$cy'" + count_brackets "$cz" || err_exit "Brackets not balanced for '$cz'" + count_brackets "$(print -v vx)" || err_exit "Brackets not balanced for '$(print -v vx)'" + count_brackets "$(print -v vy)" || err_exit "Brackets not balanced for '$(print -v vy)'" + count_brackets "$(print -v vz)" || err_exit "Brackets not balanced for '$(print -v vz)'" + count_brackets "$(print -C vx)" || err_exit "Brackets not balanced for '$(print -C vx)'" + count_brackets "$(print -C vy)" || err_exit "Brackets not balanced for '$(print -C vy)'" + count_brackets "$(print -C vz)" || err_exit "Brackets not balanced for '$(print -C vz)'" + + cx="$(typeset +p vx.nodes)" ; [[ "$cx" == *-C* && "$cx" == *-A* ]] || err_exit "'$cx' lacks -C/-A attribute" + cy="$(typeset +p vy.nodes)" ; [[ "$cy" == *-C* && "$cy" == *-A* ]] || err_exit "'$cy' lacks -C/-A attribute" + cz="$(typeset +p vz.nodes)" ; [[ "$cz" == *-C* && "$cz" == *-A* ]] || err_exit "'$cz' lacks -C/-A attribute" + cx="$(typeset +p vx.nodes[4])" ; [[ "$cx" == *-C* ]] || err_exit "'$cx' lacks -C attribute" + cy="$(typeset +p vy.nodes[4])" ; [[ "$cy" == *-C* ]] || err_exit "'$cy' lacks -C attribute" + cz="$(typeset +p vz.nodes[4])" ; [[ "$cz" == *-C* ]] || err_exit "'$cz' lacks -C attribute" + + return 0 +} + +# run tests +test_compound_indexed_array_init_1 +test_compound_associative_array_init_1 + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_compound_nameref.sh b/usr/src/lib/libshell/common/tests/sun_solaris_compound_nameref.sh index 3714227449..59ad028af8 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_compound_nameref.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_compound_nameref.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # @@ -31,7 +30,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_compoundvario.sh b/usr/src/lib/libshell/common/tests/sun_solaris_compoundvario.sh index 52bc5dca82..b36d07e7ee 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_compoundvario.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_compoundvario.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # test setup @@ -29,7 +28,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh index 27cac4aa88..a5d14f9fce 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -51,7 +50,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh index 28a84caff1..08568ae179 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6713682_compound_var_bleeds_through_subshell.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -56,7 +55,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh index 793d53d20d..6da73f9d7e 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6722134_background_CHLD_trap.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -45,7 +44,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh index fa016f4c67..d6407c9ae0 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6753538_subshell_leaks_umask.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -45,7 +44,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh index 6b0092d5ba..d6da9e99a4 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6754020_weird_square_bracket_expansion.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -50,7 +49,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh index bc3426f063..cd9342ddd9 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6763594_command_failure_execs_twice.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -68,7 +67,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh index 7463baea5a..606a8b6585 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6766246_pattern_matching_bug.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -75,7 +74,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh index 7f76862bdd..fbe90c29cf 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6769332_substitutions_terminate_shell_after_257_iterations.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -81,7 +80,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh index 2dd0fc997f..d18a8c1513 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6777491_lacks_arithmetric_function_iszero.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -62,7 +61,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6778077_sigthaw_trap.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6778077_sigthaw_trap.sh index 24f99cb581..d8e4107835 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6778077_sigthaw_trap.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6778077_sigthaw_trap.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -50,7 +49,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh index 69159a9f76..17bede815e 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6789247_printf_hexfloat_rounding.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -89,7 +88,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh index de745b8a3a..b808ef17b3 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6800929_large_command_substitution_hang.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -83,7 +82,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' @@ -103,7 +102,7 @@ integer testid # test 1: run loop and check various temp filesizes -tmpfile="$(mktemp "/tmp/sun_solaris_cr_6800929_large_command_substitution_hang.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." +tmpfile="$(mktemp -t "sun_solaris_cr_6800929_large_command_substitution_hang.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." compound -a testcases=( # test 1a: Run test child for $(...) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805792_varmovetest1.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805792_varmovetest1.sh index 4f774b2f8b..ca8f832d1a 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805792_varmovetest1.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805792_varmovetest1.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -84,7 +83,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh index bbcb9b168d..4176b62015 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805794_character_to_wchar_not_working.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -78,7 +77,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805795_negative_zero.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805795_negative_zero.sh index 1dccc97505..b0390a24ab 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805795_negative_zero.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6805795_negative_zero.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -64,7 +63,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh index 3e65edbfae..79b0c24f85 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -51,7 +50,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' @@ -61,7 +60,7 @@ integer Errors=0 typeset tmpfile -tmpfile="$(mktemp "/tmp/sun_solaris_cr_6807179_shellpattern_uses_getpwnam.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." +tmpfile="$(mktemp -t "sun_solaris_cr_6807179_shellpattern_uses_getpwnam.${PPID}.$$.XXXXXX")" || err_exit "Cannot create temporary file." rm -f "${tmpfile}" diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh index dc91bbeb82..6945b64985 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6835835_builtin_cat_n_broken.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -81,7 +80,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh index 396816960a..13dff15526 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6848486_echo_test_with_test_undefined_executes_test_builtin.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -61,7 +60,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh index 22de05b56c..fa3f32da1b 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6855875_typeset_hexfloat_has_too_few_digits.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -85,7 +84,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh index 568b43f35d..90008a5c44 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -68,7 +67,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' @@ -82,9 +81,9 @@ typeset out # create temporary test directory ocwd="$PWD" -tmpdir="$(mktemp -d "test_sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.XXXXXXXX")" || err_exit "Cannot create temporary directory" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.XXXXXXXX")" || err_exit "Cannot create temporary directory" -cd "${tmpdir}" || err_exit "cd ${tmpdir} failed." +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } # run tests diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh index a5aae41ce5..c4a16ad646 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -58,7 +57,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh new file mode 100644 index 0000000000..f302f6379e --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh @@ -0,0 +1,183 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test checks whether the return code of a child process +# is reported properly. +# +# This was reported as CR #6887363 ("Korn shell 93 sometimes +# mishandles return value of its child process"): +# ------------ snip ------------ +# Following construction sometimes ends with wrong return value. +# +# 56 echo $op | grep rand 2>&1 >/dev/null +# 57 if [ $? = 0 ]; then +# 58 randseq="rand${SEED}" +# 59 else +# 60 randseq="seq" +# 61 fi +# +# Sometimes, the given result is "rand..." even when there is +# no "rand" word in $op. This can be demonstrated with +# TSufs/SnapShots/Func test case which excercises shown code +# quite often. +# +# As it happens only sometimes, I suppose there is an +# race-condition in handling return value from a child process. +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + +# print test case from bug that ksh93 can read this script via stdin +function cat_test +{ +cat <<EOF +#!/bin/sh +# +# Test derived from Sun's SnapShots Functional Suite +# + +export PATH=/usr/xpg6/bin:/usr/xpg4/bin:/bin:/usr/bin + +# WARNING: make sure "expr" and "grep" are _external_ commands in this test + +# start test +_pcnt=0 + +PASS(){ + _pcnt=\`/usr/bin/expr \$_pcnt + 1\` + true +} + +doblockstamper() { + output=\`/usr/bin/sleep .01\` + _status=\$? + + PASS "Here I am" +} + +lotsaFiles() { + OPS="read-seq read-rand syncread-seq syncread-seq" + echo \$OPS + for op in \$OPS; do + echo \$op + echo \$op | /usr/bin/grep rand 2>&1 >/dev/null + status=\$? + if [ \$status = 0 ]; then + randseq="rand" + phrase="read-rand" + else + randseq="seq" + phrase="read-seq" + fi + retcode=\$status + + echo \$op | /usr/bin/grep sync 2>&1 >/dev/null + status=\$? + if [ \$status = 0 ]; then + syncasync="sync" + phrase="sync\$phrase" + else + syncasync="async" + fi + retcode=\${status}-\${retcode} + + if [ "\$op" != "\$phrase" ]; then + echo "Bad mode: \$op != \$phrase (\$retcode)" + exit 2 + fi + + for sz in 1 2 3 4; do + for type in 1 2 3 4; do + PASS "Something" + doblockstamper & + done + wait # Let a few finish + done + done + + wait # Make sure everyone got done + + PASS "lotsafiles \$1 \$fill" +} + +cycle=0 +while [ cycle -lt 24 ]; do + cycle=\`/usr/bin/expr \$cycle + 1\` + + lotsaFiles write + lotsaFiles write + lotsaFiles write + + lotsaFiles read + lotsaFiles read + lotsaFiles read + + PASS "Cycle" +done +exit 0 +EOF +} + +# FIXME: we reset the VMALLOC_OPTIONS (and the depreciated VMDEBUG (for now)) variable for the run to avoid +# that the test may run for hours. This may require re-investigation why this happens. +out="$(unset VMALLOC_OPTIONS VMDEBUG ; cat_test | ${SHELL} 2>&1)" || err_exit "Unexpected exit code $?" +[[ "${out}" != "" ]] || err_exit "No output from test" + +# filter output and check it +out2="$(/usr/xpg4/bin/egrep -v '^((read-seq|read-rand|syncread-seq|syncread-seq)[[:space:][:blank:]]*)*$' <<<"${out}")" +[[ "${out2}" == "" ]] || err_exit "Unexpected output '${out2}'" + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh new file mode 100644 index 0000000000..aa8cd9f862 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh @@ -0,0 +1,174 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test checks whether "wc" builtin counts the number of bytes +# and multibyte characters in different locales correctly. +# +# This was reported as CR #6904557 ("wc no longer counts number of +# bytes correctly"): +# ------------ snip ------------ +# wc no longer count bytes. +# +# $ echo $LANG +# en_US.UTF-8 +# $ ls -l mb.utf8 +# -rw-r--r-- 1 nakanon staff 7 Nov 2 14:06 mb.utf8 +# $ wc mb.utf8 +# 1 1 4 mb.utf8 +# $ +# +# mb.utf8 is attached. +# +# Man page says: +# +# If no option is specified, the default is -lwc (counts +# lines, words, and bytes.) +# +# SUS says: +# http://www.opengroup.org/onlinepubs/000095399/utilities/wc.html +# +# By default, the standard output shall contain an entry for each +# input file of the form: +# +# "%d %d %d %s\n", <newlines>, <words>, <bytes>, <file> +# +# If the -m option is specified, the number of characters shall +# replace the <bytes> field in this format. +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + +function test1 +{ + typeset wc_cmd="$1" + typeset testid + typeset out + typeset testname + compound saved_locale + + # save locale information + [[ -v LC_ALL ]] && saved_locale.LC_ALL="${LC_ALL}" + [[ -v LC_CTYPE ]] && saved_locale.LC_CTYPE="${LC_CTYPE}" + [[ -v LANG ]] && saved_locale.LANG="${LANG}" + + compound -r -a testcases=( + ( + typeset name="unicode_plain" + typeset locale="<unicode>" + typeset input_format='\xc3\xa1\xc3\xa2\xc3\xa3\x0a' + typeset output_pattern='~(Elr)[[:space:][:blank:]]*1[[:space:][:blank:]]*1[[:space:][:blank:]]*7' + typeset -a wc_args=( ) + ) + ( + typeset name="unicode_clw" + typeset locale="<unicode>" + typeset input_format='\xc3\xa1\xc3\xa2\xc3\xa3\x0a' + typeset output_pattern='~(Elr)[[:space:][:blank:]]*1[[:space:][:blank:]]*1[[:space:][:blank:]]*7' + typeset -a wc_args=( "-c" "-l" "-w" ) + ) + ( + typeset name="unicode_widechars_lines_words" + typeset locale="<unicode>" + typeset input_format='\xc3\xa1\xc3\xa2\xc3\xa3\x0a' + typeset output_pattern='~(Elr)[[:space:][:blank:]]*1[[:space:][:blank:]]*1[[:space:][:blank:]]*4' + typeset -a wc_args=( "-C" "-l" "-w" ) + ) + ( + typeset name="ja_JP.eucJP_plain" + typeset locale="ja_JP.eucJP" + typeset input_format='\x74\x32\xa1\xf7\x66\x31\x0a' + typeset output_pattern='~(Elr)[[:space:][:blank:]]*1[[:space:][:blank:]]*1[[:space:][:blank:]]*7' + typeset -a wc_args=( ) + ) + ( + typeset name="ja_JP.eucJP_widechars_lines_words" + typeset locale="ja_JP.eucJP" + typeset input_format='\x74\x32\xa1\xf7\x66\x31\x0a' + typeset output_pattern='~(Elr)[[:space:][:blank:]]*1[[:space:][:blank:]]*1[[:space:][:blank:]]*6' + typeset -a wc_args=( "-C" "-l" "-w" ) + ) + ) + + for testid in "${!testcases[@]}" ; do + nameref tc=testcases[${testid}] + testname="${wc_cmd}/${tc.name}" + + if [[ "${tc.locale}" == "<unicode>" ]] ; then + if [[ "$LC_ALL" != *.UTF-8 ]] ; then + export LC_ALL='en_US.UTF-8' + fi + else + export LC_ALL="${tc.locale}" + fi + + out="$(printf "${tc.input_format}" | ${SHELL} -c "${wc_cmd} \"\$@\"" dummy "${tc.wc_args[@]}" 2>&1)" || err_exit "${testname}: Command returned exit code $?" + [[ "${out}" == ${tc.output_pattern} ]] || err_exit "${testname}: Expected match for $(printf "%q\n" "${tc.output_pattern}"), got $(printf "%q\n" "${out}")" + + # restore locale settings + [[ -v saved_locale.LC_ALL ]] && LC_ALL="${saved_locale.LC_ALL}" || unset LC_ALL + [[ -v saved_locale.LC_CTYPE ]] && LC_CTYPE="${saved_locale.LC_CTYPE}" || unset LC_CTYPE + [[ -v saved_locale.LANG ]] && LANG="${saved_locale.LANG}" || unset LANG + done + + return 0 +} + +#for cmd in "wc" "/usr/bin/wc" ; do +for cmd in "wc" ; do + test1 "${cmd}" +done + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh new file mode 100644 index 0000000000..c657a07899 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh @@ -0,0 +1,193 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test checks whether the AST "cut" utility's "-d" option +# works with multibyte characters +# +# This was reported as CR #6904575 ("cut -d with multibyte character no longer works"): +# ------------ snip ------------ +# cut -d with multibyte char no longer work correctly. +# +# $ echo $LANG +# ja +# $ od -tx1 mb.eucjp +# 0000000 a4 a2 a4 a4 a4 a4 a4 a6 a4 a8 0a +# 0000013 +# $ od -tx1 delim +# 0000000 a4 a4 0a +# 0000003 +# $ wc -m mb.eucjp +# 6 mb.eucjp +# +# It has 5 characters (2byte each). +# +# $ /usr/bin/cut -d `cat delim` -f1 mb.eucjp | od -tx1 +# 0000000 0a +# 0000001 +# +# correct output is +# +# 0000000 a4 a2 0a +# 0000003 +# +# files are attached. +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + + +function test1 +{ + typeset cut_cmd="$1" + typeset testid + typeset out + typeset testname + compound saved_locale + + # save locale information + [[ -v LC_ALL ]] && saved_locale.LC_ALL="${LC_ALL}" + [[ -v LC_CTYPE ]] && saved_locale.LC_CTYPE="${LC_CTYPE}" + [[ -v LANG ]] && saved_locale.LANG="${LANG}" + + compound -r -a testcases=( + ( + typeset name="ascii_plain" + typeset locale="C" + typeset input_format='abcdefg' + typeset -a cut_args_format=( "-f1" "-d" "e" ) + typeset output_format='abcd' + ) + ( + typeset name="unicode_plain" + typeset locale="<unicode>" + typeset input_format='abcd\u[20ac]fg' + typeset -a cut_args_format=( '-f1' '-d' '\u[20ac]' ) + typeset output_format='abcd' + ) + ( + typeset name="unicode_plain2" + typeset locale="<unicode>" + typeset input_format='abcd\u[20ac]fg' + typeset -a cut_args_format=( '-f1' '-d' 'f' ) + typeset output_format='abcd\u[20ac]' + ) + ) + + for testid in "${!testcases[@]}" ; do + nameref tc=testcases[${testid}] + testname="${cut_cmd}/${tc.name}" + + if [[ "${tc.locale}" == "<unicode>" ]] ; then + if [[ "$LC_ALL" != *.UTF-8 ]] ; then + export LC_ALL='en_US.UTF-8' + fi + else + export LC_ALL="${tc.locale}" + fi + + # build "cut_args" array with multibyte characters in the current locale + typeset -a cut_args + integer arg_index + for arg_index in "${!tc.cut_args_format[@]}" ; do + cut_args+=( "$( printf -- "${tc.cut_args_format[arg_index]}" )" ) + done + + typeset output_format="$( printf -- "${tc.output_format}" )" + + #printf "args=|%q|\n" "${cut_args[@]}" + + out="$(printf "${tc.input_format}" | ${SHELL} -c "${cut_cmd} \"\$@\"" dummy "${cut_args[@]}" 2>&1)" || err_exit "${testname}: Command returned exit code $?" + [[ "${out}" == ${output_format} ]] || err_exit "${testname}: Expected match for $(printf "%q\n" "${output_format}"), got $(printf "%q\n" "${out}")" + + # cleanup and restore locale settings + unset cut_args arg_index + [[ -v saved_locale.LC_ALL ]] && LC_ALL="${saved_locale.LC_ALL}" || unset LC_ALL + [[ -v saved_locale.LC_CTYPE ]] && LC_CTYPE="${saved_locale.LC_CTYPE}" || unset LC_CTYPE + [[ -v saved_locale.LANG ]] && LANG="${saved_locale.LANG}" || unset LANG + done + + return 0 +} + + +function test2 +{ + typeset cutcmd=$1 + typeset testname="${cutcmd}" + typeset out + + # create files + printf "\xa4\xa2\xa4\xa4\xa4\xa4\xa4\xa6\xa4\xa8\x0a" >"mb.eucjp" + printf "\xa4\xa4\x0a" >"delim" + + # run test + out=$( LC_ALL=ja_JP.eucJP ${SHELL} -o pipefail -o errexit -c '$1 -d $(cat delim) -f1 "mb.eucjp" | od -tx1' dummy "${cutcmd}" 2>&1 ) || err_exit "${testname}: Test failed with exit code $?" + [[ "${out}" == $'0000000 a4 a2 0a\n0000003' ]] || err_exit "${testname}: Expected \$'0000000 a4 a2 0a\n0000003', got $(printf "%q\n" "${out}")" + + # cleanup + rm "mb.eucjp" "delim" + + return 0 +} + +#for cmd in "/usr/bin/cut" "cut" ; do +for cmd in "cut" ; do + test1 "${cmd}" + test2 "${cmd}" +done + + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh new file mode 100644 index 0000000000..4a7da66794 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh @@ -0,0 +1,190 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test checks whether the AST "join" utility works with +# multibyte characters as seperator. +# +# This was reported as CR #6904878 ("join -t no longer works with multibyte char separator"): +# ------------ snip ------------ +# join doesn't handle multibyte separator correctly. +# +# $ echo $LANG +# ja +# $ od -tx1 input1 +# 0000000 66 31 a1 f7 66 32 0a +# 0000007 +# $ od -tx1 input2 +# 0000000 74 32 a1 f7 66 31 0a +# 0000007 +# # 0xa1 0xf7 in the file is multibyte character. +# $ od -tx1 delim +# 0000000 a1 f7 0a +# 0000003 +# +# $ /usr/bin/join -j1 1 -j2 2 -o 1.1 -t `cat delim` input1 input2 +# $ +# +# It should output "f1". +# +# files are attached. +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + + +function test1 +{ + typeset join_cmd="$1" + typeset testid + typeset out + typeset testname + compound saved_locale + + # save locale information + [[ -v LC_ALL ]] && saved_locale.LC_ALL="${LC_ALL}" + [[ -v LC_CTYPE ]] && saved_locale.LC_CTYPE="${LC_CTYPE}" + [[ -v LANG ]] && saved_locale.LANG="${LANG}" + + compound -r -a testcases=( + ( + typeset name="ascii_simple" + typeset locale="C" + typeset input1_format="fish 81 91\n" + typeset input2_format="fish B A\n" + typeset -a join_args_format=( "input1" "input2" ) + typeset output_format="fish 81 91 B A" + ) + ( + typeset name="ja_JP.eucJP_multibyte_delimiter" + typeset locale="ja_JP.eucJP" + typeset input1_format="\x66\x31\xa1\xf7\x66\x32\x0a" + typeset input2_format="\x74\x32\xa1\xf7\x66\x31\x0a" + typeset -a join_args_format=( "-j1" "1" "-j2" "2" "-o" "1.1" "-t" "\xa1\xf7" "input1" "input2" ) + typeset output_format="f1" + ) + ) + + for testid in "${!testcases[@]}" ; do + nameref tc=testcases[${testid}] + testname="${join_cmd}/${tc.name}" + + if [[ "${tc.locale}" == "<unicode>" ]] ; then + if [[ "$LC_ALL" != *.UTF-8 ]] ; then + export LC_ALL='en_US.UTF-8' + fi + else + export LC_ALL="${tc.locale}" + fi + + # build "join_args" array with multibyte characters in the current locale + typeset -a join_args + integer arg_index + for arg_index in "${!tc.join_args_format[@]}" ; do + join_args+=( "$( printf -- "${tc.join_args_format[arg_index]}" )" ) + done + + typeset output_format="$( printf -- "${tc.output_format}" )" + + #printf "args=|%q|\n" "${join_args[@]}" + + printf "${tc.input1_format}" >"input1" + printf "${tc.input2_format}" >"input2" + + out="$(${SHELL} -c "${join_cmd} \"\$@\"" dummy "${join_args[@]}" 2>&1)" || err_exit "${testname}: Command returned exit code $?" + [[ "${out}" == ${output_format} ]] || err_exit "${testname}: Expected match for $(printf "%q\n" "${output_format}"), got $(printf "%q\n" "${out}")" + + rm "input1" "input2" + + # cleanup and restore locale settings + unset join_args arg_index + [[ -v saved_locale.LC_ALL ]] && LC_ALL="${saved_locale.LC_ALL}" || unset LC_ALL + [[ -v saved_locale.LC_CTYPE ]] && LC_CTYPE="${saved_locale.LC_CTYPE}" || unset LC_CTYPE + [[ -v saved_locale.LANG ]] && LANG="${saved_locale.LANG}" || unset LANG + done + + return 0 +} + + +function test2 +{ + typeset joincmd=$1 + typeset testname="${joincmd}" + typeset out + + # create files + printf "\x66\x31\xa1\xf7\x66\x32\x0a" >"input1" + printf "\x74\x32\xa1\xf7\x66\x31\x0a" >"input2" + printf "\xa1\xf7\x0a" >"delim" + + # run test + out=$( LC_ALL=ja_JP.eucJP ${SHELL} -o pipefail -o errexit -c '$1 -j1 1 -j2 2 -o 1.1 -t $(cat delim) input1 input2' dummy "${joincmd}" 2>&1 ) || err_exit "${testname}: Test failed with exit code $?" + [[ "${out}" == 'f1' ]] || err_exit "${testname}: Expected 'f1', got $(printf "%q\n" "${out}")" + + # cleanup + rm "input1" "input2" "delim" + + return 0 +} + +#for cmd in "/usr/bin/join" "join" ; do +for cmd in "join" ; do + test1 "${cmd}" + test2 "${cmd}" +done + + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh new file mode 100644 index 0000000000..b9240e5f32 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh @@ -0,0 +1,221 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test checks whether the EXIT trap is called correctly in subshells +# +# This was reported as CR #6907460 ("EXIT trap handlers are sometimes executed twice"): +# ------------ snip ------------ +# During SST testing of snv_128(RE) we found out that ksh93 executes EXIT +# trap handlers twice under some circumstances. +# +# Here is a test script: +# --- +# #!/bin/ksh93 -x +# +# function A +# { +# set -x +# trap "print TRAP A >>log" EXIT +# print >&2 +# } +# +# function B +# { +# set -x +# trap "print TRAP B >>log" EXIT +# A +# } +# +# rm -f log +# x=$(B) +# --- +# +# It produces the following output on snv_128: +# --- +# + rm -f log +# + B +# + trap 'print TRAP B >>log' EXIT +# + A +# + trap 'print TRAP A >>log' EXIT +# + print +# + + print TRAP A +# 1>& 2 +# + 1>> log +# + print TRAP B +# +# + 1>> log +# + print TRAP A +# + 1>> log +# + print TRAP B +# + 1>> log +# + x='' +# --- +# +# The log file then contains: +# TRAP A +# TRAP B +# TRAP A +# TRAP B +# +# However, the expected log would be: +# TRAP A +# TRAP B +# +# When the "x=$(B)" line is changed to "B", the log is correct: +# TRAP A +# TRAP B +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + +# test 1: Run test with some variations +compound vari +typeset testname + +for vari.shell_options in \ + "" \ + "-o xtrace" \ + "-o errexit" \ + "-o errexit -o xtrace" ; do + for vari.xtrace1 in \ + "" \ + "set -x" ; do + for vari.xtrace2 in \ + "" \ + "set -x" ; do + for vari.func_A_end in \ + "" \ + "print >&2" \ + "return 0" \ + "print >&2 ; return 0" ; do + for vari.subshell in \ + $'x=$(B)' \ + $'x=$( ( B ) )' \ + $'x=${ B ; }' \ + $'x=${ ( B ) ; }' \ + $'( x=$(B) )' \ + $'( x=$( ( B ) ) )' \ + $'( x=${ B ; } )' \ + $'( x=${ ( B ) ; } )' ; do + testname="$( printf "test |%#B|\n" vari )" + +cat >"testscript.sh" <<EOF + function A + { + ${vari.xtrace1} + trap "print TRAP A >>log" EXIT + ${vari.func_A_end} + } + + function B + { + ${vari.xtrace2} + trap "print TRAP B >>log" EXIT + A + } + + rm -f log + ${vari.subshell} +EOF + ${SHELL} ${vari.shell_options} "testscript.sh" >/dev/null 2>&1 || err_exit "${testname}: Unexpected error code $?" + rm "testscript.sh" + + if [[ -f "log" ]] ; then + out="$( < log )" + rm "log" + else + err_exit "${testname}: File 'log' not found." + fi + [[ "${out}" == $'TRAP A\nTRAP B' ]] || err_exit "${testname}: Expected \$'TRAP A\nTRAP B', got $(printf "%q\n" "${out}")" + done + done + done + done +done + + + +# test 2: This is the unmodified test from the bugster bug report +( +cat <<EOF + function A + { + set -x + trap "print TRAP A >>log" EXIT + print >&2 + } + + function B + { + set -x + trap "print TRAP B >>log" EXIT + A + } + + rm -f log + x=\$(B) +EOF +) | ${SHELL} >/dev/null 2>&1 || err_exit "Unexpected error code $?" + +if [[ -f "log" ]] ; then + out="$( < log )" + rm "log" +else + err_exit "File 'log' not found." +fi +[[ "${out}" == $'TRAP A\nTRAP B' ]] || err_exit "Expected \$'TRAP A\nTRAP B', got $(printf "%q\n" "${out}")" + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_cr_xxxxxxxx_template.sh b/usr/src/lib/libshell/common/tests/sun_solaris_cr_xxxxxxxx_template.sh new file mode 100644 index 0000000000..b1c40f22f5 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_cr_xxxxxxxx_template.sh @@ -0,0 +1,66 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# <short summary> +# +# This was reported as CR #xxxxxxxx ("<title>"): +# ------------ snip ------------ +# <description> +# ------------ snip ------------ +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir +typeset out + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_<description>.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + + +# run tests + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_getconf.sh b/usr/src/lib/libshell/common/tests/sun_solaris_getconf.sh index 8e1e2ab937..2b1243c5c0 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_getconf.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_getconf.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -34,7 +33,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_locale_misc.sh b/usr/src/lib/libshell/common/tests/sun_solaris_locale_misc.sh new file mode 100644 index 0000000000..bb3314fe49 --- /dev/null +++ b/usr/src/lib/libshell/common/tests/sun_solaris_locale_misc.sh @@ -0,0 +1,188 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# + +# +# This test module contains misc l10n tests +# +# + +# test setup +function err_exit +{ + print -u2 -n "\t" + print -u2 -r ${Command}[$1]: "${@:2}" + (( Errors < 127 && Errors++ )) +} +alias err_exit='err_exit $LINENO' + +set -o nounset +Command=${0##*/} +integer Errors=0 + +typeset ocwd +typeset tmpdir + +# create temporary test directory +ocwd="$PWD" +tmpdir="$(mktemp -t -d "test_sun_solaris_locale_misc.XXXXXXXX")" || err_exit "Cannot create temporary directory" + +cd "${tmpdir}" || { err_exit "cd ${tmpdir} failed." ; exit $((Errors)) ; } + +# +# utility functions +# + +function string_has_multibyte_characters +{ + typeset str="$1" + integer bytecount + integer mbcharactercount + + (( mbcharactercount=$(LC_ALL="en_US.UTF-8" wc -C <<<"${str}") )) + (( bytecount=$(wc -c <<<"${str}") )) + + (( bytecount != mbcharactercount )) && return 0 + return 1 +} + +# +# test functions +# + +# test whether LC_ALL correctly overrides LC_MESSAGES in the choice of the system message +# catalog +# 1. This test assumes that the machine has ko_KR.UTF-8 + matching message catalogs installed +# 2. We run this test in a |fork()|'ed subshell to isolate it from the other tests +function test_lc_all_override1 +{ + typeset out + + ( + ulimit -c 0 # force ksh93 to |fork()| for this subshell + + unset ${!LC_*} LANG + #export LANG=en_US.UTF-8 + export LC_ALL="en_US.UTF-8" + + integer ch_val + integer korean_count=0 + ${SHELL} -c 'LC_MESSAGES=C ${SHELL} -c "cd no_dir_llkk ; export LC_ALL="ko_KR.UTF-8" ; cd "no_dir_ooo" ; true"' >"out" 2>&1 || err_exit "Test shell failed with non-zero exit code $?" + + while read -N1 c ; do + (( ch_val='${c} )) + + (( ch_val >= 0xac00 && ch_val <= 0xdfff )) && (( korean_count++ )) + done <"out" + + # Solaris 11/B110 returns 13 characters for this test + (( korean_count >= 10 )) || err_exit "Expected at least 10 korean characters, got ${korean_count}" + + rm "out" + + exit $((Errors)) + ) + (( Errors += $? )) + return 0 +} + +# test whether the shell internally selects the correct message catalogs +# when the value of LC_* or LANG is restored to a "previous" value (e.g. +# subshell, function) or gets "reset" (e.g. unset) +function test_lc_l10n_scope1 +{ + compound -r -a testgroups=( + ( + name="subshell" + typeset -a tests=( + 'LC_ALL="C" ; cd "nosuchdir2" ; (LC_ALL="ja_JP.UTF-8" ; cd "nosuchdir2") ; cd "nosuchdir2" ; true' + 'LC_MESSAGES="C" ; cd "nosuchdir2" ; (LC_MESSAGES="ja_JP.UTF-8" ; cd "nosuchdir2") ; cd "nosuchdir2" ; true' + 'LANG="C" ; cd "nosuchdir2" ; (LANG="ja_JP.UTF-8" ; cd "nosuchdir2") ; cd "nosuchdir2" ; true' + ) + ) + ( + name="unset" + typeset -a tests=( + 'LC_ALL="C" ; cd "nosuchdir2" ; LC_ALL="ja_JP.UTF-8" ; cd "nosuchdir2" ; unset LC_ALL ; cd "nosuchdir2" ; true' + 'LC_MESSAGES="C" ; cd "nosuchdir2" ; LC_MESSAGES="ja_JP.UTF-8" ; cd "nosuchdir2" ; unset LC_MESSAGES ; cd "nosuchdir2" ; true' + 'LANG="C" ; cd "nosuchdir2" ; LANG="ja_JP.UTF-8" ; cd "nosuchdir2" ; unset LANG ; cd "nosuchdir2" ; true' + ) + ) + ( + name="empty LC_xxx" + typeset -a tests=( + 'LC_ALL="C" ; cd "nosuchdir2" ; LC_ALL="ja_JP.UTF-8" ; cd "nosuchdir2" ; LC_ALL="" ; cd "nosuchdir2" ; true' + 'LC_MESSAGES="C" ; cd "nosuchdir2" ; LC_MESSAGES="ja_JP.UTF-8" ; cd "nosuchdir2" ; LC_MESSAGES="" ; cd "nosuchdir2" ; true' + 'LANG="C" ; cd "nosuchdir2" ; LANG="ja_JP.UTF-8" ; cd "nosuchdir2" ; LANG="" ; cd "nosuchdir2" ; true' + ) + ) + ( + name="function" + typeset -a tests=( + 'LC_ALL="C" ; cd "nosuchdir2" ; function x { typeset LC_ALL="ja_JP.UTF-8" ; cd "nosuchdir2" ; } ; x ; cd "nosuchdir2" ; true' + 'LC_MESSAGES="C" ; cd "nosuchdir2" ; function x { typeset LC_MESSAGES="ja_JP.UTF-8" ; cd "nosuchdir2" ; } ; x ; cd "nosuchdir2" ; true' + 'LANG="C" ; cd "nosuchdir2" ; function x { typeset LANG="ja_JP.UTF-8" ; cd "nosuchdir2" ; } ; x ; cd "nosuchdir2" ; true' + ) + ) + ) + + + typeset tgi ti out2 + + for tgi in "${!testgroups[@]}" ; do + nameref tg=testgroups[${tgi}] + + for ti in "${!tg.tests[@]}" ; do + nameref ts=tg.tests[${ti}] + + ${SHELL} -c "unset LANG \${!LC_*} ; ${SHELL} -c \"${ts}\"" >out 2>&1 || err_exit "test returned non-zero exit code $?" + out2="${ + while read -r line ; do + string_has_multibyte_characters "${line}" && print -n "A" || print -n "_" + done <"out" + print "" + }" + if [[ "${out2}" != '_A_' ]] ; then + err_exit "test '${tg.name}'/'$ts' failed: Expected '_A_', got '${out2}'" + #cat out + fi + done + done + + rm "out" + + return 0 +} + + +# run tests +test_lc_all_override1 +test_lc_l10n_scope1 + + +cd "${ocwd}" +rmdir "${tmpdir}" || err_exit "Cannot remove temporary directory ${tmpdir}". + +# tests done +exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_staticvariables.sh b/usr/src/lib/libshell/common/tests/sun_solaris_staticvariables.sh index 9f430d7c1c..64574c2733 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_staticvariables.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_staticvariables.sh @@ -20,15 +20,14 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # function err_exit2 { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors+=1 )) + (( Errors < 127 && Errors++ )) } function testfunc diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_vartree001.sh b/usr/src/lib/libshell/common/tests/sun_solaris_vartree001.sh index bf5257a78a..9e11cc23d2 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_vartree001.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_vartree001.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -55,7 +54,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_vartree002.sh b/usr/src/lib/libshell/common/tests/sun_solaris_vartree002.sh index c2ca8f5e5e..ea7d7bd274 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_vartree002.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_vartree002.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -36,7 +35,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/sun_solaris_vartree003.sh b/usr/src/lib/libshell/common/tests/sun_solaris_vartree003.sh index 1bab7006c3..834234a44c 100644 --- a/usr/src/lib/libshell/common/tests/sun_solaris_vartree003.sh +++ b/usr/src/lib/libshell/common/tests/sun_solaris_vartree003.sh @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -36,7 +35,7 @@ function err_exit { print -u2 -n "\t" print -u2 -r ${Command}[$1]: "${@:2}" - (( Errors++ )) + (( Errors < 127 && Errors++ )) } alias err_exit='err_exit $LINENO' diff --git a/usr/src/lib/libshell/common/tests/tilde.sh b/usr/src/lib/libshell/common/tests/tilde.sh index e22626f6df..ef5dc5c364 100644 --- a/usr/src/lib/libshell/common/tests/tilde.sh +++ b/usr/src/lib/libshell/common/tests/tilde.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/timetype.sh b/usr/src/lib/libshell/common/tests/timetype.sh index 94b27843f1..8a2d17d324 100644 --- a/usr/src/lib/libshell/common/tests/timetype.sh +++ b/usr/src/lib/libshell/common/tests/timetype.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/types.sh b/usr/src/lib/libshell/common/tests/types.sh index 5904640e07..c20f2eb125 100644 --- a/usr/src/lib/libshell/common/tests/types.sh +++ b/usr/src/lib/libshell/common/tests/types.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/variables.sh b/usr/src/lib/libshell/common/tests/variables.sh index f174a9a2bf..da943e0c87 100644 --- a/usr/src/lib/libshell/common/tests/variables.sh +++ b/usr/src/lib/libshell/common/tests/variables.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # @@ -647,4 +647,13 @@ do exp="$cmd ok" [[ $got == "$exp" ]] || err_exit "cd with CDPATH after PATH change failed -- expected '$exp', got '$got'" done +v=LC_CTYPE +unset $v +[[ -v $v ]] && err_exit "unset $v; [[ -v $v ]] failed" +eval $v=C +[[ -v $v ]] || err_exit "$v=C; [[ -v $v ]] failed" + +cmd='set --nounset; unset foo; : ${!foo*}' +$SHELL -c "$cmd" 2>/dev/null || err_exit "'$cmd' exit status $?, expected 0" + exit $((Errors)) diff --git a/usr/src/lib/libshell/common/tests/vartree1.sh b/usr/src/lib/libshell/common/tests/vartree1.sh index 67134086af..4701251549 100644 --- a/usr/src/lib/libshell/common/tests/vartree1.sh +++ b/usr/src/lib/libshell/common/tests/vartree1.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/common/tests/vartree2.sh b/usr/src/lib/libshell/common/tests/vartree2.sh index 9f478ae140..806b443377 100644 --- a/usr/src/lib/libshell/common/tests/vartree2.sh +++ b/usr/src/lib/libshell/common/tests/vartree2.sh @@ -1,7 +1,7 @@ ######################################################################## # # # This software is part of the ast package # -# Copyright (c) 1982-2009 AT&T Intellectual Property # +# Copyright (c) 1982-2010 AT&T Intellectual Property # # and is licensed under the # # Common Public License, Version 1.0 # # by AT&T Intellectual Property # diff --git a/usr/src/lib/libshell/i386/include/ast/history.h b/usr/src/lib/libshell/i386/include/ast/history.h index 0159773f4d..1b0f3ce403 100644 --- a/usr/src/lib/libshell/i386/include/ast/history.h +++ b/usr/src/lib/libshell/i386/include/ast/history.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/i386/include/ast/nval.h b/usr/src/lib/libshell/i386/include/ast/nval.h index a81d34b84a..f5be4fa865 100644 --- a/usr/src/lib/libshell/i386/include/ast/nval.h +++ b/usr/src/lib/libshell/i386/include/ast/nval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/i386/include/ast/shell.h b/usr/src/lib/libshell/i386/include/ast/shell.h index b5d87afc94..a8c1d85c3b 100644 --- a/usr/src/lib/libshell/i386/include/ast/shell.h +++ b/usr/src/lib/libshell/i386/include/ast/shell.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/acct b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/acct index 244572d4c5..1eacd5748b 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/acct +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/acct @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_acct_ksh93 #define _def_acct_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_acct 1 /* acct() in default lib(s) */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/cmds b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/cmds index 49759dec7a..624e61d6aa 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/cmds +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/cmds @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/cmds by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/cmds by iffe version 2009-12-04 : : */ #ifndef _def_cmds_ksh93 #define _def_cmds_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _cmd_newgrp 1 /* newgrp in ?(/usr)/(bin|etc|ucb) */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/dynamic b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/dynamic index 1b4e91ae24..1eec287fc4 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/dynamic +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/dynamic @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/dynamic by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/dynamic by iffe version 2009-12-04 : : */ #ifndef _def_dynamic_ksh93 #define _def_dynamic_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #if SHOPT_DYNAMIC diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/execargs b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/execargs index e7f2528287..932467ae55 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/execargs +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/execargs @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_execargs_ksh93 #define _def_execargs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/externs b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/externs index 22eb25b028..87d724ff31 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/externs +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/externs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/externs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/externs by iffe version 2009-12-04 : : */ #ifndef _def_externs_ksh93 #if !defined(__PROTO__) @@ -63,10 +63,10 @@ #define _def_externs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_exec_attr 1 /* #include <exec_attr.h> ok */ @@ -75,10 +75,12 @@ #define _lib_setreuid 1 /* setreuid() in default lib(s) */ #define _lib_setregid 1 /* setregid() in default lib(s) */ #define _lib_nice 1 /* nice() in default lib(s) */ -#define _lib_sigflag 1 /* sigflag() in default lib(s) */ #define _lib_fork 1 /* fork() in default lib(s) */ #define _lib_spawnveg 1 /* spawnveg() in default lib(s) */ #define _lib_fchdir 1 /* fchdir() in default lib(s) */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memcntl 1 /* memcntl() in default lib(s) */ +#define _LIB_secdb 1 /* -lsecdb is a library */ +#define _lib_getexecuser 1 /* getexecuser() in default lib(s) */ +#define _lib_free_execattr 1 /* free_execattr() in default lib(s) */ #endif diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/locale b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/locale index 77018234ee..58f37b7293 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/locale +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/locale @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/locale by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/locale by iffe version 2009-12-04 : : */ #ifndef _def_locale_ksh93 #define _def_locale_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_locale 1 /* #include <locale.h> ok */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/math b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/math index 5b8088f5fa..fbe05f198a 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/math +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/math @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/math.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/math.sh by iffe version 2009-12-04 : : */ #ifndef _def_math_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,15 +62,15 @@ #define _def_math_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ -/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/data/math.tab : : */ +/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/data/math.tab : : */ typedef Sfdouble_t (*Math_f) __PROTO__((Sfdouble_t,...)); diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/options b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/options index 6dcb17ce26..0ca0c8c236 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/options +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/options @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/options by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/options by iffe version 2009-12-04 : : */ #ifndef _def_options_ksh93 #define _def_options_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define SHELLMAGIC 1 diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/poll b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/poll index d4e3c2db6f..b964d0401a 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/poll +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/poll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/poll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/poll by iffe version 2009-12-04 : : */ #ifndef _def_poll_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,10 +62,10 @@ #define _def_poll_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_poll 1 /* #include <poll.h> ok */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/pstat b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/pstat index b6be9afb88..abb87a7d96 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/pstat +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/pstat @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_pstat_ksh93 #define _def_pstat_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/rlimits b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/rlimits index a61321f297..89aa709889 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/rlimits +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/rlimits @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/rlimits by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/rlimits by iffe version 2009-12-04 : : */ #ifndef _def_rlimits_ksh93 #define _def_rlimits_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _sys_resource 1 /* #include <sys/resource.h> ok */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/setjmp b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/setjmp index 2323618ae6..52ddecf760 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/setjmp +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/setjmp @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/setjmp by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/setjmp by iffe version 2009-12-04 : : */ #ifndef _def_setjmp_ksh93 #define _def_setjmp_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigsetjmp 1 /* sigsetjmp() in default lib(s) */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/sigfeatures b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/sigfeatures index b40e774dbc..25b4198fd1 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/sigfeatures +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/sigfeatures @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-12-04 : : */ #ifndef _def_sigfeatures_ksh93 #define _def_sigfeatures_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigrelse 1 /* sigrelse() in default lib(s) */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/time b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/time index 524df0ed96..2c56a3523c 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/time +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/time @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ksh93 #define _def_time_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_utime 1 /* #include <utime.h> ok */ diff --git a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/ttys b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/ttys index c7a345a56c..6c6422a04d 100644 --- a/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/ttys +++ b/usr/src/lib/libshell/i386/src/cmd/ksh93/FEATURE/ttys @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/cmd/ksh93/features/ttys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/cmd/ksh93/features/ttys by iffe version 2009-12-04 : : */ #ifndef _def_ttys_ksh93 #define _def_ttys_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_termios 1 /* #include <termios.h> ok */ diff --git a/usr/src/lib/libshell/misc/ERRATA.txt b/usr/src/lib/libshell/misc/ERRATA.txt index dc860d14fb..184b6aa01e 100644 --- a/usr/src/lib/libshell/misc/ERRATA.txt +++ b/usr/src/lib/libshell/misc/ERRATA.txt @@ -20,8 +20,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -372,33 +371,6 @@ of the next line if the terminal cursor is not at position 0. ######## Errata #004: ######## -A workaround has been added for a probem with the AST "tail" builtin which -causes "tail" to sleep too long when polling for data in "follow" mode. -The following files have been changed: --- snip -- -Index: src/lib/libcmd/common/tail.c -=================================================================== ---- usr/src/lib/libcmd/common/tail.c (revision 1701) -+++ usr/src/lib/libcmd/common/tail.c (working copy) -@@ -636,7 +636,14 @@ - { - if (sfsync(sfstdout)) - error(ERROR_system(1), "write error"); -+#if 0 - sleep(1); -+#else -+ { -+ struct timespec rqt = { 0L, 1000000000L/4L }; -+ (void)nanosleep(&rqt, NULL); -+ } -+#endif - n = 0; - pp = 0; - while (fp) --- snip -- - - -######## Errata #005: ######## The POSIX "cksum"/CRC and AT&T "sum" codepaths in libsum have been reworked and then backpoprted to address a performance regression on some machine/architecture combinations. @@ -782,4 +754,264 @@ Index: usr/src/lib/libsum/common/sum-att.c att_done(Sum_t* p) -- snip -- + + +######## Errata #005: ######## +A fix for an off-by-one buffer overflow in the regex expression cache +has been backported. +The following files have been changed: +-- snip -- +Index: usr/src/lib/libast/common/regex/regcache.c +=================================================================== +--- usr/src/lib/libast/common/regex/regcache.c (revision 1821) ++++ usr/src/lib/libast/common/regex/regcache.c (working copy) +@@ -166,7 +166,7 @@ + cp->keep = 0; + regfree(&cp->re); + } +- if ((i = strlen(pattern)) >= cp->size) ++ if ((i = strlen(pattern) + 1) >= cp->size) + { + cp->size = roundof(i, ROUND); + if (!(cp->pattern = newof(cp->pattern, char, cp->size, 0))) +-- snip -- + + +######## Errata #006: ######## +A fix for an issue with tail -f becoming stuck after a few 1000 lines +has been backported: +The following files have been changed: +-- snip -- +Index: usr/src/lib/libcmd/common/tail.c +=================================================================== +--- usr/src/lib/libcmd/common/tail.c (revision 1822) ++++ usr/src/lib/libcmd/common/tail.c (working copy) +@@ -28,7 +28,7 @@ + */ + + static const char usage[] = +-"+[-?\n@(#)$Id: tail (AT&T Research) 2010-03-07 $\n]" ++"+[-?\n@(#)$Id: tail (AT&T Research) 2010-03-23 $\n]" + USAGE_LICENSE + "[+NAME?tail - output trailing portion of one or more files ]" + "[+DESCRIPTION?\btail\b copies one or more input files to standard output " +@@ -647,16 +647,14 @@ + error(ERROR_system(0), "%s: cannot stat", fp->name); + else if (fp->fifo || fp->end < st.st_size) + { +- fp->end = st.st_size; + n = 1; + if (timeout) + fp->expire = NOW + timeout; +- z = fp->fifo ? SF_UNBOUND : fp->end - fp->cur; ++ z = fp->fifo ? SF_UNBOUND : st.st_size - fp->cur; + i = 0; + if ((s = sfreserve(fp->sp, z, SF_LOCKR)) || (z = sfvalue(fp->sp)) && (s = sfreserve(fp->sp, z, SF_LOCKR)) && (i = 1)) + { +- if (fp->fifo) +- z = sfvalue(fp->sp); ++ z = sfvalue(fp->sp); + for (r = s + z; r > s && *(r - 1) != '\n'; r--); + if ((w = r - s) || i && (w = z)) + { +@@ -672,6 +670,7 @@ + else + w = 0; + sfread(fp->sp, s, w); ++ fp->end += w; + } + goto next; + } +-- snip -- + + + + +######## Errata #007: ######## +A warning for shcomp -n has been backported from ksh93 version 'u' to +handle the possible loss of precision in (( var=$var2 )) vs. +(( var=var2 )): +The following files have been changed: +-- snip -- +Index: usr/src/lib/libshell/common/sh/parse.c +=================================================================== +--- usr/src/lib/libshell/common/sh/parse.c (revision 1822) ++++ usr/src/lib/libshell/common/sh/parse.c (working copy) +@@ -247,6 +247,34 @@ + return(par); + } + ++static int paramsub(const char *str) ++{ ++ register int c,sub=0,lit=0; ++ while(c= *str++) ++ { ++ if(c=='$' && !lit) ++ { ++ if(*str=='(') ++ return(0); ++ if(sub) ++ continue; ++ if(*str=='{') ++ str++; ++ if(!isdigit(*str) && strchr("?#@*!$ ",*str)==0) ++ return(1); ++ } ++ else if(c=='`') ++ return(0); ++ else if(c=='[' && !lit) ++ sub++; ++ else if(c==']' && !lit) ++ sub--; ++ else if(c=='\'') ++ lit = !lit; ++ } ++ return(0); ++} ++ + static Shnode_t *getanode(Lex_t *lp, struct argnod *ap) + { + register Shnode_t *t = getnode(arithnod); +@@ -256,7 +284,11 @@ + if(ap->argflag&ARG_RAW) + t->ar.arcomp = sh_arithcomp(ap->argval); + else ++ { ++ if(sh_isoption(SH_NOEXEC) && (ap->argflag&ARG_MAC) && paramsub(ap->argval)) ++ errormsg(SH_DICT,ERROR_warn(0),"%d: parameter substitution requires unnecessary string to number conversion",lp->sh->inlineno-(lp->token=='\n')); + t->ar.arcomp = 0; ++ } + return(t); + } + +-- snip -- + + +######## Errata #008: ######## +A fix for an issue with a Sun Studio warning has been backported: +The following files have been changed: +-- snip -- +Index: usr/src/lib/libast/common/path/pathtemp.c +=================================================================== +--- usr/src/lib/libast/common/path/pathtemp.c (revision 1822) ++++ usr/src/lib/libast/common/path/pathtemp.c (working copy) +@@ -297,7 +297,7 @@ + */ + + tmp.pid = getpid(); +- tmp.rng = (uint32_t)tmp.pid * ((uint32_t)time(NiL) ^ (((uint32_t)(&attempt)) >> 3) ^ (((uint32_t)tmp.dir) >> 3)); ++ tmp.rng = (uintptr_t)tmp.pid * ((uintptr_t)time(NiL) ^ (((uintptr_t)(&attempt)) >> 3) ^ (((uintptr_t)tmp.dir) >> 3)); + if (!tmp.key) + tmp.key = (tmp.rng >> 16) | ((tmp.rng & 0xffff) << 16); + tmp.rng ^= tmp.key; +-- snip -- + + +######## Errata #009: ######## +A fix for an issue with a typeset -p having problems with compound +variables and typeset -a -C loosing the -C attribute has been +backported from ksh93 version "u-": +-- snip -- +Index: usr/src/lib/libshell/common/bltins/typeset.c +=================================================================== +--- usr/src/lib/libshell/common/bltins/typeset.c (revision 1863) ++++ usr/src/lib/libshell/common/bltins/typeset.c (working copy) +@@ -540,7 +540,12 @@ + else if(nv_isnull(np)) + nv_onattr(np,NV_ARRAY|(comvar?NV_NOFREE:0)); + else ++ { ++ Namarr_t *ap=nv_arrayptr(np); ++ if(ap && comvar) ++ ap->nelem |= ARRAY_TREE; + nv_putsub(np, (char*)0, 0); ++ } + } + else if(nvflags&NV_ARRAY) + { +Index: usr/src/lib/libshell/common/sh/nvtree.c +=================================================================== +--- usr/src/lib/libshell/common/sh/nvtree.c (revision 1863) ++++ usr/src/lib/libshell/common/sh/nvtree.c (working copy) +@@ -69,6 +69,7 @@ + static Namval_t *create_tree(Namval_t *np,const char *name,int flag,Namfun_t *dp) + { + register Namfun_t *fp=dp; ++ fp->dsize = 0; + while(fp=fp->next) + { + if(fp->disc && fp->disc->createf) +@@ -723,7 +724,10 @@ + nv_attribute(np,wp->out,"typeset",'='); + nv_outname(wp->out,name,-1); + if((np->nvalue.cp && np->nvalue.cp!=Empty) || nv_isattr(np,~(NV_MINIMAL|NV_NOFREE)) || nv_isvtree(np)) +- sfputc(wp->out,(isarray==2?'\n':'=')); ++ { ++ if(wp->indent>=0 || isarray!=2) ++ sfputc(wp->out,(isarray==2?'\n':'=')); ++ } + if(isarray==2) + return; + } +@@ -1015,7 +1019,7 @@ + */ + char *nv_getvtree(register Namval_t *np, Namfun_t *fp) + { +- int flags=0; ++ int flags=0, dsize=fp->dsize; + for(; fp && fp->next; fp=fp->next) + { + if(fp->next->disc && (fp->next->disc->getnum || fp->next->disc->getval)) +@@ -1027,6 +1031,8 @@ + return(nv_getv(np,fp)); + if(flags = nv_isattr(np,NV_EXPORT)) + nv_offattr(np,NV_EXPORT); ++ if(dsize && (flags&NV_EXPORT)) ++ return("()"); + return(walk_tree(np,(Namval_t*)0,flags)); + } + +@@ -1083,6 +1089,7 @@ + return; + nfp = newof(NIL(void*),Namfun_t,1,0); + nfp->disc = &treedisc; ++ nfp->dsize = sizeof(Namfun_t); + nv_stack(np, nfp); + } + +Index: usr/src/lib/libshell/common/sh/array.c +=================================================================== +--- usr/src/lib/libshell/common/sh/array.c (revision 1863) ++++ usr/src/lib/libshell/common/sh/array.c (working copy) +@@ -923,9 +923,10 @@ + if(array_isbit(aq->bits, dot,ARRAY_CHILD)) + { + Namval_t *mp = aq->val[dot].np; +- if((aq->header.nelem&ARRAY_NOCHILD) && nv_isvtree(mp)) ++ if((aq->header.nelem&ARRAY_NOCHILD) && nv_isvtree(mp) && !mp->nvfun->dsize) + continue; +- nv_putsub(mp,NIL(char*),ARRAY_UNDEF); ++ if(nv_isarray(mp)) ++ nv_putsub(mp,NIL(char*),ARRAY_UNDEF); + } + return(1); + } +Index: usr/src/lib/libshell/common/sh/name.c +=================================================================== +--- usr/src/lib/libshell/common/sh/name.c (revision 1863) ++++ usr/src/lib/libshell/common/sh/name.c (working copy) +@@ -538,7 +538,11 @@ + + } + if(!nv_isarray(np) && !typ && (tp->com.comarg || !tp->com.comset || tp->com.comset->argval[0]!='[')) ++ { + nv_setvtree(np); ++ if(tp->com.comarg || tp->com.comset) ++ np->nvfun->dsize = 0; ++ } + #if SHOPT_TYPEDEF + goto check_type; + #else +-- snip -- + # EOF. diff --git a/usr/src/lib/libshell/misc/buildksh93.readme b/usr/src/lib/libshell/misc/buildksh93.readme index 6edf060f5c..ceff00f77c 100644 --- a/usr/src/lib/libshell/misc/buildksh93.readme +++ b/usr/src/lib/libshell/misc/buildksh93.readme @@ -19,8 +19,7 @@ # CDDL HEADER END # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -49,14 +48,14 @@ properly found. * Example usage of the script (more information can be found in the script itself): ## Download AT&T ksh93 sources -$ wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/INIT.2009-10-14.tgz' -$ wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/ast-ksh.2009-10-14.tgz' +$ wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/INIT.2010-03-09.tgz' +$ wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/ast-ksh.2010-03-09.tgz' ## Unpack the sources (32bit SPARC): $ mkdir build_sparc_32bit $ cd build_sparc_32bit -$ gunzip -c <../INIT.2009-10-14.tgz | tar -xf - -$ gunzip -c <../ast-ksh.2009-10-14.tgz | tar -xf - +$ gunzip -c <../INIT.2010-03-09.tgz | tar -xf - +$ gunzip -c <../ast-ksh.2010-03-09.tgz | tar -xf - ## Build ast-ksh for 32bit SPARC # (build other build flags are: diff --git a/usr/src/lib/libshell/misc/buildksh93.sh b/usr/src/lib/libshell/misc/buildksh93.sh index c590047edb..d89941d278 100644 --- a/usr/src/lib/libshell/misc/buildksh93.sh +++ b/usr/src/lib/libshell/misc/buildksh93.sh @@ -23,8 +23,7 @@ # # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # @@ -33,8 +32,8 @@ # # ksh93t sources can be downloaded like this from the AT&T site: -# wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/INIT.2009-10-14.tgz' -# wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/sw/download/beta/ast-ksh.2009-10-14.tgz' +# wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/~gsf/download/tgz/INIT.2010-03-09.tgz' +# wget --http-user="I accept www.opensource.org/licenses/cpl" --http-passwd="." 'http://www.research.att.com/~gsf/download/tgz/ast-ksh.2010-03-09.tgz' function fatal_error { @@ -93,8 +92,7 @@ cat <<ENDOFTEXT */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. + * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. */ #ifndef _SOLARIS_KSH_CMDLIST_H @@ -111,16 +109,6 @@ extern "C" { * tools */ -/* POSIX compatible commands */ -#ifdef _NOT_YET -#define XPG6CMDLIST(f) \\ - { "/usr/xpg6/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, -#define XPG4CMDLIST(f) \\ - { "/usr/xpg4/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, -#else -#define XPG6CMDLIST(f) -#define XPG4CMDLIST(f) -#endif /* NOT_YET */ /* * Commands which are 100% compatible with native Solaris versions (/bin is * a softlink to ./usr/bin, ksh93 takes care about the lookup) @@ -133,6 +121,18 @@ extern "C" { { "/sbin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, #define SUSRBINCMDLIST(f) \\ { "/usr/sbin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +/* POSIX compatible commands */ +#define XPG6CMDLIST(f) \\ + { "/usr/xpg6/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#define XPG4CMDLIST(f) \\ + { "/usr/xpg4/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#ifdef SHOPT_USR_GNU_BIN_BUILTINS +/* GNU coreutils compatible commands */ +#define GNUCMDLIST(f) \\ + { "/usr/gnu/bin/" #f, NV_BLTIN|NV_BLTINOPT|NV_NOFREE, bltin(f) }, +#else +#define GNUCMDLIST(f) +#endif /* * Make all ksh93 builtins accessible when /usr/ast/bin was added to * /usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:/bin:/opt/SUNWspro/bin @@ -146,83 +146,115 @@ extern "C" { #undef mktemp /* Generated data, do not edit. */ -XPG4CMDLIST(basename) ASTCMDLIST(basename) -BINCMDLIST(cat) +GNUCMDLIST(basename) +XPG4CMDLIST(basename) ASTCMDLIST(cat) -XPG4CMDLIST(chgrp) +BINCMDLIST(cat) ASTCMDLIST(chgrp) +// XPG4CMDLIST(chgrp) ASTCMDLIST(chmod) -XPG4CMDLIST(chown) -BINCMDLIST(chown) ASTCMDLIST(chown) -BINCMDLIST(cksum) +// XPG4CMDLIST(chown) +BINCMDLIST(chown) ASTCMDLIST(cksum) -BINCMDLIST(cmp) +BINCMDLIST(cksum) +GNUCMDLIST(cksum) ASTCMDLIST(cmp) -BINCMDLIST(comm) +BINCMDLIST(cmp) ASTCMDLIST(comm) -XPG4CMDLIST(cp) +BINCMDLIST(comm) +GNUCMDLIST(comm) ASTCMDLIST(cp) -BINCMDLIST(cut) +// XPG4CMDLIST(cp) ASTCMDLIST(cut) -XPG4CMDLIST(date) +BINCMDLIST(cut) +GNUCMDLIST(cut) ASTCMDLIST(date) +// XPG4CMDLIST(date) ASTCMDLIST(dirname) -XPG4CMDLIST(expr) +BINCMDLIST(dirname) +GNUCMDLIST(dirname) +// ASTCMDLIST(egrep) +// XPG4CMDLIST(egrep) ASTCMDLIST(expr) +GNUCMDLIST(expr) +XPG6CMDLIST(expr) ASTCMDLIST(fds) +// ASTCMDLIST(fgrep) +// XPG4CMDLIST(fgrep) ASTCMDLIST(fmt) -BINCMDLIST(fold) ASTCMDLIST(fold) -BINCMDLIST(head) +BINCMDLIST(fold) +GNUCMDLIST(fold) +// ASTCMDLIST(grep) +// XPG4CMDLIST(grep) ASTCMDLIST(head) -XPG4CMDLIST(id) +BINCMDLIST(head) ASTCMDLIST(id) -BINCMDLIST(join) +XPG4CMDLIST(id) ASTCMDLIST(join) -XPG4CMDLIST(ln) +BINCMDLIST(join) +GNUCMDLIST(join) ASTCMDLIST(ln) -BINCMDLIST(logname) +// XPG4CMDLIST(ln) ASTCMDLIST(logname) -BINCMDLIST(mkdir) +BINCMDLIST(logname) +GNUCMDLIST(logname) +ASTCMDLIST(md5sum) ASTCMDLIST(mkdir) -BINCMDLIST(mkfifo) +BINCMDLIST(mkdir) +GNUCMDLIST(mkdir) ASTCMDLIST(mkfifo) -BINCMDLIST(mktemp) +BINCMDLIST(mkfifo) +GNUCMDLIST(mkfifo) ASTCMDLIST(mktemp) -XPG4CMDLIST(mv) +BINCMDLIST(mktemp) +GNUCMDLIST(mktemp) ASTCMDLIST(mv) -BINCMDLIST(paste) +// XPG4CMDLIST(mv) ASTCMDLIST(paste) -BINCMDLIST(pathchk) +BINCMDLIST(paste) +GNUCMDLIST(paste) ASTCMDLIST(pathchk) -BINCMDLIST(rev) +BINCMDLIST(pathchk) +GNUCMDLIST(pathchk) +// ASTCMDLIST(readlink) ASTCMDLIST(rev) -XPG4CMDLIST(rm) +BINCMDLIST(rev) ASTCMDLIST(rm) -BINCMDLIST(rmdir) +XPG4CMDLIST(rm) ASTCMDLIST(rmdir) -XPG4CMDLIST(stty) +BINCMDLIST(rmdir) +GNUCMDLIST(rmdir) +GNUCMDLIST(sleep) ASTCMDLIST(stty) -BINCMDLIST(sum) +// XPG4CMDLIST(stty) ASTCMDLIST(sum) -SUSRBINCMDLIST(sync) -SBINCMDLIST(sync) -BINCMDLIST(sync) +BINCMDLIST(sum) ASTCMDLIST(sync) +BINCMDLIST(sync) +GNUCMDLIST(sync) +SBINCMDLIST(sync) +SUSRBINCMDLIST(sync) +ASTCMDLIST(tail) BINCMDLIST(tail) XPG4CMDLIST(tail) -ASTCMDLIST(tail) -BINCMDLIST(tee) ASTCMDLIST(tee) -BINCMDLIST(tty) +BINCMDLIST(tee) +GNUCMDLIST(tee) ASTCMDLIST(tty) +BINCMDLIST(tty) +GNUCMDLIST(tty) ASTCMDLIST(uname) -BINCMDLIST(uniq) ASTCMDLIST(uniq) -BINCMDLIST(wc) +BINCMDLIST(uniq) +GNUCMDLIST(uniq) ASTCMDLIST(wc) +BINCMDLIST(wc) +GNUCMDLIST(wc) +// ASTCMDLIST(xgrep) +// BINCMDLIST(xgrep) /* Mandatory for ksh93 test suite and AST scripts */ BINCMDLIST(getconf) @@ -230,8 +262,8 @@ BINCMDLIST(getconf) #ifdef __cplusplus } #endif - #endif /* !_SOLARIS_KSH_CMDLIST_H */ + ENDOFTEXT } @@ -418,7 +450,7 @@ function build_shell "${root}/lib/libshell.a" "${root}/lib/libshell-g.a" \ "${root}/lib/libsum.a" "${root}/lib/libsum-g.a" \ "${root}/lib/libdll.a" "${root}/lib/libdll-g.a" \ - "${root}/lib/libast.a""${root}/lib/libast-g.a" + "${root}/lib/libast.a" "${root}/lib/libast-g.a" if [[ "${buildmode}" == *solaris* ]] ; then ${CC} ${CCFLAGS} ${bsuncc_app_ccflags} -L${root}/lib/ -Bdirect -o ksh pmain.o -lshell -Bstatic -l${link_libcmd} -Bdynamic -lsum -ldll -last -lm -lmd -lsecdb @@ -475,7 +507,7 @@ function test_shell [[ ! -f "${SHELL}" ]] && fatal_error "test_shell: |${SHELL}| is not a file." [[ ! -x "${SHELL}" ]] && fatal_error "test_shell: |${SHELL}| is not executable." - [[ "${TEST_LANG}" == "" ]] && TEST_LANG="C ja_JP.UTF-8" + [[ "${TEST_LANG}" == "" ]] && TEST_LANG="C zh_CN.GB18030 en_US.UTF-8" case "${buildmode}" in testshell.bcheck*) @@ -490,7 +522,7 @@ function test_shell LD_LIBRARY_PATH="$LD_LIBRARY_PATH" \ LD_LIBRARY_PATH_32="$LD_LIBRARY_PATH_32"\ LC_ALL="${lang}" LANG="${lang}" \ - VMDEBUG=a \ + VMALLOC_OPTIONS=abort \ "$i" cat "${bc_logfile}" done @@ -510,7 +542,7 @@ function test_shell LD_LIBRARY_PATH="$LD_LIBRARY_PATH" \ LD_LIBRARY_PATH_32="$LD_LIBRARY_PATH_32" \ LC_ALL="${lang}" LANG="${lang}" \ - VMDEBUG=a \ + VMALLOC_OPTIONS=abort \ SHCOMP=$PWD/arch/*/bin/shcomp \ "$i" done diff --git a/usr/src/lib/libshell/sparc/include/ast/history.h b/usr/src/lib/libshell/sparc/include/ast/history.h index 0159773f4d..1b0f3ce403 100644 --- a/usr/src/lib/libshell/sparc/include/ast/history.h +++ b/usr/src/lib/libshell/sparc/include/ast/history.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparc/include/ast/nval.h b/usr/src/lib/libshell/sparc/include/ast/nval.h index a81d34b84a..f5be4fa865 100644 --- a/usr/src/lib/libshell/sparc/include/ast/nval.h +++ b/usr/src/lib/libshell/sparc/include/ast/nval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparc/include/ast/shell.h b/usr/src/lib/libshell/sparc/include/ast/shell.h index b5d87afc94..a8c1d85c3b 100644 --- a/usr/src/lib/libshell/sparc/include/ast/shell.h +++ b/usr/src/lib/libshell/sparc/include/ast/shell.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/acct b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/acct index 65af6a1891..0521a3c2c0 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/acct +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/acct @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_acct_ksh93 #define _def_acct_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_acct 1 /* acct() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/cmds b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/cmds index ffa3d489d6..a68e07ab37 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/cmds +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/cmds @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/cmds by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/cmds by iffe version 2009-12-04 : : */ #ifndef _def_cmds_ksh93 #define _def_cmds_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _cmd_newgrp 1 /* newgrp in ?(/usr)/(bin|etc|ucb) */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/dynamic b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/dynamic index 9526abebf8..a74c7841a8 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/dynamic +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/dynamic @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/dynamic by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/dynamic by iffe version 2009-12-04 : : */ #ifndef _def_dynamic_ksh93 #define _def_dynamic_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #if SHOPT_DYNAMIC diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/execargs b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/execargs index 65fceba92f..5a14cde36f 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/execargs +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/execargs @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_execargs_ksh93 #define _def_execargs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/externs b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/externs index e6624877ca..227e9c3448 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/externs +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/externs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/externs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/externs by iffe version 2009-12-04 : : */ #ifndef _def_externs_ksh93 #if !defined(__PROTO__) @@ -63,10 +63,10 @@ #define _def_externs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_exec_attr 1 /* #include <exec_attr.h> ok */ @@ -75,10 +75,12 @@ #define _lib_setreuid 1 /* setreuid() in default lib(s) */ #define _lib_setregid 1 /* setregid() in default lib(s) */ #define _lib_nice 1 /* nice() in default lib(s) */ -#define _lib_sigflag 1 /* sigflag() in default lib(s) */ #define _lib_fork 1 /* fork() in default lib(s) */ #define _lib_spawnveg 1 /* spawnveg() in default lib(s) */ #define _lib_fchdir 1 /* fchdir() in default lib(s) */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memcntl 1 /* memcntl() in default lib(s) */ +#define _LIB_secdb 1 /* -lsecdb is a library */ +#define _lib_getexecuser 1 /* getexecuser() in default lib(s) */ +#define _lib_free_execattr 1 /* free_execattr() in default lib(s) */ #endif diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/locale b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/locale index 4923ce9038..d72fc310ef 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/locale +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/locale @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/locale by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/locale by iffe version 2009-12-04 : : */ #ifndef _def_locale_ksh93 #define _def_locale_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_locale 1 /* #include <locale.h> ok */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/math b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/math index 535a82b7ed..5472de8ac6 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/math +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/math @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/math.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/math.sh by iffe version 2009-12-04 : : */ #ifndef _def_math_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,15 +62,15 @@ #define _def_math_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ -/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/data/math.tab : : */ +/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/data/math.tab : : */ typedef Sfdouble_t (*Math_f) __PROTO__((Sfdouble_t,...)); diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/options b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/options index c2003e67fe..8bace0bf6b 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/options +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/options @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/options by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/options by iffe version 2009-12-04 : : */ #ifndef _def_options_ksh93 #define _def_options_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define SHELLMAGIC 1 diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/poll b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/poll index 6236914ca7..3cbe11692f 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/poll +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/poll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/poll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/poll by iffe version 2009-12-04 : : */ #ifndef _def_poll_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,10 +62,10 @@ #define _def_poll_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_poll 1 /* #include <poll.h> ok */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/pstat b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/pstat index 404f4fe7e8..b80003c053 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/pstat +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/pstat @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_pstat_ksh93 #define _def_pstat_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/rlimits b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/rlimits index 831b927c6a..c3421ba013 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/rlimits +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/rlimits @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/rlimits by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/rlimits by iffe version 2009-12-04 : : */ #ifndef _def_rlimits_ksh93 #define _def_rlimits_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _sys_resource 1 /* #include <sys/resource.h> ok */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/setjmp b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/setjmp index dfd9d97f4b..0ab47cb0f0 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/setjmp +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/setjmp @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/setjmp by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/setjmp by iffe version 2009-12-04 : : */ #ifndef _def_setjmp_ksh93 #define _def_setjmp_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigsetjmp 1 /* sigsetjmp() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/sigfeatures b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/sigfeatures index 92f6c62e10..0951a434a1 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/sigfeatures +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/sigfeatures @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-12-04 : : */ #ifndef _def_sigfeatures_ksh93 #define _def_sigfeatures_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigrelse 1 /* sigrelse() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/time b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/time index d4710ad9c9..95b62e121b 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/time +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/time @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ksh93 #define _def_time_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_utime 1 /* #include <utime.h> ok */ diff --git a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/ttys b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/ttys index 8be01d4df6..6d2b6b2203 100644 --- a/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/ttys +++ b/usr/src/lib/libshell/sparc/src/cmd/ksh93/FEATURE/ttys @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/cmd/ksh93/features/ttys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/cmd/ksh93/features/ttys by iffe version 2009-12-04 : : */ #ifndef _def_ttys_ksh93 #define _def_ttys_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_termios 1 /* #include <termios.h> ok */ diff --git a/usr/src/lib/libshell/sparcv9/include/ast/history.h b/usr/src/lib/libshell/sparcv9/include/ast/history.h index 0159773f4d..1b0f3ce403 100644 --- a/usr/src/lib/libshell/sparcv9/include/ast/history.h +++ b/usr/src/lib/libshell/sparcv9/include/ast/history.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparcv9/include/ast/nval.h b/usr/src/lib/libshell/sparcv9/include/ast/nval.h index a81d34b84a..f5be4fa865 100644 --- a/usr/src/lib/libshell/sparcv9/include/ast/nval.h +++ b/usr/src/lib/libshell/sparcv9/include/ast/nval.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparcv9/include/ast/shell.h b/usr/src/lib/libshell/sparcv9/include/ast/shell.h index b5d87afc94..a8c1d85c3b 100644 --- a/usr/src/lib/libshell/sparcv9/include/ast/shell.h +++ b/usr/src/lib/libshell/sparcv9/include/ast/shell.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1982-2009 AT&T Intellectual Property * +* Copyright (c) 1982-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/acct b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/acct index ce3ad037f2..41a73df04b 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/acct +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/acct @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_acct_ksh93 #define _def_acct_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_acct 1 /* acct() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/cmds b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/cmds index 2647861d28..1b049f5eb2 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/cmds +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/cmds @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/cmds by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/cmds by iffe version 2009-12-04 : : */ #ifndef _def_cmds_ksh93 #define _def_cmds_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _cmd_newgrp 1 /* newgrp in ?(/usr)/(bin|etc|ucb) */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/dynamic b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/dynamic index 91d80eb432..e58ac233c1 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/dynamic +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/dynamic @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/dynamic by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/dynamic by iffe version 2009-12-04 : : */ #ifndef _def_dynamic_ksh93 #define _def_dynamic_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #if SHOPT_DYNAMIC diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/execargs b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/execargs index a39c9dd160..bbb4e0ab1e 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/execargs +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/execargs @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_execargs_ksh93 #define _def_execargs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/externs b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/externs index 488cbd07d5..18685dcd89 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/externs +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/externs @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/externs by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/externs by iffe version 2009-12-04 : : */ #ifndef _def_externs_ksh93 #if !defined(__PROTO__) @@ -63,10 +63,10 @@ #define _def_externs_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_exec_attr 1 /* #include <exec_attr.h> ok */ @@ -75,10 +75,12 @@ #define _lib_setreuid 1 /* setreuid() in default lib(s) */ #define _lib_setregid 1 /* setregid() in default lib(s) */ #define _lib_nice 1 /* nice() in default lib(s) */ -#define _lib_sigflag 1 /* sigflag() in default lib(s) */ #define _lib_fork 1 /* fork() in default lib(s) */ #define _lib_spawnveg 1 /* spawnveg() in default lib(s) */ #define _lib_fchdir 1 /* fchdir() in default lib(s) */ #define _sys_mman 1 /* #include <sys/mman.h> ok */ #define _lib_memcntl 1 /* memcntl() in default lib(s) */ +#define _LIB_secdb 1 /* -lsecdb is a library */ +#define _lib_getexecuser 1 /* getexecuser() in default lib(s) */ +#define _lib_free_execattr 1 /* free_execattr() in default lib(s) */ #endif diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/locale b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/locale index e1f9d582b7..c316c2772f 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/locale +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/locale @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/locale by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/locale by iffe version 2009-12-04 : : */ #ifndef _def_locale_ksh93 #define _def_locale_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_locale 1 /* #include <locale.h> ok */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/math b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/math index 63e5c2c6cd..79b497ce1f 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/math +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/math @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/math.sh by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/math.sh by iffe version 2009-12-04 : : */ #ifndef _def_math_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,15 +62,15 @@ #define _def_math_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ -/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/data/math.tab : : */ +/* : : generated by iffe from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/data/math.tab : : */ typedef Sfdouble_t (*Math_f) __PROTO__((Sfdouble_t,...)); diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/options b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/options index 42ecfb7698..f794aeade3 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/options +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/options @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/options by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/options by iffe version 2009-12-04 : : */ #ifndef _def_options_ksh93 #define _def_options_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define SHELLMAGIC 1 diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/poll b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/poll index da2b1e278c..86bb35630a 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/poll +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/poll @@ -1,6 +1,6 @@ /* : : generated by proto : : */ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/poll by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/poll by iffe version 2009-12-04 : : */ #ifndef _def_poll_ksh93 #if !defined(__PROTO__) # if defined(__STDC__) || defined(__cplusplus) || defined(_proto) || defined(c_plusplus) @@ -62,10 +62,10 @@ #define _def_poll_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_poll 1 /* #include <poll.h> ok */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/pstat b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/pstat index fef0d8f8e0..d5872dfca9 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/pstat +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/pstat @@ -1,11 +1,11 @@ -/* : : generated by iffe version 2009-10-06 : : */ +/* : : generated by iffe version 2009-12-04 : : */ #ifndef _def_pstat_ksh93 #define _def_pstat_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #endif diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/rlimits b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/rlimits index 1eeed91657..3fd7e9715a 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/rlimits +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/rlimits @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/rlimits by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/rlimits by iffe version 2009-12-04 : : */ #ifndef _def_rlimits_ksh93 #define _def_rlimits_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _sys_resource 1 /* #include <sys/resource.h> ok */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/setjmp b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/setjmp index 155c6dd853..b1b967ccb9 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/setjmp +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/setjmp @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/setjmp by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/setjmp by iffe version 2009-12-04 : : */ #ifndef _def_setjmp_ksh93 #define _def_setjmp_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigsetjmp 1 /* sigsetjmp() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/sigfeatures b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/sigfeatures index 414feeccf7..23d83928ae 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/sigfeatures +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/sigfeatures @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/sigfeatures by iffe version 2009-12-04 : : */ #ifndef _def_sigfeatures_ksh93 #define _def_sigfeatures_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _lib_sigrelse 1 /* sigrelse() in default lib(s) */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/time b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/time index e70e599608..94e0aff156 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/time +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/time @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/time by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/time by iffe version 2009-12-04 : : */ #ifndef _def_time_ksh93 #define _def_time_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_utime 1 /* #include <utime.h> ok */ diff --git a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/ttys b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/ttys index 22b580c8ac..a5da4d7141 100644 --- a/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/ttys +++ b/usr/src/lib/libshell/sparcv9/src/cmd/ksh93/FEATURE/ttys @@ -1,11 +1,11 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/cmd/ksh93/features/ttys by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/cmd/ksh93/features/ttys by iffe version 2009-12-04 : : */ #ifndef _def_ttys_ksh93 #define _def_ttys_ksh93 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_dll 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libdll.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ -#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ +#define _LIB_cmd 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libcmd.a is a library */ #define _LIB_md 1 /* -lmd is a library */ #define _LIB_nsl 1 /* -lnsl is a library */ #define _hdr_termios 1 /* #include <termios.h> ok */ diff --git a/usr/src/lib/libsum/amd64/include/ast/sum.h b/usr/src/lib/libsum/amd64/include/ast/sum.h index f01e359848..f82fee47d6 100644 --- a/usr/src/lib/libsum/amd64/include/ast/sum.h +++ b/usr/src/lib/libsum/amd64/include/ast/sum.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/amd64/src/lib/libsum/FEATURE/sum b/usr/src/lib/libsum/amd64/src/lib/libsum/FEATURE/sum index 9943b0a216..15ef9799e1 100644 --- a/usr/src/lib/libsum/amd64/src/lib/libsum/FEATURE/sum +++ b/usr/src/lib/libsum/amd64/src/lib/libsum/FEATURE/sum @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/src/lib/libsum/features/sum by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/src/lib/libsum/features/sum by iffe version 2009-12-04 : : */ #ifndef _def_sum_sum #define _def_sum_sum 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_64bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_md4 1 /* #include <md4.h> ok */ #define _LIB_md 1 /* -lmd is a library */ diff --git a/usr/src/lib/libsum/common/sum-ast4.c b/usr/src/lib/libsum/common/sum-ast4.c index da33b92dbe..1285b765de 100644 --- a/usr/src/lib/libsum/common/sum-ast4.c +++ b/usr/src/lib/libsum/common/sum-ast4.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-att.c b/usr/src/lib/libsum/common/sum-att.c index 27b66c7aa3..1dc2ec6214 100644 --- a/usr/src/lib/libsum/common/sum-att.c +++ b/usr/src/lib/libsum/common/sum-att.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-bsd.c b/usr/src/lib/libsum/common/sum-bsd.c index 30c2580c9d..9980e8b07e 100644 --- a/usr/src/lib/libsum/common/sum-bsd.c +++ b/usr/src/lib/libsum/common/sum-bsd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-crc.c b/usr/src/lib/libsum/common/sum-crc.c index 7c3e170362..f105338b94 100644 --- a/usr/src/lib/libsum/common/sum-crc.c +++ b/usr/src/lib/libsum/common/sum-crc.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-lmd.c b/usr/src/lib/libsum/common/sum-lmd.c index 220d8f6260..22dff3d9bd 100644 --- a/usr/src/lib/libsum/common/sum-lmd.c +++ b/usr/src/lib/libsum/common/sum-lmd.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-md5.c b/usr/src/lib/libsum/common/sum-md5.c index 2852363ba9..ffe49bdc3b 100644 --- a/usr/src/lib/libsum/common/sum-md5.c +++ b/usr/src/lib/libsum/common/sum-md5.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-prng.c b/usr/src/lib/libsum/common/sum-prng.c index 17077278fb..71ec34f25e 100644 --- a/usr/src/lib/libsum/common/sum-prng.c +++ b/usr/src/lib/libsum/common/sum-prng.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-sha1.c b/usr/src/lib/libsum/common/sum-sha1.c index 5d53513f0a..732bfd3d0c 100644 --- a/usr/src/lib/libsum/common/sum-sha1.c +++ b/usr/src/lib/libsum/common/sum-sha1.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum-sha2.c b/usr/src/lib/libsum/common/sum-sha2.c index f87131433a..d42674eba1 100644 --- a/usr/src/lib/libsum/common/sum-sha2.c +++ b/usr/src/lib/libsum/common/sum-sha2.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sum.h b/usr/src/lib/libsum/common/sum.h index 7f66cfb46c..254130e108 100644 --- a/usr/src/lib/libsum/common/sum.h +++ b/usr/src/lib/libsum/common/sum.h @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/common/sumlib.c b/usr/src/lib/libsum/common/sumlib.c index 713ec33566..cbffca92fa 100644 --- a/usr/src/lib/libsum/common/sumlib.c +++ b/usr/src/lib/libsum/common/sumlib.c @@ -1,7 +1,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * @@ -274,7 +274,6 @@ Sum_t* sumopen(register const char* name) { register int n; - char pat[256]; if (!name || !name[0] || name[0] == '-' && !name[1]) name = "default"; diff --git a/usr/src/lib/libsum/i386/include/ast/sum.h b/usr/src/lib/libsum/i386/include/ast/sum.h index f01e359848..f82fee47d6 100644 --- a/usr/src/lib/libsum/i386/include/ast/sum.h +++ b/usr/src/lib/libsum/i386/include/ast/sum.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/i386/src/lib/libsum/FEATURE/sum b/usr/src/lib/libsum/i386/src/lib/libsum/FEATURE/sum index 1891207505..f106d43c71 100644 --- a/usr/src/lib/libsum/i386/src/lib/libsum/FEATURE/sum +++ b/usr/src/lib/libsum/i386/src/lib/libsum/FEATURE/sum @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/src/lib/libsum/features/sum by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/src/lib/libsum/features/sum by iffe version 2009-12-04 : : */ #ifndef _def_sum_sum #define _def_sum_sum 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_i386_32bit/arch/sol11.i386/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_md4 1 /* #include <md4.h> ok */ #define _LIB_md 1 /* -lmd is a library */ diff --git a/usr/src/lib/libsum/sparc/include/ast/sum.h b/usr/src/lib/libsum/sparc/include/ast/sum.h index f01e359848..f82fee47d6 100644 --- a/usr/src/lib/libsum/sparc/include/ast/sum.h +++ b/usr/src/lib/libsum/sparc/include/ast/sum.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/sparc/src/lib/libsum/FEATURE/sum b/usr/src/lib/libsum/sparc/src/lib/libsum/FEATURE/sum index ce5643c7c3..c21ba3916a 100644 --- a/usr/src/lib/libsum/sparc/src/lib/libsum/FEATURE/sum +++ b/usr/src/lib/libsum/sparc/src/lib/libsum/FEATURE/sum @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/src/lib/libsum/features/sum by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/src/lib/libsum/features/sum by iffe version 2009-12-04 : : */ #ifndef _def_sum_sum #define _def_sum_sum 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_32bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_md4 1 /* #include <md4.h> ok */ #define _LIB_md 1 /* -lmd is a library */ diff --git a/usr/src/lib/libsum/sparcv9/include/ast/sum.h b/usr/src/lib/libsum/sparcv9/include/ast/sum.h index f01e359848..f82fee47d6 100644 --- a/usr/src/lib/libsum/sparcv9/include/ast/sum.h +++ b/usr/src/lib/libsum/sparcv9/include/ast/sum.h @@ -3,7 +3,7 @@ /*********************************************************************** * * * This software is part of the ast package * -* Copyright (c) 1996-2009 AT&T Intellectual Property * +* Copyright (c) 1996-2010 AT&T Intellectual Property * * and is licensed under the * * Common Public License, Version 1.0 * * by AT&T Intellectual Property * diff --git a/usr/src/lib/libsum/sparcv9/src/lib/libsum/FEATURE/sum b/usr/src/lib/libsum/sparcv9/src/lib/libsum/FEATURE/sum index 35620c8993..6347c2a327 100644 --- a/usr/src/lib/libsum/sparcv9/src/lib/libsum/FEATURE/sum +++ b/usr/src/lib/libsum/sparcv9/src/lib/libsum/FEATURE/sum @@ -1,8 +1,8 @@ -/* : : generated from /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/src/lib/libsum/features/sum by iffe version 2009-10-06 : : */ +/* : : generated from /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/src/lib/libsum/features/sum by iffe version 2009-12-04 : : */ #ifndef _def_sum_sum #define _def_sum_sum 1 #define _sys_types 1 /* #include <sys/types.h> ok */ -#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20091014/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ +#define _LIB_ast 1 /* /home/gisburn/ksh93/ast_ksh_20100309/build_sparc_64bit/arch/sol11.sun4/lib/libast.a is a library */ #define _LIB_m 1 /* -lm is a library */ #define _hdr_md4 1 /* #include <md4.h> ok */ #define _LIB_md 1 /* -lmd is a library */ diff --git a/usr/src/pkg/manifests/source-demo-system.mf b/usr/src/pkg/manifests/source-demo-system.mf index 3cfbee4e05..55a7709e38 100644 --- a/usr/src/pkg/manifests/source-demo-system.mf +++ b/usr/src/pkg/manifests/source-demo-system.mf @@ -20,8 +20,7 @@ # # -# Copyright 2010 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. +# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # set name=pkg.fmri value=pkg:/source/demo/system@$(PKGVERS) @@ -153,6 +152,7 @@ file path=usr/demo/ksh/tests/sun_solaris_builtin_sum.sh file path=usr/demo/ksh/tests/sun_solaris_builtin_tail.sh file path=usr/demo/ksh/tests/sun_solaris_command_substitution.sh file path=usr/demo/ksh/tests/sun_solaris_compound_nameref.sh +file path=usr/demo/ksh/tests/sun_solaris_compound_misc.sh file path=usr/demo/ksh/tests/sun_solaris_compoundvario.sh file \ path=usr/demo/ksh/tests/sun_solaris_cr_6687139_command_substitution_exec_redirection_allocation_loop.sh @@ -188,7 +188,19 @@ file \ path=usr/demo/ksh/tests/sun_solaris_cr_6862121_shbinexec_kernel_module_defunct.sh file \ path=usr/demo/ksh/tests/sun_solaris_cr_6881017_background_process_in_subshell_hangs_caller.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6887363_shell_sometimes_mishandles_return_value_of_its_child_process.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6904557_wc_no_longer_counts_number_of_bytes_correctly.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6904575_cut_-d_with_multibyte_character_no_longer_works.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6904878_join_-t_no_longer_works_with_multibyte_char_separator.sh +file \ + path=usr/demo/ksh/tests/sun_solaris_cr_6907460_EXIT_trap_handlers_are_sometimes_executed_twice.sh +file path=usr/demo/ksh/tests/sun_solaris_cr_xxxxxxxx_template.sh file path=usr/demo/ksh/tests/sun_solaris_getconf.sh +file path=usr/demo/ksh/tests/sun_solaris_locale_misc.sh file path=usr/demo/ksh/tests/sun_solaris_local_compound_nameref001.sh file path=usr/demo/ksh/tests/sun_solaris_staticvariables.sh file path=usr/demo/ksh/tests/sun_solaris_vartree001.sh |