Hello community,
here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-01-25 15:01:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ksh (Old)
and /work/SRC/openSUSE:Factory/.ksh.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksh", Maintainer is "werner@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2011-12-27 18:35:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-01-25 15:02:00.000000000 +0100
@@ -1,0 +2,98 @@
+Tue Jan 24 18:42:48 UTC 2012 - werner@suse.de
+
+- Make ex really work that is vim is required for build otherwise
+ libpp API does not work correct
+
+-------------------------------------------------------------------
+Tue Jan 24 16:06:20 UTC 2012 - werner@suse.de
+
+- Make sigexec using a contolling terminal
+
+-------------------------------------------------------------------
+Mon Jan 23 12:53:26 UTC 2012 - werner@suse.de
+
+- Avoid compiler optimizers which may cause asynchrony behaviour
+
+-------------------------------------------------------------------
+Fri Jan 20 14:49:47 UTC 2012 - werner@suse.de
+
+- Update to 2012-01-01 of ksh93u+ which includes some of our patches
+ 12-01-01 A timing problem with >; has been fixed.
+ 12-01-01 A macro expansion memory leak has been fixed.
+ 11-12-26 A bug in array assignments of the form arr=( $arr[i] ...) in which
+ arr was not unset before the assignment has been fixed.
+ 11-12-20 A number of code changes were made based on the results of errors
+ indicated by static code analysis.
+ 11-12-13 In vi edit mode a lteral <TAB> can now be entered by preceding it
+ with a backshash.
+ 11-12-13 When tab is entered for completion after a ' or ", the ' and "
+ characters are no longer deleted.
+ 11-12-07 A bug in which a program in the current direcotry with a . in the
+ name could fail to execute when both PATH and FPATH end with :. has
+ been fixed.
+ 11-12-07 I fixed a bug in which a variable expansion in a large here-document
+ could be expanded to a null string.
+ 11-12-06 An optimization to read was added in the case the the read command
+ was redirected from a file.
+ 11-12-06 Changes were made to make the line limit for read unlimited by
+ default.
+ 11-12-05 A bug in which unsetting an array variable did not completely clear
+ the variable in some cases has been fixed.
+ 11-12-02 +The printf alternative character # when applied to the %q format will
+ quote argument in a form suitable for a field in a .csv format file.
+ 11-12-02 +A -S option was added to read to be able to read .csv format files.
+ 11-11-28 A bug in which redirection of standard error in a function called from
+ command substitution caused standard error to be lost has ben fixed.
+ 11-11-21 [[ (-n foo) ]] no longer requires a space before (.
+ 11-11-11 The readonly attribute for a variable now applies to compound
+ assignments to that variable.
+ 11-11-07 Changes were made to reduce the stack size to allow deeper function
+ recursion.
+ 11-10-10 +Added alternate flag to printf %H for encoding of URI's.
+ 11-10-10 A bug which could lead to a core dump when the shell was invoked
+ with more than twenty five open files has been fixed.
+ 11-10-06 A bug in the scoping of name references in functions called by other
+ functions has been fixed.
+ 11-10-05 A bug in which wait on a pid may return the exit status of an
+ earlier background job with that pid instead has been fixed.
+ 11-09-22 A bug in which a read timed out with TMOUT did not always restore
+ the terminal state has been fixed.
+ 11-09-21 An optimization that allowed the last command in a script to use
+ the same process id as the script has been eliminated.
+ 11-09-21 Added letoctal option that enables the let command to recognize
+ octal constants starting with 0.
+ 11-09-20 A bug in which ${var.} could cause a core dump has been fixed.
+ 11-09-20 A bug with SHOPT_EDPREDICT when neither vi or emacs was enabled for
+ lines beginning with # when in a multibyte locale has been fixed.
+ 11-09-20 A bug in emacs edit mode with SHOPT_EDPREDICT that would cause
+ history searches matching comments lines to generate predictions
+ has been fixed. Only user typed comment lines generate predictions.
+ 11-09-20 A bug in emacs edit mode with a search that matches a comment line
+ that could cause a core dump has been fixed.
+ 11-09-16 A bug in which a command name ending in .. could cause the shell to
+ abort has been fixed.
+ 11-09-16 The characters ! + - % and @ in file names are no longer escaped with
+ file name completion.
+ 11-09-13 The let command no longer treats numbers starting with 0 as octal
+ constants.
+ 11-09-08 A bug in which printf "%R" could cause a core dump for invalid shell
+ patterns has been fixed.
+ 11-08-09 With set -u, ${var#pattern} reported that var was unset for special
+ variables.
+ 11-08-03 A bug in which the shell did not preserve the exit status for a
+ coprocess has been fixed.
+ 11-08-02 A bug in the saving and restoring of IFS in command substitution that
+ cause case a core dump has been fixed.
+ 11-07-21 Modified the 10-08-27 bug fix so that background jobs started in for
+ and while loops created interactively generate completion messages.
+ 11-07-20 I fixed a bug in here documents in which multi-byte characters that
+ crossed buffer boundaries were not processed correctly.
+- Extend workaround for bug in glibc with signbit() macro that is that
+ the inlined part for long doubles does not work on IA64
+- Extend check for __sync_fetch_and_add gcc builtins for uint64_t, uint16_t,
+ and uint8_t to avoid those functions is missed in gcc from older SLES versions
+- Avoid to have to large default mimimum region size at an initial memory mapping
+- Avoid MAP_FIXED on IA-64 and S/390x, use MAP_32BIT
+- Avoid compiler options which increase the risk of memory leaks
+
+-------------------------------------------------------------------
Old:
----
INIT.2011-06-30.tar.bz2
ast-ksh.2011-06-30.tar.bz2
ast-msgcc.2011-06-30.tar.bz2
New:
----
INIT.2012-01-01.tar.bz2
ast-ksh.2012-01-01.tar.bz2
ast-msgcc.2012-01-01.tar.bz2
check-build.sh
ksh93-aso.dif
ksh93-vm.dif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ksh.spec ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:02.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:02.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package ksh
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,9 @@
%if %suse_version > 1120
BuildRequires: update-alternatives
%endif
+# /bin/ex and /bin/ed required for build
+BuildRequires: ed
+BuildRequires: vim
Url: http://www.research.att.com/~gsf/download/
License: CPL-1.0
Group: System/Shells
@@ -40,9 +43,9 @@
Release: 1
Summary: Korn Shell
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source: INIT.2011-06-30.tar.bz2
-Source1: ast-ksh.2011-06-30.tar.bz2
-Source2: ast-msgcc.2011-06-30.tar.bz2
+Source: INIT.2012-01-01.tar.bz2
+Source1: ast-ksh.2012-01-01.tar.bz2
+Source2: ast-msgcc.2012-01-01.tar.bz2
Source3: CPL
Source10: leak1.sh
Source11: leak2.sh
@@ -71,6 +74,8 @@
Patch17: ksh93-heredoc.dif
Patch18: ksh93-jobs.dif
Patch19: ksh93-reg.dif
+Patch20: ksh93-aso.dif
+Patch21: ksh93-vm.dif
Patch42: ksh-locale.patch
%global use_suid_exe 0
%global use_locale 0
@@ -143,30 +148,43 @@
%patch17
%patch18
%patch19
+%patch20
+%patch21
+find -type f -a -name Mamfile | \
+ xargs sed -ri '/exec.*-I-D/{s@(-I)(-D)([^0]*)(0[^[:blank:]]+)@\1\3@}'
%build
- AR="ar"
- CC=gcc
- PATH=${PWD}:$PATH
- LANG=POSIX
- TMPDIR=$(mktemp -d /tmp/ksh-build.XXXXXX) || exit 1
- SUSE_ASNEEDED=0
- export AR CC PATH LANG TMPDIR SUSE_ASNEEDED
+ #
+ # Check for a clean signal environment for runtime tests
#
typeset -i IGNORED=0x$(ps --no-headers -o ignored $$)
- typeset -i SIGPIPE=0x1000
- if ((IGNORED & SIGPIPE)) ; then
- # Warn and show signal state of this working shell
- echo Warning: signal SIGPIPE is ignored by this shell 1>&2
- ps s $$ 1>&2
- echo Warning: try to solve this 1>&2
- ${CC:-gcc} ${RPM_OPT_FLAGS} -o sigexec %{S:42}
+ typeset -i SIGMASK=0x0
+
+ let "SIGMASK|=(1<<($(kill -l PIPE)-1))"
+ let "SIGMASK|=(1<<($(kill -l URG) -1))"
+ let "SIGMASK|=(1<<($(kill -l XFSZ)-1))"
+
+ if ((IGNORED & SIGMASK)) ; then
+ ${CC:-gcc} ${RPM_OPT_FLAGS} -o sigexec %{S:42} -lutil
for fd in /proc/$$/fd/*; do
test -s $fd -a ! -c $fd && break || true
done
set -- $(readlink $fd)
exec -a $SHELL ./sigexec $SHELL ${1+"$@"}
fi
+
+ AR="ar"
+ CC=gcc
+ PATH=${PWD}:$PATH
+ LANG=POSIX
+ TMPDIR=$(mktemp -d /tmp/ksh-build.XXXXXX) || exit 1
+ SUSE_ASNEEDED=0
+ export AR CC PATH LANG TMPDIR SUSE_ASNEEDED
+ #
+ # Remove optimizer which cause runtime leaks in ksh
+ #
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-funwind-tables/}"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-fasynchronous-unwind-tables/}"
nobuiltin=${TMPDIR:-/tmp}/nobuiltin
set -C
(cat<<-EOF
@@ -202,21 +220,20 @@
case "${!var}" in
*${flag}*) return
esac
+ set -o noclobber
case "$flag" in
-Wl,*)
- set -o noclobber
- echo 'int main () { return 0; }' > ldtest.c
- if ${CC:-gcc} -Werror $RPM_OPT_FLAGS $flag -o /dev/null -xc ldtest.c > /dev/null 2>&1 ; then
+ if echo 'int main () { return 0; }' | \
+ ${CC:-gcc} -Werror $flag -o /dev/null -xc - > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
- set +o noclobber
- rm -f ldtest.c
;;
*)
- if ${CC:-gcc} -Werror $RPM_OPT_FLAGS $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
+ if ${CC:-gcc} -Werror $flag -S -o /dev/null -xc /dev/null > /dev/null 2>&1 ; then
eval $var=\${$var:+\$$var\ }$flag
fi
esac
+ set +o noclobber
}
#
# If _you_ are knowing how to fix this in the autogenerated
@@ -255,31 +272,39 @@
LARGEFILE="$(getconf LFS_CFLAGS)"
case "$RPM_ARCH" in
i[3456]86)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O2} -m32"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O2}"
+ cflags -m32 RPM_OPT_FLAGS
HOSTTYPE=linux.i386
;;
x86_64)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O2} -m64"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O2}"
+ cflags -m64 RPM_OPT_FLAGS
HOSTTYPE=linux.i386-64
;;
ia64)
RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
+ cflags -mlp64 RPM_OPT_FLAGS
+ cflags -mno-volatile-asm-stop RPM_OPT_FLAGS
HOSTTYPE=linux.ia64
;;
s390)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O} -m31"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
+ cflags -m31 RPM_OPT_FLAGS
HOSTTYPE=linux.s390
;;
s390*)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O} -m64"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
+ cflags -m64 RPM_OPT_FLAGS
HOSTTYPE=linux.s390-64
;;
ppc|powerpc)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O} -mno-powerpc64"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
+ cflags -mno-powerpc64 RPM_OPT_FLAGS
HOSTTYPE=linux.powerpc
;;
ppc64|powerpc64)
- RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O} -mpowerpc64"
+ RPM_OPT_FLAGS="${RPM_OPT_FLAGS//-O[s0-9]/-O}"
+ cflags -mpowerpc64 RPM_OPT_FLAGS
HOSTTYPE=linux.powerpc64
;;
*)
@@ -294,9 +319,20 @@
cflags -std=gnu99 RPM_OPT_FLAGS
cflags -fPIC RPM_OPT_FLAGS
cflags @$nobuiltin RPM_OPT_FLAGS
+ cflags -fno-unwind-tables RPM_OPT_FLAGS
cflags -fno-strict-aliasing RPM_OPT_FLAGS
cflags -fno-zero-initialized-in-bss RPM_OPT_FLAGS
cflags -fno-delete-null-pointer-checks RPM_OPT_FLAGS
+ cflags -fno-asynchronous-unwind-tables RPM_OPT_FLAGS
+ cflags -fno-unsafe-loop-optimizations RPM_OPT_FLAGS
+ cflags -fno-reorder-blocks-and-partition RPM_OPT_FLAGS
+ cflags -fsigned-bitfields RPM_OPT_FLAGS
+ cflags -fsigned-chars RPM_OPT_FLAGS
+ cflags -fsigned-zeros RPM_OPT_FLAGS
+ case "$(gcc --version | head -n 1)" in
+ *4.3.*) cflags -fno-tree-sink RPM_OPT_FLAGS ;;
+ *4.6.*) cflags -ftree-loop-linear RPM_OPT_FLAGS ;;
+ esac
cflags -g2 RPM_OPT_FLAGS
cflags -pipe RPM_OPT_FLAGS
cflags -Wl,-O2 LDFLAGS
@@ -305,6 +341,7 @@
cflags -Wl,-warn-common LDSOFLG
cflags -Wl,--as-needed LDSOFLG
cflags -Wl,--hash-size=8599 LDSOFLG
+ cflags -Wl,-Bsymbolic-functions LDSOFLG
cflags -Wl,-rpath,/%{_lib}/ast LDSOFLG
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE $LARGEFILE"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS $IGNORE $FEATURE"
@@ -312,6 +349,8 @@
mam_cc_OPTIMIZE=-pipe
export mam_cc_L mam_cc_OPTIMIZE HOSTTYPE LDFLAGS RPM_OPT_FLAGS UNIVERSE
printenv
+ getconf PAGESIZE
+
bin/package make CCFLAGS="$RPM_OPT_FLAGS" HOSTTYPE="$HOSTTYPE" AR="$AR" CC="$CC"
root=$(echo ${PWD}/arch/linux*)
test -d $root || exit 1
@@ -403,14 +442,18 @@
popd
%endif
mkdir -p share/locale/C/LC_MESSAGES
+ includes="-I$(cpp -print-search-dirs | sed -rn 's@^install:[[:blank:]]@@p')include"
+ includes="$includes $(find $root -name FEATURE -printf ' -I%h')"
+ includes="$includes -I/usr/include/linux"
sed -rn "\@mamake -C cmd/ksh93@,\@mamake -C@ {
- s@^\+ g?cc@$SHELL msgcc -M-set=ast@
+ s@^\+ g?cc@$SHELL msgcc -M-set=ast $includes@
s@[[:blank:]]-c[[:blank:]]([^[:blank:]\.]+/([^[:blank:]\.\/]+))\.c@ -c \1\.c -o msgs/\2\.mso@p
}" ${root}/lib/package/gen/make.out > src/cmd/ksh93/doit
pushd src/cmd/ksh93
mkdir msgs
- $SHELL -x ./doit
- $SHELL -x msgcc -o libshell.msg msgs/*.mso
+ ${root}/lib/probe/C/pp/probe $(type -p gcc) > pp_default.h
+ $SHELL ./doit
+ $SHELL msgcc -o libshell.msg msgs/*.mso
rm -rf msgs/
popd
msggen share/locale/C/LC_MESSAGES/libshell src/cmd/ksh93/libshell.msg
@@ -532,6 +575,9 @@
test -e etc/bash.bashrc && ln -sf bash.bashrc etc/ksh.kshrc || true
%if %suse_version > 1120
%{_sbindir}/update-alternatives \
+%if %suse_version > 1210
+ --force \
+%endif
--install /bin/ksh ksh /%{_lib}/ast/bin/ksh 20 \
--slave %{_bindir}/ksh usr-bin-ksh /%{_lib}/ast/bin/ksh \
--slave %{_mandir}/man1/ksh.1.gz ksh.1.gz %{_mandir}/man1/ksh93.1.gz
++++++ INIT.2011-06-30.tar.bz2 -> INIT.2012-01-01.tar.bz2 ++++++
++++ 2222 lines of diff (skipped)
++++++ ast-ksh.2011-06-30.tar.bz2 -> ast-ksh.2012-01-01.tar.bz2 ++++++
++++ 49142 lines of diff (skipped)
++++++ ast-msgcc.2011-06-30.tar.bz2 -> ast-msgcc.2012-01-01.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/Mamfile new/src/cmd/msgcc/Mamfile
--- old/src/cmd/msgcc/Mamfile 2011-03-11 06:14:22.000000000 +0100
+++ new/src/cmd/msgcc/Mamfile 2012-01-04 10:25:04.000000000 +0100
@@ -1,10 +1,10 @@
-info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-02-02
+info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-12-13
setv INSTALLROOT ../../..
setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast
setv PACKAGE_ast_LIB ${INSTALLROOT}/lib
setv PACKAGEROOT ../../../../..
setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS}
-setv ARFLAGS -cr
+setv ARFLAGS rc
setv AS as
setv ASFLAGS
setv CC cc
@@ -54,7 +54,7 @@
exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 197 in
+exec - "") case 201 in
exec - 0) cp msgadmin.sh msgadmin
exec - ;;
exec - *) {
@@ -63,7 +63,7 @@
exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
exec - esac
exec - cat - msgadmin.sh <<'!'
-exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"
+exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
exec - } > msgadmin
exec - ;;
@@ -71,7 +71,7 @@
exec - ;;
exec - *) cat - msgadmin.sh > msgadmin <<'!'
exec - ${mam_cc_SHELLMAGIC}
-exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"
+exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
exec - ;;
exec - esac
@@ -107,6 +107,10 @@
make ${PACKAGE_ast_INCLUDE}/ast_api.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_api.h dontcare
make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit
+make ${PACKAGE_ast_INCLUDE}/aso.h implicit
+prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
+prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
+done ${PACKAGE_ast_INCLUDE}/aso.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit
make ${PACKAGE_ast_INCLUDE}/regex.h implicit
@@ -182,7 +186,7 @@
done msgcpp.c
meta msgcpp.o %.c>%.o msgcpp.c msgcpp
prev msgcpp.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"\" -c msgcpp.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcpp.c
done msgcpp.o generated
bind -lpp
bind -last
@@ -205,7 +209,7 @@
exec - ;;
exec - esac
exec - case '${mam_cc_SHELLMAGIC}' in
-exec - "") case 197 in
+exec - "") case 201 in
exec - 0) cp msgcc.sh msgcc
exec - ;;
exec - *) {
@@ -214,7 +218,7 @@
exec - '#!'*|*'||'*|':'*|'":"'*|"':'"*) echo "$i" ;;
exec - esac
exec - cat - msgcc.sh <<'!'
-exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"
+exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
exec - } > msgcc
exec - ;;
@@ -222,7 +226,7 @@
exec - ;;
exec - *) cat - msgcc.sh > msgcc <<'!'
exec - ${mam_cc_SHELLMAGIC}
-exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"
+exec - USAGE_LICENSE="[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"
exec - !
exec - ;;
exec - esac
@@ -237,7 +241,7 @@
done msgcvt.c
meta msgcvt.o %.c>%.o msgcvt.c msgcvt
prev msgcvt.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"\" -c msgcvt.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgcvt.c
done msgcvt.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msgcvt msgcvt.o ${mam_libast}
done msgcvt generated
@@ -254,7 +258,7 @@
done msggen.c
meta msggen.o %.c>%.o msggen.c msggen
prev msggen.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"\" -c msggen.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msggen.c
done msggen.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msggen msggen.o ${mam_libast}
done msggen generated
@@ -267,7 +271,7 @@
done msgget.c
meta msgget.o %.c>%.o msgget.c msgget
prev msgget.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?msgcc]"\" -c msgget.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 2000-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?msgcc]"\" -c msgget.c
done msgget.o generated
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o msgget msgget.o ${mam_libast}
done msgget generated
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msgadmin.sh new/src/cmd/msgcc/msgadmin.sh
--- old/src/cmd/msgcc/msgadmin.sh 2010-08-24 22:17:12.000000000 +0200
+++ new/src/cmd/msgcc/msgadmin.sh 2010-08-24 22:17:12.000000000 +0200
@@ -1,14 +1,14 @@
########################################################################
# #
# This software is part of the ast package #
-# Copyright (c) 2000-2011 AT&T Intellectual Property #
+# Copyright (c) 2000-2012 AT&T Intellectual Property #
# and is licensed under the #
-# Common Public License, Version 1.0 #
+# Eclipse 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) #
+# http://www.eclipse.org/org/documents/epl-v10.html #
+# (with md5 checksum b35adb5213ca9657e911e9befb180842) #
# #
# Information and Software Systems Research #
# AT&T Research #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msgcc.sh new/src/cmd/msgcc/msgcc.sh
--- old/src/cmd/msgcc/msgcc.sh 2010-10-20 20:50:53.000000000 +0200
+++ new/src/cmd/msgcc/msgcc.sh 2010-10-20 20:50:53.000000000 +0200
@@ -1,14 +1,14 @@
########################################################################
# #
# This software is part of the ast package #
-# Copyright (c) 2000-2011 AT&T Intellectual Property #
+# Copyright (c) 2000-2012 AT&T Intellectual Property #
# and is licensed under the #
-# Common Public License, Version 1.0 #
+# Eclipse 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) #
+# http://www.eclipse.org/org/documents/epl-v10.html #
+# (with md5 checksum b35adb5213ca9657e911e9befb180842) #
# #
# Information and Software Systems Research #
# AT&T Research #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msgcpp.c new/src/cmd/msgcc/msgcpp.c
--- old/src/cmd/msgcc/msgcpp.c 2006-10-13 05:21:50.000000000 +0200
+++ new/src/cmd/msgcc/msgcpp.c 2006-10-13 05:21:50.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 2000-2011 AT&T Intellectual Property *
+* Copyright (c) 2000-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msgcvt.c new/src/cmd/msgcc/msgcvt.c
--- old/src/cmd/msgcc/msgcvt.c 2006-10-13 05:54:18.000000000 +0200
+++ new/src/cmd/msgcc/msgcvt.c 2006-10-13 05:54:18.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 2000-2011 AT&T Intellectual Property *
+* Copyright (c) 2000-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msggen.c new/src/cmd/msgcc/msggen.c
--- old/src/cmd/msgcc/msggen.c 2006-10-13 05:20:06.000000000 +0200
+++ new/src/cmd/msgcc/msggen.c 2006-10-13 05:20:06.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 2000-2011 AT&T Intellectual Property *
+* Copyright (c) 2000-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/cmd/msgcc/msgget.c new/src/cmd/msgcc/msgget.c
--- old/src/cmd/msgcc/msgget.c 2010-06-09 18:01:31.000000000 +0200
+++ new/src/cmd/msgcc/msgget.c 2010-06-09 18:01:31.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 2000-2011 AT&T Intellectual Property *
+* Copyright (c) 2000-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/Mamfile new/src/lib/libpp/Mamfile
--- old/src/lib/libpp/Mamfile 2011-03-11 06:14:30.000000000 +0100
+++ new/src/lib/libpp/Mamfile 2012-01-04 10:25:12.000000000 +0100
@@ -1,10 +1,10 @@
-info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-02-02
+info mam static 00000 1994-07-17 make (AT&T Research) 5.6 2011-12-13
setv INSTALLROOT ../../..
setv PACKAGE_ast_INCLUDE ${INSTALLROOT}/include/ast
setv PACKAGE_ast_LIB ${INSTALLROOT}/lib
setv PACKAGEROOT ../../../../..
setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS}
-setv ARFLAGS -cr
+setv ARFLAGS rc
setv AS as
setv ASFLAGS
setv CC cc
@@ -53,6 +53,13 @@
make ${PACKAGE_ast_INCLUDE}/ast_api.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_api.h dontcare
make ${PACKAGE_ast_INCLUDE}/vmalloc.h implicit
+make ${PACKAGE_ast_INCLUDE}/aso.h implicit
+prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
+make ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
+make ${INSTALLROOT}/include/prototyped.h implicit
+done ${INSTALLROOT}/include/prototyped.h dontcare
+done ${PACKAGE_ast_INCLUDE}/prototyped.h dontcare
+done ${PACKAGE_ast_INCLUDE}/aso.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_std.h implicit
make ${PACKAGE_ast_INCLUDE}/regex.h implicit
@@ -73,10 +80,7 @@
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
done ${PACKAGE_ast_INCLUDE}/ast_wchar.h dontcare
prev ${PACKAGE_ast_INCLUDE}/ast_common.h implicit
-make ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
-make ${INSTALLROOT}/include/prototyped.h implicit
-done ${INSTALLROOT}/include/prototyped.h dontcare
-done ${PACKAGE_ast_INCLUDE}/prototyped.h dontcare
+prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
done ${PACKAGE_ast_INCLUDE}/regex.h dontcare
make ${PACKAGE_ast_INCLUDE}/getopt.h implicit
make ${PACKAGE_ast_INCLUDE}/ast_getopt.h implicit
@@ -117,7 +121,7 @@
meta ppsym.o %.c>%.o ppsym.c ppsym
prev ppsym.c
setv _BLD_pp -U_BLD_pp
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsym.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsym.c
done ppsym.o generated
bind -last
exec - ${CC} ${CCLDFLAGS} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} ${mam_cc_L+-L${INSTALLROOT}/lib} -o ppsym ppsym.o ${mam_libast} ${mam_libast}
@@ -127,8 +131,8 @@
make pp.req
exec - set -
exec - echo 'int main(){return 0;}' > 1.${COTEMP}.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -c 1.${COTEMP}.c &&
-exec - x=`${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l'*' 2>&1 | sed -e 's/[][()+@?]/#/g' || :` &&
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -c 1.${COTEMP}.c &&
+exec - x=`${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l'*' 2>&1 | sed -e 's/[][()+@?]/#/g' || :` &&
exec - {
exec - case "" in
exec - *?) echo " " ;;
@@ -144,8 +148,8 @@
exec - esac
exec - continue
exec - elif test ! -f ${INSTALLROOT}/lib/lib$i.a
-exec - then case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
-exec - *$x*) case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
+exec - then case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
+exec - *$x*) case `{ ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc ${LDFLAGS} -o 1.${COTEMP}.x 1.${COTEMP}.o -l$i 2>&1 || echo '' $x ;} | sed -e 's/[][()+@?]/#/g' || :` in
exec - *$x*) continue ;;
exec - esac
exec - ;;
@@ -237,7 +241,7 @@
done ppargs.c
meta ppargs.o %.c>%.o ppargs.c ppargs
prev ppargs.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 1986-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libpp]"\" -c ppargs.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-copyright?Copyright (c) 1986-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libpp]"\" -c ppargs.c
done ppargs.o generated
make ppbuiltin.o
make ppbuiltin.c
@@ -251,7 +255,7 @@
done ppbuiltin.c
meta ppbuiltin.o %.c>%.o ppbuiltin.c ppbuiltin
prev ppbuiltin.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppbuiltin.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppbuiltin.c
done ppbuiltin.o generated
make ppcall.o
make ppcall.c
@@ -259,7 +263,7 @@
done ppcall.c
meta ppcall.o %.c>%.o ppcall.c ppcall
prev ppcall.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcall.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcall.c
done ppcall.o generated
make ppcomment.o
make ppcomment.c
@@ -267,7 +271,7 @@
done ppcomment.c
meta ppcomment.o %.c>%.o ppcomment.c ppcomment
prev ppcomment.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcomment.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcomment.c
done ppcomment.o generated
make ppcontext.o
make ppcontext.c
@@ -275,7 +279,7 @@
done ppcontext.c
meta ppcontext.o %.c>%.o ppcontext.c ppcontext
prev ppcontext.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontext.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontext.c
done ppcontext.o generated
make ppcontrol.o
make ppcontrol.c
@@ -284,7 +288,7 @@
done ppcontrol.c
meta ppcontrol.o %.c>%.o ppcontrol.c ppcontrol
prev ppcontrol.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontrol.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcontrol.c
done ppcontrol.o generated
make ppcpp.o
make ppcpp.c
@@ -309,7 +313,7 @@
done ppcpp.c
meta ppcpp.o %.c>%.o ppcpp.c ppcpp
prev ppcpp.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcpp.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppcpp.c
done ppcpp.o generated
make ppdata.o
make ppdata.c
@@ -317,7 +321,7 @@
done ppdata.c
meta ppdata.o %.c>%.o ppdata.c ppdata
prev ppdata.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppdata.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppdata.c
done ppdata.o generated
make pperror.o
make pperror.c
@@ -325,7 +329,7 @@
done pperror.c
meta pperror.o %.c>%.o pperror.c pperror
prev pperror.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pperror.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pperror.c
done pperror.o generated
make ppexpr.o
make ppexpr.c
@@ -334,7 +338,7 @@
done ppexpr.c
meta ppexpr.o %.c>%.o ppexpr.c ppexpr
prev ppexpr.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppexpr.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppexpr.c
done ppexpr.o generated
make ppfsm.o
make ppfsm.c
@@ -343,7 +347,7 @@
done ppfsm.c
meta ppfsm.o %.c>%.o ppfsm.c ppfsm
prev ppfsm.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppfsm.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppfsm.c
done ppfsm.o generated
make ppincref.o
make ppincref.c
@@ -351,7 +355,7 @@
done ppincref.c
meta ppincref.o %.c>%.o ppincref.c ppincref
prev ppincref.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppincref.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppincref.c
done ppincref.o generated
make ppinput.o
make ppinput.c
@@ -362,7 +366,7 @@
done ppinput.c
meta ppinput.o %.c>%.o ppinput.c ppinput
prev ppinput.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppinput.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppinput.c
done ppinput.o generated
make ppkey.o
make ppkey.c
@@ -371,13 +375,13 @@
done ppkey.c
meta ppkey.o %.c>%.o ppkey.c ppkey
prev ppkey.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppkey.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppkey.c
done ppkey.o generated
make pplex.o
prev pplex.c
meta pplex.o %.c>%.o pplex.c pplex
prev pplex.c
-exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pplex.c
+exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${CCFLAGS.FORCE}?} ${DEBUG+-DDEBUG=${DEBUG}} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pplex.c
done pplex.o generated
make ppline.o
make ppline.c
@@ -385,7 +389,7 @@
done ppline.c
meta ppline.o %.c>%.o ppline.c ppline
prev ppline.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppline.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppline.c
done ppline.o generated
make ppmacref.o
make ppmacref.c
@@ -393,7 +397,7 @@
done ppmacref.c
meta ppmacref.o %.c>%.o ppmacref.c ppmacref
prev ppmacref.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmacref.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmacref.c
done ppmacref.o generated
make ppmisc.o
make ppmisc.c
@@ -401,7 +405,7 @@
done ppmisc.c
meta ppmisc.o %.c>%.o ppmisc.c ppmisc
prev ppmisc.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmisc.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppmisc.c
done ppmisc.o generated
make ppop.o
make ppop.c
@@ -417,7 +421,7 @@
done ppop.c
meta ppop.o %.c>%.o ppop.c ppop
prev ppop.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppop.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppop.c
done ppop.o generated
make pppragma.o
make pppragma.c
@@ -425,7 +429,7 @@
done pppragma.c
meta pppragma.o %.c>%.o pppragma.c pppragma
prev pppragma.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pppragma.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pppragma.c
done pppragma.o generated
make ppprintf.o
make ppprintf.c
@@ -433,7 +437,7 @@
done ppprintf.c
meta ppprintf.o %.c>%.o ppprintf.c ppprintf
prev ppprintf.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppprintf.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppprintf.c
done ppprintf.o generated
make ppproto.o
make ppproto.c
@@ -449,7 +453,7 @@
done ppproto.c
meta ppproto.o %.c>%.o ppproto.c ppproto
prev ppproto.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppproto.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppproto.c
done ppproto.o generated
make ppsearch.o
make ppsearch.c
@@ -461,7 +465,7 @@
done ppsearch.c
meta ppsearch.o %.c>%.o ppsearch.c ppsearch
prev ppsearch.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsearch.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c ppsearch.c
done ppsearch.o generated
make pptrace.o
make pptrace.c
@@ -565,9 +569,9 @@
done pptrace.c
meta pptrace.o %.c>%.o pptrace.c pptrace
prev pptrace.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pptrace.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -D_PACKAGE_ast -c pptrace.c
done pptrace.o generated
-exec - ${AR} -cr libpp.a ppargs.o ppbuiltin.o ppcall.o ppcomment.o ppcontext.o ppcontrol.o ppcpp.o ppdata.o pperror.o ppexpr.o ppfsm.o ppincref.o ppinput.o ppkey.o pplex.o ppline.o ppmacref.o ppmisc.o ppop.o pppragma.o ppprintf.o ppproto.o ppsearch.o pptrace.o
+exec - ${AR} rc libpp.a ppargs.o ppbuiltin.o ppcall.o ppcomment.o ppcontext.o ppcontrol.o ppcpp.o ppdata.o pperror.o ppexpr.o ppfsm.o ppincref.o ppinput.o ppkey.o pplex.o ppline.o ppmacref.o ppmisc.o ppop.o pppragma.o ppprintf.o ppproto.o ppsearch.o pptrace.o
exec - (ranlib libpp.a) >/dev/null 2>&1 || true
done libpp.a generated
done pp virtual
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/RELEASE new/src/lib/libpp/RELEASE
--- old/src/lib/libpp/RELEASE 2011-03-15 15:05:50.000000000 +0100
+++ new/src/lib/libpp/RELEASE 2011-08-30 08:16:39.000000000 +0200
@@ -1,3 +1,4 @@
+11-08-30 ppproto.c: bump BLOCK to 16*1024 for (ppargs.c self-doc!)
11-03-15 ppop.c: add ppok() readonly check for subset of ppop(PP_*)
11-03-02 ppop.c,ppcontrol.c: use ppset() to handle readonly values
10-09-01 RE errors => exit(2)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/gentab.sh new/src/lib/libpp/gentab.sh
--- old/src/lib/libpp/gentab.sh 2004-08-31 03:31:50.000000000 +0200
+++ new/src/lib/libpp/gentab.sh 2004-08-31 03:31:50.000000000 +0200
@@ -1,14 +1,14 @@
########################################################################
# #
# This software is part of the ast package #
-# Copyright (c) 1986-2011 AT&T Intellectual Property #
+# Copyright (c) 1986-2012 AT&T Intellectual Property #
# and is licensed under the #
-# Common Public License, Version 1.0 #
+# Eclipse 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) #
+# http://www.eclipse.org/org/documents/epl-v10.html #
+# (with md5 checksum b35adb5213ca9657e911e9befb180842) #
# #
# Information and Software Systems Research #
# AT&T Research #
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pp.h new/src/lib/libpp/pp.h
--- old/src/lib/libpp/pp.h 2008-12-08 04:13:24.000000000 +0100
+++ new/src/lib/libpp/pp.h 2008-12-08 04:13:24.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pp.probe new/src/lib/libpp/pp.probe
--- old/src/lib/libpp/pp.probe 2009-02-03 22:21:26.000000000 +0100
+++ new/src/lib/libpp/pp.probe 2011-11-22 16:57:59.000000000 +0100
@@ -2,7 +2,7 @@
# Glenn Fowler
# AT&T Research
#
-# @(#)pp.probe (AT&T Research) 2009-02-02
+# @(#)pp.probe (AT&T Research) 2011-11-11
#
# C probe for libpp
#
@@ -725,6 +725,17 @@
*) break ;;
esac
done
+ case $m in
+ __*_BIT__|__*_DIG__|__*_MIN__|__*_MAX__|__*_TYPE__|*_FLT_*|*_DBL_*|*_LDBL_*)
+ case $nopredef in
+ 0) nopredef=1
+ continue
+ ;;
+ 1) continue
+ ;;
+ esac
+ ;;
+ esac
case $nopredef in
2) ;;
*) case $v in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppargs.c new/src/lib/libpp/ppargs.c
--- old/src/lib/libpp/ppargs.c 2010-06-29 18:20:25.000000000 +0200
+++ new/src/lib/libpp/ppargs.c 2010-06-29 18:20:25.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppbuiltin.c new/src/lib/libpp/ppbuiltin.c
--- old/src/lib/libpp/ppbuiltin.c 2007-02-23 08:23:47.000000000 +0100
+++ new/src/lib/libpp/ppbuiltin.c 2007-02-23 08:23:47.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppcall.c new/src/lib/libpp/ppcall.c
--- old/src/lib/libpp/ppcall.c 2010-09-03 18:59:04.000000000 +0200
+++ new/src/lib/libpp/ppcall.c 2010-09-03 18:59:04.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppcomment.c new/src/lib/libpp/ppcomment.c
--- old/src/lib/libpp/ppcomment.c 1996-01-12 19:39:17.000000000 +0100
+++ new/src/lib/libpp/ppcomment.c 1996-01-12 19:39:17.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppcontext.c new/src/lib/libpp/ppcontext.c
--- old/src/lib/libpp/ppcontext.c 1996-01-12 19:39:17.000000000 +0100
+++ new/src/lib/libpp/ppcontext.c 1996-01-12 19:39:17.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppcontrol.c new/src/lib/libpp/ppcontrol.c
--- old/src/lib/libpp/ppcontrol.c 2011-03-02 23:57:48.000000000 +0100
+++ new/src/lib/libpp/ppcontrol.c 2011-03-02 23:57:48.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppcpp.c new/src/lib/libpp/ppcpp.c
--- old/src/lib/libpp/ppcpp.c 1996-01-12 19:39:18.000000000 +0100
+++ new/src/lib/libpp/ppcpp.c 1996-01-12 19:39:18.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppdata.c new/src/lib/libpp/ppdata.c
--- old/src/lib/libpp/ppdata.c 2011-03-15 14:49:37.000000000 +0100
+++ new/src/lib/libpp/ppdata.c 2011-03-15 14:49:37.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pperror.c new/src/lib/libpp/pperror.c
--- old/src/lib/libpp/pperror.c 1996-01-12 19:39:19.000000000 +0100
+++ new/src/lib/libpp/pperror.c 1996-01-12 19:39:19.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppexpr.c new/src/lib/libpp/ppexpr.c
--- old/src/lib/libpp/ppexpr.c 2010-09-02 18:26:21.000000000 +0200
+++ new/src/lib/libpp/ppexpr.c 2010-09-02 18:26:21.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppfsm.c new/src/lib/libpp/ppfsm.c
--- old/src/lib/libpp/ppfsm.c 2006-05-09 10:18:43.000000000 +0200
+++ new/src/lib/libpp/ppfsm.c 2006-05-09 10:18:43.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppfsm.h new/src/lib/libpp/ppfsm.h
--- old/src/lib/libpp/ppfsm.h 2006-10-04 18:09:59.000000000 +0200
+++ new/src/lib/libpp/ppfsm.h 2006-10-04 18:09:59.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppincref.c new/src/lib/libpp/ppincref.c
--- old/src/lib/libpp/ppincref.c 2000-12-04 13:18:20.000000000 +0100
+++ new/src/lib/libpp/ppincref.c 2000-12-04 13:18:20.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppinput.c new/src/lib/libpp/ppinput.c
--- old/src/lib/libpp/ppinput.c 2006-11-28 21:53:25.000000000 +0100
+++ new/src/lib/libpp/ppinput.c 2006-11-28 21:53:25.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppkey.c new/src/lib/libpp/ppkey.c
--- old/src/lib/libpp/ppkey.c 1997-04-15 13:24:20.000000000 +0200
+++ new/src/lib/libpp/ppkey.c 1997-04-15 13:24:20.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppkey.h new/src/lib/libpp/ppkey.h
--- old/src/lib/libpp/ppkey.h 1999-11-23 22:53:26.000000000 +0100
+++ new/src/lib/libpp/ppkey.h 1999-11-23 22:53:26.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pplex.c new/src/lib/libpp/pplex.c
--- old/src/lib/libpp/pplex.c 2010-06-09 08:50:14.000000000 +0200
+++ new/src/lib/libpp/pplex.c 2010-06-09 08:50:14.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pplib.h new/src/lib/libpp/pplib.h
--- old/src/lib/libpp/pplib.h 2011-03-15 14:31:27.000000000 +0100
+++ new/src/lib/libpp/pplib.h 2011-03-15 14:31:27.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppline.c new/src/lib/libpp/ppline.c
--- old/src/lib/libpp/ppline.c 2004-09-02 08:28:28.000000000 +0200
+++ new/src/lib/libpp/ppline.c 2004-09-02 08:28:28.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppmacref.c new/src/lib/libpp/ppmacref.c
--- old/src/lib/libpp/ppmacref.c 2000-04-12 14:24:51.000000000 +0200
+++ new/src/lib/libpp/ppmacref.c 2000-04-12 14:24:51.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppmisc.c new/src/lib/libpp/ppmisc.c
--- old/src/lib/libpp/ppmisc.c 2004-09-02 08:32:06.000000000 +0200
+++ new/src/lib/libpp/ppmisc.c 2004-09-02 08:32:06.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppop.c new/src/lib/libpp/ppop.c
--- old/src/lib/libpp/ppop.c 2011-03-15 15:05:06.000000000 +0100
+++ new/src/lib/libpp/ppop.c 2011-03-15 15:05:06.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pppragma.c new/src/lib/libpp/pppragma.c
--- old/src/lib/libpp/pppragma.c 2004-09-01 15:02:59.000000000 +0200
+++ new/src/lib/libpp/pppragma.c 2004-09-01 15:02:59.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppprintf.c new/src/lib/libpp/ppprintf.c
--- old/src/lib/libpp/ppprintf.c 2000-09-19 18:16:14.000000000 +0200
+++ new/src/lib/libpp/ppprintf.c 2000-09-19 18:16:14.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppproto.c new/src/lib/libpp/ppproto.c
--- old/src/lib/libpp/ppproto.c 2008-05-12 22:36:26.000000000 +0200
+++ new/src/lib/libpp/ppproto.c 2011-08-30 17:24:51.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
@@ -29,7 +29,7 @@
* PROTOMAIN is coded for minimal library support
*/
-static const char id[] = "\n@(#)$Id: proto (AT&T Research) 2008-05-11 $\0\n";
+static const char id[] = "\n@(#)$Id: proto (AT&T Research) 2011-08-30 $\0\n";
#if PROTOMAIN
@@ -53,7 +53,7 @@
#define MAGICDIR "pragma" /* proto magic directive */
#define MAGICARG "prototyped" /* proto magic directive arg */
#define MAGICOFF "noticed" /* no notice if found in pragma */
-#define MAGICTOP 64 /* must be in these top lines */
+#define MAGICTOP 80 /* must be in these top lines */
#define NOTICED "Copyright" /* no notice if found in magic */
#define PUBLICDOMAIN "Public Domain" /* no notice if found in magic */
@@ -168,7 +168,7 @@
#ifndef CHUNK
#define CHUNK 1024
#endif
-#define BLOCK (8*CHUNK)
+#define BLOCK (16*CHUNK)
#define T_VA_START (N_TOKEN+1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppsearch.c new/src/lib/libpp/ppsearch.c
--- old/src/lib/libpp/ppsearch.c 2010-06-17 07:47:36.000000000 +0200
+++ new/src/lib/libpp/ppsearch.c 2010-06-17 07:47:36.000000000 +0200
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/ppsym.c new/src/lib/libpp/ppsym.c
--- old/src/lib/libpp/ppsym.c 1999-11-23 22:51:44.000000000 +0100
+++ new/src/lib/libpp/ppsym.c 1999-11-23 22:51:44.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/src/lib/libpp/pptrace.c new/src/lib/libpp/pptrace.c
--- old/src/lib/libpp/pptrace.c 1999-11-23 22:51:44.000000000 +0100
+++ new/src/lib/libpp/pptrace.c 1999-11-23 22:51:44.000000000 +0100
@@ -1,14 +1,14 @@
/***********************************************************************
* *
* This software is part of the ast package *
-* Copyright (c) 1986-2011 AT&T Intellectual Property *
+* Copyright (c) 1986-2012 AT&T Intellectual Property *
* and is licensed under the *
-* Common Public License, Version 1.0 *
+* Eclipse 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) *
+* http://www.eclipse.org/org/documents/epl-v10.html *
+* (with md5 checksum b35adb5213ca9657e911e9befb180842) *
* *
* Information and Software Systems Research *
* AT&T Research *
++++++ check-build.sh ++++++
#!/bin/bash
test $(ulimit -l) -lt 64 && exit 1
test $(ulimit -s) -lt 8192 && exit 1
if test $(getconf LONG_BIT) -le 32 ; then
test $(ulimit -m) -lt 6852272 && exit 1
test $(ulimit -v) -lt 5010688 && exit 1
else
test $(ulimit -m) -lt 10471232 && exit 1
test $(ulimit -v) -lt 6683794 && exit 1
fi
exit 0
++++++ ksh93-aso.dif ++++++
--- src/lib/libast/features/aso
+++ src/lib/libast/features/aso 2012-01-18 11:31:07.856479000 +0000
@@ -1,12 +1,17 @@
# ast atomic scalar operations feature tests
if aso note{ gcc 4.1+ memory atomic operations model }end link{
+ #include
int main()
{
- unsigned int i = 0;
- return __sync_fetch_and_add(&i,7);
+ uint8_t i = 0;
+ uint16_t j = 0;
+ uint32_t l = 0;
+ uint64_t m = 0;
+ return __sync_fetch_and_add(&i,7)+__sync_fetch_and_add(&j,7)+__sync_fetch_and_add(&l,7)+__sync_fetch_and_add(&m,7);
}
}end && {
+ #include
#define _aso_cas8(p,o,n) __sync_val_compare_and_swap(p,o,n)
#define _aso_inc8(p) __sync_fetch_and_add(p,1)
#define _aso_dec8(p) __sync_fetch_and_sub(p,1)
@@ -26,6 +31,7 @@ if aso note{ gcc 4.1+ memory atomic oper
#endif
}
elif aso note{ atomic_cas_64 }end link{
+ #include
#include
int main()
{
@@ -34,6 +40,7 @@ elif aso note{ atomic_cas_64
return atomic_cas_64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
#define _aso_inc8(p) atomic_add_8_nv(p,1)
@@ -54,6 +61,7 @@ elif aso note{ atomic_cas_64
#endif
}
elif aso note{ atomic_cas_32 }end link{
+ #include
#include
int main()
{
@@ -61,6 +69,7 @@ elif aso note{ atomic_cas_32
return atomic_cas_32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
#define _aso_inc8(p) atomic_add_8_nv(p,1)
@@ -74,6 +83,7 @@ elif aso note{ atomic_cas_32
#define _aso_casptr(p,o,n) ((void*)atomic_cas_32((uint32_t*)p,(uint32_t)o,(uint32_t)n))
}
elif aso -latomic note{ atomic_cas_64 with -latomic }end link{
+ #include
#include
int main()
{
@@ -82,6 +92,7 @@ elif aso -latomic note{ atomi
return atomic_cas_64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
}
}end && {
+ #include
#include
#define _REQ_atomic
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
@@ -103,6 +114,7 @@ elif aso -latomic note{ atomi
#endif
}
elif aso note{ atomic_cas_32 with -latomic }end link{
+ #include
#include
int main()
{
@@ -110,6 +122,7 @@ elif aso note{ atomic_cas_32
return atomic_cas_32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
}
}end && {
+ #include
#include
#define _REQ_atomic
#define _aso_cas8(p,o,n) atomic_cas_8(p,o,n)
@@ -124,6 +137,7 @@ elif aso note{ atomic_cas_32
#define _aso_casptr(p,o,n) ((void*)atomic_cas_32((uint32_t*)p,(uint32_t)o,(uint32_t)n))
}
elif aso note{ cas64 }end link{
+ #include
#include
int main()
{
@@ -132,6 +146,7 @@ elif aso note{ cas64 }end lin
return cas64(&i, 0, 1) != 0 || atomic_add_32_nv(&j, 1) != 1;
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) cas8(p,o,n)
#define _aso_inc8(p) atomic_add_8_nv(p,1)
@@ -152,6 +167,7 @@ elif aso note{ cas64 }end lin
#endif
}
elif aso note{ cas32 }end link{
+ #include
#include
int main()
{
@@ -159,6 +175,7 @@ elif aso note{ cas32 }end lin
return cas32(&i, 0, 1) != 0 || atomic_add_32_nv(&i, 1) != 1;
}
}end && {
+ #include
#include
#define _aso_cas8(p,o,n) cas8(p,o,n)
#define _aso_inc8(p) atomic_add_8_nv(p,1)
++++++ ksh93-heredoc.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,81 +1,24 @@
-|Subject: here doc bug with locales
---- src/cmd/ksh93/include/fcin.h Tue Aug 3 11:43:29 2010
-+++ src/cmd/ksh93/include/fcin.h Wed Jul 20 14:52:54 2011
-@@ -35,6 +35,8 @@
- #define fcpeek(n) ((int)_Fcin.fcptr[n])
- #define fcseek(n) ((char*)(_Fcin.fcptr+=(n)))
- #define fcfirst() ((char*)_Fcin.fcbuff)
-+#define fclast() ((char*)_Fcin.fclast)
-+#define fcleft() (_Fcin.fclast-_Fcin.fcptr)
- #define fcsopen(s) (_Fcin._fcfile=(Sfio_t*)0,_Fcin.fclen=1,_Fcin.fcbuff=_Fcin.fcptr=(unsigned char*)(s))
- #define fctell() (_Fcin.fcoff + (_Fcin.fcptr-_Fcin.fcbuff))
- #define fcsave(x) (*(x) = _Fcin)
---- src/cmd/ksh93/sh/lex.c Wed Apr 6 12:05:19 2011
-+++ src/cmd/ksh93/sh/lex.c Wed Jul 20 14:59:04 2011
-@@ -1564,7 +1564,10 @@ static int comsub(register Lex_t *lp, in
+--- src/cmd/ksh93/sh/lex.c
++++ src/cmd/ksh93/sh/lex.c 2012-01-16 16:09:37.624771155 +0100
+@@ -1563,8 +1563,10 @@ static int comsub(register Lex_t *lp, in
+ if(endtok==LPAREN && lp->lexd.paren)
{
- if(first==lp->lexd.first)
-- fcseek(cp+1-fcseek(0));
-+ {
-+ const char *tp = fcseek(0);
+- if(first==lp->lexd.first)
+- fcseek(cp+1-(char*)fcseek(0));
++ if(first==lp->lexd.first) {
++ const char *tp = (const char*)fcseek(0);
+ fcseek(cp+1-tp);
+ }
count++;
lp->lexd.paren = 0;
fcgetc(c);
-@@ -1817,18 +1820,41 @@ static int here_copy(Lex_t *lp,register
- if(n!=S_NL)
- {
- /* skip over regular characters */
-+#if SHOPT_MULTIBYTE
-+ do
-+ {
-+ if(fcleft()< MB_LEN_MAX && mbsize(fcseek(0))<0)
-+ {
-+ n = S_EOF;
-+ LEN = -fcleft();
-+ break;
-+ }
-+ }
-+#endif /* SHOPT_MULTIBYTE */
- while((n=STATE(state,c))==0);
- }
- if(n==S_EOF || !(c=fcget()))
- {
-- if(!lp->lexd.dolparen && (c=(fcseek(0)-1)-bufp))
-+ if(LEN < 0)
-+ c = fclast()-bufp;
-+ else
-+ c= (fcseek(0)-1)-bufp;
-+ if(!lp->lexd.dolparen && c)
- {
- if(n==S_ESC)
- c--;
- if(!lp->lexd.dolparen && (c=sfwrite(sp,bufp,c))>0)
- iop->iosize += c;
- }
-- if((c=lexfill(lp))<=0)
-+ if(LEN < 0)
-+ {
-+ n = LEN;
-+ c = fcmbget(&LEN);
-+ LEN += n;
-+ }
-+ else
-+ c = lexfill(lp);
-+ if(c<0)
- break;
- if(n==S_ESC)
- {
-@@ -1844,7 +1870,9 @@ static int here_copy(Lex_t *lp,register
+@@ -1872,6 +1874,8 @@ static int here_copy(Lex_t *lp,register
sfputc(sp,'\\');
}
}
-- bufp = fcseek(-1);
+ if (LEN < 1)
+ LEN = 1;
-+ bufp = fcseek(-LEN);
+ bufp = fcseek(-LEN);
}
else
- fcseek(-LEN);
++++++ ksh93-ia64.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,17 +1,40 @@
--- src/lib/libast/sfio/sfcvt.c
+++ src/lib/libast/sfio/sfcvt.c 2008-12-17 11:56:17.000000000 +0000
-@@ -56,6 +56,14 @@ static char *Zero = "0";
+@@ -56,6 +56,16 @@ static char *Zero = "0";
#define _lib_signbit 1
#endif
+#if defined(__ia64__) && defined(signbit)
+# if defined __GNUC__ && __GNUC__ >= 4
-+# define __signbitl(f) __builtin_signbitl(f)
-+# elif _lib_copysignl
-+# define __signbitl(f) (int)(copysignl(1.0,(f))<0.0)
++# define __signbitl(f) __builtin_signbitl(f)
++# else
++# if _lib_copysignl
++# define __signbitl(f) (int)(copysignl(1.0,(f))<0.0)
++# endif
+# endif
+#endif
+
#if ! _lib_signbit
#if ! _ast_fltmax_double
static int neg0ld(Sfdouble_t f)
+--- src/cmd/ksh93/features/math.sh
++++ src/cmd/ksh93/features/math.sh 2012-01-20 14:23:37.587145847 +0000
+@@ -130,6 +130,18 @@ echo "#include "
+ case $_hdr_ieeefp in
+ 1) echo "#include " ;;
+ esac
++cat <= 4
++# define __signbitl(f) __builtin_signbitl(f)
++# else
++# include
++# if _lib_copysignl
++# define __signbitl(f) (int)(copysignl(1.0,(f))<0.0)
++# endif
++# endif
++#endif
++!
+ echo
+
+ : generate the intercept functions and table entries
++++++ ksh93-reg.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,6 +1,6 @@
--- src/cmd/ksh93/edit/edit.c
-+++ src/cmd/ksh93/edit/edit.c 2011-08-30 16:07:02.059926160 +0000
-@@ -1668,7 +1668,7 @@ int ed_histgen(Edit_t *ep,const char *pa
++++ src/cmd/ksh93/edit/edit.c 2012-01-16 16:13:59.743144345 +0100
+@@ -1670,7 +1670,7 @@ int ed_histgen(Edit_t *ep,const char *pa
History_t *hp;
off_t offset;
int ac=0,l,m,n,index1,index2;
@@ -9,31 +9,19 @@
if(!(hp=ep->sh->gd->hist_ptr))
return(0);
if(*pattern=='#')
-@@ -1746,8 +1746,13 @@ int ed_histgen(Edit_t *ep,const char *pa
+@@ -1748,8 +1748,13 @@ int ed_histgen(Edit_t *ep,const char *pa
mplast->next = mp;
mplast->next = 0;
}
- ep->hlist = (Histmatch_t**)argv;
-- ep->hfirst = ep->hlist[0];
+- ep->hfirst = ep->hlist?ep->hlist[0]:0;
+ if (argv)
+ {
+ ep->hlist = (Histmatch_t**)argv;
-+ ep->hfirst = ep->hlist[0];
++ ep->hfirst = ep->hlist?ep->hlist[0]:0;
+ }
+ else
-+ ep->hfirst = 0;
++ ep->hfirst = 0;
return(ep->hmax=ac);
}
---- src/cmd/ksh93/sh/name.c
-+++ src/cmd/ksh93/sh/name.c 2011-08-30 15:55:30.900426385 +0000
-@@ -967,7 +967,8 @@ Namval_t *nv_create(const char *name, D
- if(c=='.' && (cp[1]==0 || cp[1]=='=' || cp[1]=='+'))
- {
- nv_local = 1;
-- nv_onattr(np,nofree);
-+ if (np)
-+ nv_onattr(np,nofree);
- return(np);
- }
- if(cp[-1]=='.')
++++++ ksh93-shift_ijs.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -321,13 +321,13 @@
#include
--- src/lib/libcmd/Mamfile
-+++ src/lib/libcmd/Mamfile 2011-05-20 13:40:30.643926303 +0000
++++ src/lib/libcmd/Mamfile 2012-01-16 15:02:08.387145418 +0000
@@ -508,7 +508,7 @@ make cat.o
prev cat.c
meta cat.o %.c>%.o cat.c cat
prev cat.c
--exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -c cat.c
-+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2011 AT&T Intellectual Property][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -DSHOPT_MULTIBYTE -c cat.c
+-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -c cat.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I-D${INSTALLROOT}/lib/probe/C/pp/0F689CA5rbincc -I. -I${PACKAGE_ast_INCLUDE} -DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler ][-author?David Korn ][-copyright?Copyright (c) 1992-2012 AT&T Intellectual Property][-license?http://www.eclipse.org/org/documents/epl-v10.html][--catalog?libcmd]"\" -D_BLD_cmd -D_PACKAGE_ast -D_BLD_DEBUG -DSHOPT_MULTIBYTE -c cat.c
done cat.o generated
make chgrp.o
prev chgrp.c
++++++ ksh93-suid_exec.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -14,7 +14,7 @@
const char e_dot[] = ".";
--- src/cmd/ksh93/sh/suid_exec.c
+++ src/cmd/ksh93/sh/suid_exec.c 2007-04-02 11:35:09.627236300 +0000
-@@ -62,8 +62,12 @@
+@@ -62,11 +62,21 @@
#define FDVERIFY 12 /* used to validate /tmp process */
#undef BLKSIZE
#define BLKSIZE sizeof(char*)*1024
@@ -29,14 +29,16 @@
#if defined(__linux__)
static void error_exit(const char*) __attribute__ ((noreturn));
-@@ -76,11 +80,14 @@ static int endsh(const char*);
- # undef _lib_setreuid
++#ifndef _lib_setregid
++#define _lib_setregid 1
++#endif
++#ifndef _lib_setreuid
++#define _lib_setreuid 1
++#endif
+ #else
+ static void error_exit(const char*);
#endif
- #ifndef _lib_setreuid
-+# ifdef __linux__
-+# error Linux provides setreuid!
-+# endif
- static void setids(int,uid_t,gid_t);
+@@ -80,7 +90,7 @@ static int endsh(const char*);
static int mycopy(int, int);
static void maketemp(char*);
#else
@@ -45,7 +47,7 @@
#endif /* _lib_setreuid */
static const char version[] = "\n@(#)$Id: suid_exec "SH_RELEASE" $\n";
-@@ -221,7 +232,7 @@ int main(int argc,char *argv[])
+@@ -225,7 +235,7 @@ int main(int argc,char *argv[])
if(effuid != ruserid)
mode |= S_ISUID;
}
@@ -54,7 +56,7 @@
{
if(effuid != ruserid || setuid(ruserid) < 0)
mode = S_ISUID;
-@@ -233,13 +244,18 @@ int main(int argc,char *argv[])
+@@ -237,13 +247,18 @@ int main(int argc,char *argv[])
exec:
#endif /* _lib_setreuid */
/* only use SHELL if file is in trusted directory and ends in sh */
@@ -74,7 +76,7 @@
argv[0] = command;
argv[1] = (char*)devfd;
execv(shell,argv);
-@@ -253,7 +263,7 @@ exec:
+@@ -253,7 +268,7 @@ exec:
/*
* return true of shell ends in sh of ksh
*/
@@ -83,7 +85,7 @@
static int endsh(register const char *shell)
{
while(*shell)
-@@ -266,7 +276,20 @@ static int endsh(register const char *sh
+@@ -266,7 +281,20 @@ static int endsh(register const char *sh
return(1);
return(0);
}
@@ -105,13 +107,13 @@
/*
* return true of shell is in <dir> directory
-@@ -345,16 +368,29 @@ int eaccess(register const char *name, r
+@@ -345,16 +373,29 @@ int eaccess(register const char *name, r
}
#ifdef _lib_setreuid
+-static void setids(int mode,int owner,int group)
+#include
+#include
--static void setids(int mode,int owner,int group)
+static void setids(int mode,uid_t owner,gid_t group)
{
- if(mode & S_ISGID)
++++++ ksh93-vm.dif ++++++
--- src/lib/libast/vmalloc/vmhdr.h
+++ src/lib/libast/vmalloc/vmhdr.h 2012-01-19 09:45:13.651645599 +0000
@@ -149,6 +149,9 @@ extern void _vmmessage _ARG_((const cha
#endif /*DEBUG*/
#define VMPAGESIZE 8192
+#if defined(__linux__) && !defined(_lib_getpagesize)
+#define _lib_getpagesize 1
+#endif
#if _lib_getpagesize
#define GETPAGESIZE(x) ((x) ? (x) : ((x)=getpagesize()) )
#else
--- src/lib/libast/vmalloc/vmmopen.c
+++ src/lib/libast/vmalloc/vmmopen.c 2012-01-20 11:13:11.743644776 +0000
@@ -58,8 +58,10 @@ void _STUB_vmmapopen(){}
/* magic word signaling file/segment is ready */
#define MM_MAGIC ((unsigned int)(('P'<<24) | ('&'<<16) | ('N'<<8) | ('8')) )
+#ifndef __linux__
/* default mimimum region size */
#define MM_MINSIZE (64*_Vmpagesize)
+#endif
/* macros to get the data section and size */
#define MMHEAD(file) ROUND(sizeof(Mmvm_t)+strlen(file), ALIGN)
@@ -135,7 +137,12 @@ static Mmvm_t* mmfix(Mmvm_t* mmvm, Mmdis
if(mmdc->proj < 0)
{ munmap((Void_t*)mmvm, size);
mmvm = (Mmvm_t*)mmap(base, size, (PROT_READ|PROT_WRITE),
- (MAP_FIXED|MAP_SHARED), fd, (off_t)0 );
+#if (defined(__ia64__) || defined(__s390x__)) && defined(MAP_32BIT)
+ (MAP_32BIT|MAP_SHARED),
+#else
+ (MAP_FIXED|MAP_SHARED),
+#endif
+ fd, (off_t)0 );
}
else
{ shmdt((Void_t*)mmvm);
@@ -162,10 +169,18 @@ static int mminit(Mmdisc_t* mmdc)
if(mmdc->mmvm) /* already done this */
return 0;
-
+#ifdef MM_MINSIZE
/* fixed size region so make it reasonably large */
if((size = mmdc->size) < MM_MINSIZE )
size = MM_MINSIZE;
+#else
+ if (sizeof(void*) > 32)
+ extent = ROUND(0x80000,_Vmpagesize);
+ else
+ extent = ROUND(0x40000,_Vmpagesize);
+ if((size = mmdc->size) < extent)
+ size = extent;
+#endif
size += MMHEAD(mmdc->file) + ALIGN;
size = ROUND(size, _Vmpagesize);
++++++ ksh93.dif ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -225,6 +225,17 @@
fi
")
got=$*
+--- src/cmd/ksh93/tests/options.sh
++++ src/cmd/ksh93/tests/options.sh 2012-01-16 16:50:59.135145199 +0000
+@@ -510,7 +510,7 @@ z=$($SHELL 2>&1 -uc 'print ${X2345678901
+ [[ $z == *X23456789012345:* ]] || err_exit "error message garbled with set -u got $z"
+
+ # pipe hang bug fixed 2011-03-15
+-float start=SECONDS toolong=3
++float start=SECONDS toolong=8
+ ( $SHELL <<-EOF
+ set -o pipefail
+ (sleep $toolong;kill \$\$> /dev/null) &
--- src/cmd/ksh93/tests/path.sh
+++ src/cmd/ksh93/tests/path.sh 2008-09-11 16:02:46.000000000 +0000
@@ -269,7 +269,7 @@ builtin getconf
++++++ leak1.sh ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -34,4 +34,4 @@
done
echo "[${0##*/}: leak count at $leak]"
-((leak < 7)) || exit 1
+((leak < 20)) || exit 1
++++++ leak2.sh ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -43,4 +43,4 @@
done
echo "[${0##*/}: leak count at $leak]"
-((leak < 8)) || exit 1
+((leak < 60)) || exit 1
++++++ rpmlintrc ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,8 +1,14 @@
addFilter(".*binary-or-shlib-defines-rpath.*/lib/ast/.*\.so.*")
addFilter(".*binary-or-shlib-defines-rpath.*/lib/ast/bin/shcomp.*")
addFilter(".*binary-or-shlib-defines-rpath.*/lib/ast/bin/ksh.*")
+addFilter(".*binary-or-shlib-defines-rpath.*/lib64/ast/.*\.so.*")
+addFilter(".*binary-or-shlib-defines-rpath.*/lib64/ast/bin/shcomp.*")
+addFilter(".*binary-or-shlib-defines-rpath.*/lib64/ast/bin/ksh.*")
addFilter(".*suse-filelist-forbidden-devel-in-lib.*/lib/ast/.*\.so.*")
+addFilter(".*suse-filelist-forbidden-devel-in-lib.*/lib64/ast/.*\.so.*")
addFilter(".*devel-file-in-non-devel-package.*/lib/ast/.*\.so")
+addFilter(".*devel-file-in-non-devel-package.*/lib64/ast/.*\.so")
addFilter(".*script-without-shebang.*/usr/share/ksh/fun/.*")
addFilter(".*no-rpm-opt-flags.*ldtest.c.*")
addFilter(".*invalid-suse-version-check.*")
+addFilter(".*obsolete-suse-version-check.*")
++++++ sigexec.c ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,19 +1,163 @@
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
#endif
+#include
+#include
+#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
+static sig_atomic_t died;
+static void sigchld(int sig __attribute__((__unused__)))
+{
+ const int old_errno = errno;
+ int status;
+ pid_t pid;
+ while ((pid = waitpid(-1, &status, WNOHANG|WUNTRACED)) != 0) {
+ if (errno == ECHILD)
+ break;
+ if (pid < 0)
+ continue;
+ died = 1;
+ }
+ errno = old_errno;
+}
+
+static pid_t pid = -1;
+static void sigother(int sig)
+{
+ printf("%s\n", strsignal(sig));
+ if (sig == SIGINT)
+ sig = SIGTERM;
+ if (pid > 0) kill(pid, sig);
+}
+
int main(int argc, char* argv[])
{
+ int ptm, pts;
+ ssize_t len;
+ static struct termios o;
+ static struct winsize w;
+ char ptsname[NAME_MAX+1];
+ char buffer[65536];
+ sigset_t set;
struct sigaction sa;
+ if (ioctl(0, TIOCGWINSZ, &w) < 0) {
+ w.ws_row = 24;
+ w.ws_col = 160;
+ errno = 0;
+ }
+ if (tcgetattr(0, &o) < 0) {
+ cfmakeraw(&o);
+ cfsetispeed(&o, B38400);
+ cfsetospeed(&o, B38400);
+ }
+ o.c_lflag &= ~ECHO;
+ o.c_lflag |= ISIG;
+ o.c_cc[VTIME] = 0;
+ o.c_cc[VMIN] = CMIN;
+
+ if (openpty(&ptm, &pts, ptsname, &o, &w) < 0)
+ perror("pty: can not open pty/tty pair");
+
+ (void)sigemptyset(&set);
+ (void)sigaddset(&set, SIGCHLD);
+ sigprocmask(SIG_UNBLOCK, &set, (sigset_t*)0);
+
+ sa.sa_flags = SA_RESTART;
+ sa.sa_handler = sigchld;
+ sigemptyset (&sa.sa_mask);
+ sigaction(SIGCHLD, &sa, (struct sigaction*)0);
+
+ (void)sigemptyset(&set);
+ (void)sigaddset(&set, SIGTERM);
+ sigprocmask(SIG_UNBLOCK, &set, (sigset_t*)0);
+
+ sa.sa_flags = SA_RESTART;
+ sa.sa_handler = sigother;
+ sigemptyset (&sa.sa_mask);
+ sigaction(SIGTERM, &sa, (struct sigaction*)0);
+
+ (void)sigemptyset(&set);
+ (void)sigaddset(&set, SIGHUP);
+ sigprocmask(SIG_UNBLOCK, &set, (sigset_t*)0);
+
+ sa.sa_flags = SA_RESTART;
+ sa.sa_handler = sigother;
+ sigemptyset (&sa.sa_mask);
+ sigaction(SIGHUP, &sa, (struct sigaction*)0);
+
+ switch ((pid = fork())) {
+ case 0:
+ ioctl(1, TIOCNOTTY);
+ if (setsid() < 0)
+ perror("pty: can not get controlling tty");
+ dup2(pts, 1);
+ dup2(pts, 2);
+ close(pts);
+ close(ptm);
+ if (ioctl (1, TIOCSCTTY, 1) < 0)
+ perror("pty: can not get controlling tty");
+ break;
+ case -1:
+ close(pts);
+ close(ptm);
+ perror("pty: can not fork");
+ exit(1);
+ default:
+ dup2(ptm, 0);
+ close(pts);
+ close(ptm);
+ while ((len = read(0, buffer, sizeof(buffer)))) {
+ ssize_t p = 0;
+ const char* ptr = buffer;
+ while (len > 0) {
+ p = write(1, ptr, len);
+ if (p < 0) {
+ if (errno == EPIPE)
+ exit (0);
+ if (errno == EINTR || errno == EAGAIN)
+ continue;
+ return 1;
+ }
+ ptr += p;
+ len -= p;
+ }
+ if (died)
+ break;
+ }
+ return 0;
+ }
+
+ (void)sigfillset(&set);
+ sigprocmask(SIG_UNBLOCK, &set, (sigset_t*)0);
+
+ (void)sigemptyset(&set);
+ (void)sigaddset(&set, SIGCHLD);
+ sigprocmask(SIG_BLOCK, &set, (sigset_t*)0);
+
sa.sa_flags = SA_RESTART;
sa.sa_handler = SIG_DFL;
sigemptyset (&sa.sa_mask);
+ sigaction(SIGHUP, &sa, (struct sigaction*)0);
sigaction(SIGPIPE, &sa, (struct sigaction*)0);
+ sigaction(SIGTERM, &sa, (struct sigaction*)0);
+ sigaction(SIGURG, &sa, (struct sigaction*)0);
+ sigaction(SIGXFSZ, &sa, (struct sigaction*)0);
+ sigaction(SIGQUIT, &sa, (struct sigaction*)0);
+
+ sa.sa_handler = SIG_IGN;
+ sigaction(SIGINT, &sa, (struct sigaction*)0);
sigaction(SIGQUIT, &sa, (struct sigaction*)0);
- return execv(argv[0], &argv[1]);
+ return execv(argv[0], &argv[1]);
}
++++++ workaround-stupid-build-system.diff ++++++
--- /var/tmp/diff_new_pack.5E498E/_old 2012-01-25 15:02:03.000000000 +0100
+++ /var/tmp/diff_new_pack.5E498E/_new 2012-01-25 15:02:03.000000000 +0100
@@ -1,7 +1,7 @@
--- src/cmd/INIT/Mamfile
+++ src/cmd/INIT/Mamfile 2008-02-14 12:08:37.000000000 +0000
@@ -5,7 +5,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
- setv ARFLAGS -cr
+ setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
@@ -20,7 +20,7 @@
setv YACC yacc
--- src/cmd/INIT/iffe.sh
+++ src/cmd/INIT/iffe.sh 2008-02-14 12:15:59.000000000 +0000
-@@ -1097,7 +1097,7 @@ case `(getopts '[-][123:xyz]' opt --xyz;
+@@ -1117,7 +1117,7 @@ case `(getopts '[-][123:xyz]' opt --xyz;
--*) echo $command: $1: unknown option >&2
exit 2
;;
@@ -40,7 +40,7 @@
#define KEY(a,b,c,d) ((((unsigned long)(a))<<15)|(((unsigned long)(b))<<10)|(((unsigned long)(c))<<5)|(((unsigned long)(d))))
#define NOW ((unsigned long)time((time_t*)0))
#define ROTATE(p,l,r,t) ((t)=(p)->l,(p)->l=(t)->r,(t)->r=(p),(p)=(t))
-@@ -336,14 +336,14 @@ report(int level, char* text, char* item
+@@ -338,14 +338,14 @@ report(int level, char* text, char* item
*/
static void
@@ -57,7 +57,7 @@
unlink(r->name);
if (state.ignore)
return;
-@@ -1257,7 +1257,7 @@ run(Rule_t* r, register char* s)
+@@ -1259,7 +1259,7 @@ run(Rule_t* r, register char* s)
if (x)
{
if (c = execute(s))
@@ -66,7 +66,7 @@
if (status((Buf_t*)0, 0, r->name, &st))
{
r->time = st.st_mtime;
-@@ -1623,7 +1623,7 @@ make(Rule_t* r)
+@@ -1633,7 +1633,7 @@ make(Rule_t* r)
}
r->flags |= RULE_made;
if (!(r->flags & (RULE_dontcare|RULE_error|RULE_exists|RULE_generated|RULE_implicit|RULE_virtual)))
@@ -75,7 +75,7 @@
break;
case KEY('e','x','e','c'):
r->flags |= RULE_generated;
-@@ -1709,7 +1709,7 @@ verify(Dict_item_t* item, void* handle)
+@@ -1726,7 +1726,7 @@ verify(Dict_item_t* item, void* handle)
Rule_t* r = (Rule_t*)item->value;
if ((r->flags & (RULE_active|RULE_error|RULE_made)) == RULE_active)
@@ -85,9 +85,9 @@
}
--- src/cmd/ksh93/Mamfile
-+++ src/cmd/ksh93/Mamfile 2011-05-20 13:34:19.740425655 +0000
++++ src/cmd/ksh93/Mamfile 2011-05-20 13:34:20.000000000 +0000
@@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
- setv ARFLAGS -cr
+ setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
@@ -104,7 +104,7 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -1421,7 +1421,7 @@ prev +ljobs
+@@ -1346,7 +1346,7 @@ prev +ljobs
prev +li
prev ${mam_libsocket}
prev ${mam_libsecdb}
@@ -113,7 +113,7 @@
done ksh generated
make shcomp
make shcomp.o
-@@ -1445,7 +1445,7 @@ prev ${mam_libsocket}
+@@ -1370,7 +1370,7 @@ prev ${mam_libsocket}
prev ${mam_libsecdb}
setv CC.DLL -UCC.DLL
setv SH_DICT -DSH_DICT="\"libshell\""
@@ -125,7 +125,7 @@
--- src/lib/libast/Mamfile
+++ src/lib/libast/Mamfile 2010-08-17 15:00:56.000000000 +0000
@@ -5,7 +5,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
- setv ARFLAGS -cr
+ setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
@@ -142,16 +142,16 @@
setv SILENT
setv TAR tar
setv YACC yacc
-@@ -995,7 +995,7 @@ make lcgen
+@@ -1002,7 +1002,7 @@ make lcgen
make port/lcgen.c
prev std/stdio.h implicit
done port/lcgen.c
-exec - ${CC} -o lcgen port/lcgen.c
-+exec - ${CC} ${mam_cc_FLAGS} -o lcgen port/lcgen.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o lcgen port/lcgen.c
done lcgen generated
make port/lc.tab
done port/lc.tab
-@@ -7258,64 +7258,37 @@ done ${INSTALLROOT}/lib/file/magic gener
+@@ -7282,64 +7282,37 @@ done ${INSTALLROOT}/lib/file/magic gener
make ${INSTALLROOT}/include/ast/fmtmsg.h
prev comp/fmtmsg.h
prev ast_lib.h
@@ -225,13 +225,13 @@
--- src/lib/libcmd/Mamfile
+++ src/lib/libcmd/Mamfile 2008-02-14 12:08:37.000000000 +0000
@@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
- setv ARFLAGS -cr
+ setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
+setv CC gcc
setv mam_cc_FLAGS ${mam_cc_DLL}
- setv CCFLAGS ${-debug-symbols?1?${mam_cc_DEBUG} -D_BLD_DEBUG?${mam_cc_OPTIMIZE}?}
+ setv CCFLAGS ${mam_cc_DEBUG}
setv CCLDFLAGS ${-strip-symbols?1?${mam_cc_LD_STRIP}??}
@@ -29,7 +29,7 @@ setv NMAKE nmake
setv NMAKEFLAGS
@@ -245,7 +245,7 @@
--- src/lib/libdll/Mamfile
+++ src/lib/libdll/Mamfile 2008-02-14 12:08:37.000000000 +0000
@@ -7,7 +7,7 @@ setv AR ${mam_cc_AR} ${mam_cc_AR_ARFLAGS
- setv ARFLAGS -cr
+ setv ARFLAGS rc
setv AS as
setv ASFLAGS
-setv CC cc
@@ -262,3 +262,23 @@
setv SILENT
setv TAR tar
setv YACC yacc
+--- src/lib/libpp/Mamfile
++++ src/lib/libpp/Mamfile 2012-01-24 18:31:21.979645513 +0000
+@@ -665,7 +665,7 @@ exec - .
+ exec - w
+ exec - q
+ exec - !
+-exec - ${CC} -o ${COTEMP}.exe 1.${COTEMP}.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o ${COTEMP}.exe 1.${COTEMP}.c
+ exec - ./${COTEMP}.exe > pp.yacc
+ exec - rm -f 1.${COTEMP}.c ${COTEMP}.exe
+ done pp.yacc generated
+@@ -707,7 +707,7 @@ exec - .
+ exec - w
+ exec - q
+ exec - !
+-exec - ${CC} -o ${COTEMP}.exe 1.${COTEMP}.c
++exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -o ${COTEMP}.exe 1.${COTEMP}.c
+ exec - ./${COTEMP}.exe > ppkey.yacc
+ exec - rm -f 1.${COTEMP}.c ${COTEMP}.exe
+ done ppkey.yacc generated
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org