svn commit: r214650 - in projects/binutils-2.17: bin/rm bin/sh
cddl/contrib/opensolaris/cmd/ztest
cddl/contrib/opensolaris/lib/libzpool/common cddl/lib/drti
contrib/bind9 contrib/bind9/bin/dnssec c...
Dimitry Andric
dim at FreeBSD.org
Mon Nov 1 22:11:20 UTC 2010
Author: dim
Date: Mon Nov 1 22:11:18 2010
New Revision: 214650
URL: http://svn.freebsd.org/changeset/base/214650
Log:
Sync: merge r214353 through r214648 from ^/head.
Added:
projects/binutils-2.17/contrib/libpcap/opentest.c
- copied unchanged from r214648, head/contrib/libpcap/opentest.c
projects/binutils-2.17/contrib/libpcap/pcap-can-linux.c
- copied unchanged from r214648, head/contrib/libpcap/pcap-can-linux.c
projects/binutils-2.17/contrib/libpcap/pcap-can-linux.h
- copied unchanged from r214648, head/contrib/libpcap/pcap-can-linux.h
projects/binutils-2.17/contrib/libpcap/pcap-common.c
- copied unchanged from r214648, head/contrib/libpcap/pcap-common.c
projects/binutils-2.17/contrib/libpcap/pcap-common.h
- copied unchanged from r214648, head/contrib/libpcap/pcap-common.h
projects/binutils-2.17/contrib/libpcap/pcap-snf.c
- copied unchanged from r214648, head/contrib/libpcap/pcap-snf.c
projects/binutils-2.17/contrib/libpcap/pcap-snf.h
- copied unchanged from r214648, head/contrib/libpcap/pcap-snf.h
projects/binutils-2.17/contrib/libpcap/pcap/ipnet.h
- copied unchanged from r214648, head/contrib/libpcap/pcap/ipnet.h
projects/binutils-2.17/contrib/libpcap/selpolltest.c
- copied unchanged from r214648, head/contrib/libpcap/selpolltest.c
projects/binutils-2.17/contrib/libpcap/sf-pcap-ng.c
- copied unchanged from r214648, head/contrib/libpcap/sf-pcap-ng.c
projects/binutils-2.17/contrib/libpcap/sf-pcap-ng.h
- copied unchanged from r214648, head/contrib/libpcap/sf-pcap-ng.h
projects/binutils-2.17/contrib/libpcap/sf-pcap.c
- copied unchanged from r214648, head/contrib/libpcap/sf-pcap.c
projects/binutils-2.17/contrib/libpcap/sf-pcap.h
- copied unchanged from r214648, head/contrib/libpcap/sf-pcap.h
projects/binutils-2.17/contrib/tcpdump/Makefile-devel-adds
- copied unchanged from r214648, head/contrib/tcpdump/Makefile-devel-adds
projects/binutils-2.17/contrib/tcpdump/forces.h
- copied unchanged from r214648, head/contrib/tcpdump/forces.h
projects/binutils-2.17/contrib/tcpdump/ipnet.h
- copied unchanged from r214648, head/contrib/tcpdump/ipnet.h
projects/binutils-2.17/contrib/tcpdump/print-forces.c
- copied unchanged from r214648, head/contrib/tcpdump/print-forces.c
projects/binutils-2.17/contrib/tcpdump/print-ipnet.c
- copied unchanged from r214648, head/contrib/tcpdump/print-ipnet.c
projects/binutils-2.17/contrib/tcpdump/print-usb.c
- copied unchanged from r214648, head/contrib/tcpdump/print-usb.c
projects/binutils-2.17/contrib/tcpdump/signature.c
- copied unchanged from r214648, head/contrib/tcpdump/signature.c
projects/binutils-2.17/contrib/tcpdump/signature.h
- copied unchanged from r214648, head/contrib/tcpdump/signature.h
projects/binutils-2.17/contrib/tcpdump/tcpdump.1.in
- copied unchanged from r214648, head/contrib/tcpdump/tcpdump.1.in
projects/binutils-2.17/contrib/tcpdump/tests/
- copied from r214648, head/contrib/tcpdump/tests/
projects/binutils-2.17/sys/dev/agp/agp_apple.c
- copied unchanged from r214648, head/sys/dev/agp/agp_apple.c
projects/binutils-2.17/sys/x86/include/
- copied from r214648, head/sys/x86/include/
projects/binutils-2.17/sys/x86/x86/dump_machdep.c
- copied unchanged from r214648, head/sys/x86/x86/dump_machdep.c
projects/binutils-2.17/sys/x86/x86/mptable.c
- copied unchanged from r214648, head/sys/x86/x86/mptable.c
projects/binutils-2.17/sys/x86/x86/mptable_pci.c
- copied unchanged from r214648, head/sys/x86/x86/mptable_pci.c
projects/binutils-2.17/sys/x86/x86/nexus.c
- copied unchanged from r214648, head/sys/x86/x86/nexus.c
projects/binutils-2.17/tools/regression/bin/sh/errors/bad-keyword1.0
- copied unchanged from r214648, head/tools/regression/bin/sh/errors/bad-keyword1.0
projects/binutils-2.17/tools/regression/bin/sh/expansion/plus-minus5.0
- copied unchanged from r214648, head/tools/regression/bin/sh/expansion/plus-minus5.0
projects/binutils-2.17/tools/regression/bin/sh/expansion/plus-minus6.0
- copied unchanged from r214648, head/tools/regression/bin/sh/expansion/plus-minus6.0
projects/binutils-2.17/tools/regression/bin/sh/expansion/trim5.0
- copied unchanged from r214648, head/tools/regression/bin/sh/expansion/trim5.0
projects/binutils-2.17/tools/regression/bin/sh/expansion/trim6.0
- copied unchanged from r214648, head/tools/regression/bin/sh/expansion/trim6.0
projects/binutils-2.17/usr.sbin/tcpdump/tcpdump/tcpdump.1
- copied unchanged from r214648, head/usr.sbin/tcpdump/tcpdump/tcpdump.1
Deleted:
projects/binutils-2.17/contrib/libpcap/FREEBSD-Xlist
projects/binutils-2.17/contrib/libpcap/FREEBSD-upgrade
projects/binutils-2.17/contrib/libpcap/net/bpf_filter.c
projects/binutils-2.17/contrib/tcpdump/FREEBSD-Xlist
projects/binutils-2.17/contrib/tcpdump/FREEBSD-upgrade
projects/binutils-2.17/contrib/tcpdump/missing/getaddrinfo.c
projects/binutils-2.17/contrib/tcpdump/tcpdump.1
projects/binutils-2.17/sys/amd64/amd64/dump_machdep.c
projects/binutils-2.17/sys/amd64/amd64/mptable.c
projects/binutils-2.17/sys/amd64/amd64/mptable_pci.c
projects/binutils-2.17/sys/amd64/amd64/nexus.c
projects/binutils-2.17/sys/amd64/include/apicreg.h
projects/binutils-2.17/sys/amd64/include/mca.h
projects/binutils-2.17/sys/i386/i386/dump_machdep.c
projects/binutils-2.17/sys/i386/i386/mptable.c
projects/binutils-2.17/sys/i386/i386/mptable_pci.c
projects/binutils-2.17/sys/i386/i386/nexus.c
projects/binutils-2.17/sys/i386/include/apicreg.h
projects/binutils-2.17/sys/i386/include/mca.h
projects/binutils-2.17/sys/pc98/include/apicreg.h
projects/binutils-2.17/sys/pc98/include/mca.h
Modified:
projects/binutils-2.17/bin/rm/rm.1
projects/binutils-2.17/bin/sh/eval.c
projects/binutils-2.17/bin/sh/expand.c
projects/binutils-2.17/bin/sh/expand.h
projects/binutils-2.17/bin/sh/histedit.c
projects/binutils-2.17/bin/sh/mksyntax.c
projects/binutils-2.17/bin/sh/parser.c
projects/binutils-2.17/bin/sh/parser.h
projects/binutils-2.17/bin/sh/sh.1
projects/binutils-2.17/bin/sh/var.c
projects/binutils-2.17/cddl/contrib/opensolaris/cmd/ztest/ztest.c
projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
projects/binutils-2.17/cddl/lib/drti/Makefile
projects/binutils-2.17/contrib/bind9/CHANGES
projects/binutils-2.17/contrib/bind9/README
projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-keygen.html
projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-signzone.html
projects/binutils-2.17/contrib/bind9/bin/named/include/named/globals.h
projects/binutils-2.17/contrib/bind9/bin/named/main.c
projects/binutils-2.17/contrib/bind9/bin/named/query.c
projects/binutils-2.17/contrib/bind9/bin/named/server.c
projects/binutils-2.17/contrib/bind9/bin/nsupdate/nsupdate.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM-book.xml
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.ch06.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.ch07.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.ch08.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.ch09.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.html
projects/binutils-2.17/contrib/bind9/doc/arm/Bv9ARM.pdf
projects/binutils-2.17/contrib/bind9/doc/arm/isc-logo.eps
projects/binutils-2.17/contrib/bind9/doc/arm/isc-logo.pdf
projects/binutils-2.17/contrib/bind9/doc/arm/man.dig.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.dnssec-keygen.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.dnssec-signzone.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.host.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.named-checkconf.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.named-checkzone.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.named.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.nsupdate.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.rndc-confgen.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.rndc.conf.html
projects/binutils-2.17/contrib/bind9/doc/arm/man.rndc.html
projects/binutils-2.17/contrib/bind9/lib/dns/adb.c
projects/binutils-2.17/contrib/bind9/lib/dns/api
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/diff.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/ncache.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/rdataset.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/resolver.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/result.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/types.h
projects/binutils-2.17/contrib/bind9/lib/dns/include/dns/validator.h
projects/binutils-2.17/contrib/bind9/lib/dns/ncache.c
projects/binutils-2.17/contrib/bind9/lib/dns/rbtdb.c
projects/binutils-2.17/contrib/bind9/lib/dns/rdatalist.c
projects/binutils-2.17/contrib/bind9/lib/dns/rdataset.c
projects/binutils-2.17/contrib/bind9/lib/dns/rdataslab.c
projects/binutils-2.17/contrib/bind9/lib/dns/resolver.c
projects/binutils-2.17/contrib/bind9/lib/dns/result.c
projects/binutils-2.17/contrib/bind9/lib/dns/sdb.c
projects/binutils-2.17/contrib/bind9/lib/dns/sdlz.c
projects/binutils-2.17/contrib/bind9/lib/dns/validator.c
projects/binutils-2.17/contrib/bind9/lib/dns/view.c
projects/binutils-2.17/contrib/bind9/lib/isc/api
projects/binutils-2.17/contrib/bind9/lib/isc/include/isc/mem.h
projects/binutils-2.17/contrib/bind9/lib/isc/mem.c
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_buffer.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_config.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_context.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_gabn.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_gethostent.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_getipnode.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_gnba.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_inetntop.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_noop.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_packet.html
projects/binutils-2.17/contrib/bind9/lib/lwres/man/lwres_resutil.html
projects/binutils-2.17/contrib/bind9/version
projects/binutils-2.17/contrib/ipfilter/tools/ipf_y.y
projects/binutils-2.17/contrib/libpcap/CHANGES
projects/binutils-2.17/contrib/libpcap/CREDITS
projects/binutils-2.17/contrib/libpcap/INSTALL.txt
projects/binutils-2.17/contrib/libpcap/Makefile.in
projects/binutils-2.17/contrib/libpcap/README
projects/binutils-2.17/contrib/libpcap/TODO
projects/binutils-2.17/contrib/libpcap/VERSION
projects/binutils-2.17/contrib/libpcap/arcnet.h
projects/binutils-2.17/contrib/libpcap/atmuni31.h
projects/binutils-2.17/contrib/libpcap/bpf/net/bpf_filter.c
projects/binutils-2.17/contrib/libpcap/bpf_dump.c
projects/binutils-2.17/contrib/libpcap/bpf_image.c
projects/binutils-2.17/contrib/libpcap/config.guess
projects/binutils-2.17/contrib/libpcap/config.h.in
projects/binutils-2.17/contrib/libpcap/config.sub
projects/binutils-2.17/contrib/libpcap/configure
projects/binutils-2.17/contrib/libpcap/configure.in
projects/binutils-2.17/contrib/libpcap/dlpisubs.c
projects/binutils-2.17/contrib/libpcap/dlpisubs.h
projects/binutils-2.17/contrib/libpcap/etherent.c
projects/binutils-2.17/contrib/libpcap/ethertype.h
projects/binutils-2.17/contrib/libpcap/fad-getad.c
projects/binutils-2.17/contrib/libpcap/fad-gifc.c
projects/binutils-2.17/contrib/libpcap/fad-glifc.c
projects/binutils-2.17/contrib/libpcap/fad-null.c
projects/binutils-2.17/contrib/libpcap/fad-win32.c
projects/binutils-2.17/contrib/libpcap/filtertest.c
projects/binutils-2.17/contrib/libpcap/gencode.c
projects/binutils-2.17/contrib/libpcap/gencode.h
projects/binutils-2.17/contrib/libpcap/grammar.y
projects/binutils-2.17/contrib/libpcap/inet.c
projects/binutils-2.17/contrib/libpcap/lbl/os-aix4.h
projects/binutils-2.17/contrib/libpcap/lbl/os-hpux11.h
projects/binutils-2.17/contrib/libpcap/lbl/os-osf4.h
projects/binutils-2.17/contrib/libpcap/lbl/os-osf5.h
projects/binutils-2.17/contrib/libpcap/lbl/os-solaris2.h
projects/binutils-2.17/contrib/libpcap/lbl/os-sunos4.h
projects/binutils-2.17/contrib/libpcap/lbl/os-ultrix4.h
projects/binutils-2.17/contrib/libpcap/llc.h
projects/binutils-2.17/contrib/libpcap/missing/snprintf.c
projects/binutils-2.17/contrib/libpcap/nametoaddr.c
projects/binutils-2.17/contrib/libpcap/nlpid.h
projects/binutils-2.17/contrib/libpcap/optimize.c
projects/binutils-2.17/contrib/libpcap/pcap-bpf.c
projects/binutils-2.17/contrib/libpcap/pcap-bpf.h
projects/binutils-2.17/contrib/libpcap/pcap-bt-linux.c
projects/binutils-2.17/contrib/libpcap/pcap-bt-linux.h
projects/binutils-2.17/contrib/libpcap/pcap-config.1
projects/binutils-2.17/contrib/libpcap/pcap-config.in
projects/binutils-2.17/contrib/libpcap/pcap-dag.c
projects/binutils-2.17/contrib/libpcap/pcap-dag.h
projects/binutils-2.17/contrib/libpcap/pcap-dlpi.c
projects/binutils-2.17/contrib/libpcap/pcap-dos.c
projects/binutils-2.17/contrib/libpcap/pcap-dos.h
projects/binutils-2.17/contrib/libpcap/pcap-enet.c
projects/binutils-2.17/contrib/libpcap/pcap-filter.manmisc.in
projects/binutils-2.17/contrib/libpcap/pcap-int.h
projects/binutils-2.17/contrib/libpcap/pcap-libdlpi.c
projects/binutils-2.17/contrib/libpcap/pcap-linktype.manmisc.in
projects/binutils-2.17/contrib/libpcap/pcap-linux.c
projects/binutils-2.17/contrib/libpcap/pcap-namedb.h
projects/binutils-2.17/contrib/libpcap/pcap-nit.c
projects/binutils-2.17/contrib/libpcap/pcap-null.c
projects/binutils-2.17/contrib/libpcap/pcap-pf.c
projects/binutils-2.17/contrib/libpcap/pcap-savefile.manfile.in
projects/binutils-2.17/contrib/libpcap/pcap-septel.c
projects/binutils-2.17/contrib/libpcap/pcap-septel.h
projects/binutils-2.17/contrib/libpcap/pcap-sita.html
projects/binutils-2.17/contrib/libpcap/pcap-snit.c
projects/binutils-2.17/contrib/libpcap/pcap-snoop.c
projects/binutils-2.17/contrib/libpcap/pcap-stdinc.h
projects/binutils-2.17/contrib/libpcap/pcap-usb-linux.c
projects/binutils-2.17/contrib/libpcap/pcap-usb-linux.h
projects/binutils-2.17/contrib/libpcap/pcap-win32.c
projects/binutils-2.17/contrib/libpcap/pcap.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap.c
projects/binutils-2.17/contrib/libpcap/pcap.h
projects/binutils-2.17/contrib/libpcap/pcap/bluetooth.h
projects/binutils-2.17/contrib/libpcap/pcap/bpf.h
projects/binutils-2.17/contrib/libpcap/pcap/namedb.h
projects/binutils-2.17/contrib/libpcap/pcap/pcap.h
projects/binutils-2.17/contrib/libpcap/pcap/sll.h
projects/binutils-2.17/contrib/libpcap/pcap/usb.h
projects/binutils-2.17/contrib/libpcap/pcap/vlan.h
projects/binutils-2.17/contrib/libpcap/pcap_activate.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_breakloop.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_can_set_rfmon.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_close.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_compile.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_create.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_datalink.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_datalink_name_to_val.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_datalink_val_to_name.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump_close.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump_file.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump_flush.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump_ftell.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_dump_open.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_file.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_fileno.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_findalldevs.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_free_datalinks.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_freealldevs.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_freecode.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_get_selectable_fd.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_geterr.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_inject.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_is_swapped.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_lib_version.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_list_datalinks.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_lookupdev.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_lookupnet.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_loop.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_major_version.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_next_ex.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_offline_filter.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_open_dead.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_open_live.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_open_offline.3pcap.in
projects/binutils-2.17/contrib/libpcap/pcap_set_buffer_size.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_set_datalink.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_set_promisc.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_set_rfmon.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_set_snaplen.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_set_timeout.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_setdirection.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_setfilter.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_setnonblock.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_snapshot.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_stats.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_statustostr.3pcap
projects/binutils-2.17/contrib/libpcap/pcap_strerror.3pcap
projects/binutils-2.17/contrib/libpcap/ppp.h
projects/binutils-2.17/contrib/libpcap/runlex.sh
projects/binutils-2.17/contrib/libpcap/savefile.c
projects/binutils-2.17/contrib/libpcap/scanner.l
projects/binutils-2.17/contrib/libpcap/sunatmpos.h
projects/binutils-2.17/contrib/tcpdump/CHANGES
projects/binutils-2.17/contrib/tcpdump/CREDITS
projects/binutils-2.17/contrib/tcpdump/INSTALL.txt
projects/binutils-2.17/contrib/tcpdump/Makefile.in
projects/binutils-2.17/contrib/tcpdump/README
projects/binutils-2.17/contrib/tcpdump/VERSION
projects/binutils-2.17/contrib/tcpdump/acconfig.h
projects/binutils-2.17/contrib/tcpdump/addrtoname.c
projects/binutils-2.17/contrib/tcpdump/af.c
projects/binutils-2.17/contrib/tcpdump/af.h
projects/binutils-2.17/contrib/tcpdump/atmuni31.h
projects/binutils-2.17/contrib/tcpdump/bootp.h
projects/binutils-2.17/contrib/tcpdump/bpf_dump.c
projects/binutils-2.17/contrib/tcpdump/checksum.c
projects/binutils-2.17/contrib/tcpdump/config.guess
projects/binutils-2.17/contrib/tcpdump/config.h.in
projects/binutils-2.17/contrib/tcpdump/config.sub
projects/binutils-2.17/contrib/tcpdump/configure
projects/binutils-2.17/contrib/tcpdump/configure.in
projects/binutils-2.17/contrib/tcpdump/ethertype.h
projects/binutils-2.17/contrib/tcpdump/gmpls.c
projects/binutils-2.17/contrib/tcpdump/gmpls.h
projects/binutils-2.17/contrib/tcpdump/gmt2local.h
projects/binutils-2.17/contrib/tcpdump/icmp6.h
projects/binutils-2.17/contrib/tcpdump/ieee802_11.h
projects/binutils-2.17/contrib/tcpdump/ieee802_11_radio.h
projects/binutils-2.17/contrib/tcpdump/interface.h
projects/binutils-2.17/contrib/tcpdump/ip6.h
projects/binutils-2.17/contrib/tcpdump/ipproto.c
projects/binutils-2.17/contrib/tcpdump/ipproto.h
projects/binutils-2.17/contrib/tcpdump/isakmp.h
projects/binutils-2.17/contrib/tcpdump/l2vpn.c
projects/binutils-2.17/contrib/tcpdump/l2vpn.h
projects/binutils-2.17/contrib/tcpdump/lbl/os-sunos4.h
projects/binutils-2.17/contrib/tcpdump/lbl/os-ultrix4.h
projects/binutils-2.17/contrib/tcpdump/missing/addrinfo.h
projects/binutils-2.17/contrib/tcpdump/netdissect.h
projects/binutils-2.17/contrib/tcpdump/nfs.h
projects/binutils-2.17/contrib/tcpdump/nlpid.c
projects/binutils-2.17/contrib/tcpdump/nlpid.h
projects/binutils-2.17/contrib/tcpdump/oui.c
projects/binutils-2.17/contrib/tcpdump/oui.h
projects/binutils-2.17/contrib/tcpdump/print-802_11.c
projects/binutils-2.17/contrib/tcpdump/print-ap1394.c
projects/binutils-2.17/contrib/tcpdump/print-arcnet.c
projects/binutils-2.17/contrib/tcpdump/print-atm.c
projects/binutils-2.17/contrib/tcpdump/print-bfd.c
projects/binutils-2.17/contrib/tcpdump/print-bgp.c
projects/binutils-2.17/contrib/tcpdump/print-bootp.c
projects/binutils-2.17/contrib/tcpdump/print-bt.c
projects/binutils-2.17/contrib/tcpdump/print-cdp.c
projects/binutils-2.17/contrib/tcpdump/print-cfm.c
projects/binutils-2.17/contrib/tcpdump/print-dccp.c
projects/binutils-2.17/contrib/tcpdump/print-dhcp6.c
projects/binutils-2.17/contrib/tcpdump/print-domain.c
projects/binutils-2.17/contrib/tcpdump/print-enc.c
projects/binutils-2.17/contrib/tcpdump/print-esp.c
projects/binutils-2.17/contrib/tcpdump/print-ether.c
projects/binutils-2.17/contrib/tcpdump/print-fr.c
projects/binutils-2.17/contrib/tcpdump/print-gre.c
projects/binutils-2.17/contrib/tcpdump/print-icmp6.c
projects/binutils-2.17/contrib/tcpdump/print-ip.c
projects/binutils-2.17/contrib/tcpdump/print-ip6.c
projects/binutils-2.17/contrib/tcpdump/print-isakmp.c
projects/binutils-2.17/contrib/tcpdump/print-isoclns.c
projects/binutils-2.17/contrib/tcpdump/print-juniper.c
projects/binutils-2.17/contrib/tcpdump/print-l2tp.c
projects/binutils-2.17/contrib/tcpdump/print-lane.c
projects/binutils-2.17/contrib/tcpdump/print-llc.c
projects/binutils-2.17/contrib/tcpdump/print-lldp.c
projects/binutils-2.17/contrib/tcpdump/print-lspping.c
projects/binutils-2.17/contrib/tcpdump/print-nfs.c
projects/binutils-2.17/contrib/tcpdump/print-ntp.c
projects/binutils-2.17/contrib/tcpdump/print-olsr.c
projects/binutils-2.17/contrib/tcpdump/print-ospf.c
projects/binutils-2.17/contrib/tcpdump/print-pflog.c
projects/binutils-2.17/contrib/tcpdump/print-pim.c
projects/binutils-2.17/contrib/tcpdump/print-ppp.c
projects/binutils-2.17/contrib/tcpdump/print-rrcp.c
projects/binutils-2.17/contrib/tcpdump/print-rsvp.c
projects/binutils-2.17/contrib/tcpdump/print-rx.c
projects/binutils-2.17/contrib/tcpdump/print-sctp.c
projects/binutils-2.17/contrib/tcpdump/print-sip.c
projects/binutils-2.17/contrib/tcpdump/print-sll.c
projects/binutils-2.17/contrib/tcpdump/print-smb.c
projects/binutils-2.17/contrib/tcpdump/print-sunrpc.c
projects/binutils-2.17/contrib/tcpdump/print-symantec.c
projects/binutils-2.17/contrib/tcpdump/print-tcp.c
projects/binutils-2.17/contrib/tcpdump/print-tftp.c
projects/binutils-2.17/contrib/tcpdump/print-token.c
projects/binutils-2.17/contrib/tcpdump/print-udp.c
projects/binutils-2.17/contrib/tcpdump/setsignal.h
projects/binutils-2.17/contrib/tcpdump/sll.h
projects/binutils-2.17/contrib/tcpdump/smbutil.c
projects/binutils-2.17/contrib/tcpdump/strcasecmp.c
projects/binutils-2.17/contrib/tcpdump/tcp.h
projects/binutils-2.17/contrib/tcpdump/tcpdump-stdinc.h
projects/binutils-2.17/contrib/tcpdump/tcpdump.c
projects/binutils-2.17/contrib/tcpdump/tftp.h
projects/binutils-2.17/contrib/tcpdump/timed.h
projects/binutils-2.17/contrib/tcpdump/token.h
projects/binutils-2.17/contrib/tcpdump/util.c
projects/binutils-2.17/contrib/tzcode/stdtime/asctime.c
projects/binutils-2.17/contrib/tzcode/stdtime/localtime.c
projects/binutils-2.17/contrib/tzcode/zic/zic.8
projects/binutils-2.17/contrib/tzcode/zic/zic.c
projects/binutils-2.17/include/Makefile
projects/binutils-2.17/include/unistd.h
projects/binutils-2.17/lib/bind/config.h
projects/binutils-2.17/lib/bind/isc/isc/platform.h
projects/binutils-2.17/lib/clang/Makefile
projects/binutils-2.17/lib/libc/gen/sysconf.c
projects/binutils-2.17/lib/libc/sys/chflags.2
projects/binutils-2.17/lib/libjail/jail.c
projects/binutils-2.17/lib/libpcap/Makefile
projects/binutils-2.17/lib/libpcap/config.h
projects/binutils-2.17/lib/libthr/thread/thr_attr.c
projects/binutils-2.17/lib/libthr/thread/thr_mutex.c
projects/binutils-2.17/lib/libthr/thread/thr_sig.c
projects/binutils-2.17/release/fixit.profile
projects/binutils-2.17/sbin/geom/class/eli/geom_eli.c
projects/binutils-2.17/sbin/mount_nfs/mount_nfs.c
projects/binutils-2.17/sbin/pflogd/Makefile
projects/binutils-2.17/share/man/man3/pthread_attr_affinity_np.3
projects/binutils-2.17/share/man/man4/acpi.4
projects/binutils-2.17/share/man/man4/ada.4
projects/binutils-2.17/share/man/man4/re.4
projects/binutils-2.17/share/man/man5/nsmb.conf.5
projects/binutils-2.17/share/man/man7/build.7
projects/binutils-2.17/share/misc/bsd-family-tree
projects/binutils-2.17/share/misc/committers-ports.dot
projects/binutils-2.17/sys/amd64/acpica/acpi_wakeup.c
projects/binutils-2.17/sys/amd64/acpica/madt.c
projects/binutils-2.17/sys/amd64/amd64/amd64_mem.c
projects/binutils-2.17/sys/amd64/amd64/apic_vector.S
projects/binutils-2.17/sys/amd64/amd64/genassym.c
projects/binutils-2.17/sys/amd64/amd64/intr_machdep.c
projects/binutils-2.17/sys/amd64/amd64/machdep.c
projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c
projects/binutils-2.17/sys/amd64/amd64/mp_watchdog.c
projects/binutils-2.17/sys/amd64/amd64/pmap.c
projects/binutils-2.17/sys/amd64/amd64/trap.c
projects/binutils-2.17/sys/amd64/include/pmap.h
projects/binutils-2.17/sys/arm/arm/elf_trampoline.c
projects/binutils-2.17/sys/boot/ofw/common/main.c
projects/binutils-2.17/sys/boot/ofw/libofw/ofw_memory.c
projects/binutils-2.17/sys/boot/ofw/libofw/ofw_net.c
projects/binutils-2.17/sys/boot/ofw/libofw/openfirm.c
projects/binutils-2.17/sys/boot/sparc64/loader/main.c
projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/binutils-2.17/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
projects/binutils-2.17/sys/conf/files.amd64
projects/binutils-2.17/sys/conf/files.i386
projects/binutils-2.17/sys/conf/files.pc98
projects/binutils-2.17/sys/conf/files.powerpc
projects/binutils-2.17/sys/conf/kern.post.mk
projects/binutils-2.17/sys/conf/kmod.mk
projects/binutils-2.17/sys/conf/options.amd64
projects/binutils-2.17/sys/conf/options.powerpc
projects/binutils-2.17/sys/dev/acpica/acpi.c
projects/binutils-2.17/sys/dev/agp/agp.c
projects/binutils-2.17/sys/dev/alc/if_alc.c
projects/binutils-2.17/sys/dev/bge/if_bge.c
projects/binutils-2.17/sys/dev/bge/if_bgereg.h
projects/binutils-2.17/sys/dev/e1000/e1000_82571.c
projects/binutils-2.17/sys/dev/e1000/if_em.c
projects/binutils-2.17/sys/dev/e1000/if_em.h
projects/binutils-2.17/sys/dev/e1000/if_lem.c
projects/binutils-2.17/sys/dev/e1000/if_lem.h
projects/binutils-2.17/sys/dev/mii/brgphy.c
projects/binutils-2.17/sys/dev/mii/e1000phy.c
projects/binutils-2.17/sys/dev/mii/mii_physubr.c
projects/binutils-2.17/sys/dev/mii/miidevs
projects/binutils-2.17/sys/dev/mii/miivar.h
projects/binutils-2.17/sys/dev/usb/usb_device.c
projects/binutils-2.17/sys/dev/usb/usb_hub.c
projects/binutils-2.17/sys/dev/usb/usbdi.h
projects/binutils-2.17/sys/dev/xen/blkback/blkback.c
projects/binutils-2.17/sys/fs/nfs/nfsclstate.h
projects/binutils-2.17/sys/fs/nfsclient/nfs_clnode.c
projects/binutils-2.17/sys/fs/nfsclient/nfs_clstate.c
projects/binutils-2.17/sys/fs/nfsclient/nfs_clvnops.c
projects/binutils-2.17/sys/i386/acpica/acpi_wakeup.c
projects/binutils-2.17/sys/i386/acpica/madt.c
projects/binutils-2.17/sys/i386/i386/apic_vector.s
projects/binutils-2.17/sys/i386/i386/genassym.c
projects/binutils-2.17/sys/i386/i386/intr_machdep.c
projects/binutils-2.17/sys/i386/i386/machdep.c
projects/binutils-2.17/sys/i386/i386/mp_machdep.c
projects/binutils-2.17/sys/i386/i386/mp_watchdog.c
projects/binutils-2.17/sys/i386/i386/mpboot.s
projects/binutils-2.17/sys/i386/i386/trap.c
projects/binutils-2.17/sys/i386/xen/mp_machdep.c
projects/binutils-2.17/sys/i386/xen/mptable.c
projects/binutils-2.17/sys/kern/init_main.c
projects/binutils-2.17/sys/kern/kern_cpuset.c
projects/binutils-2.17/sys/kern/kern_timeout.c
projects/binutils-2.17/sys/kern/sched_ule.c
projects/binutils-2.17/sys/kern/subr_acl_nfs4.c
projects/binutils-2.17/sys/kern/vfs_cache.c
projects/binutils-2.17/sys/modules/Makefile
projects/binutils-2.17/sys/modules/agp/Makefile
projects/binutils-2.17/sys/net/bpf.h
projects/binutils-2.17/sys/netinet/if_ether.c
projects/binutils-2.17/sys/netipsec/ipsec.c
projects/binutils-2.17/sys/nfsclient/nfs_vfsops.c
projects/binutils-2.17/sys/pc98/include/bus.h
projects/binutils-2.17/sys/pc98/pc98/busiosubr.c
projects/binutils-2.17/sys/pc98/pc98/machdep.c
projects/binutils-2.17/sys/powerpc/aim/copyinout.c
projects/binutils-2.17/sys/powerpc/aim/mmu_oea.c
projects/binutils-2.17/sys/powerpc/aim/mmu_oea64.c
projects/binutils-2.17/sys/powerpc/aim/slb.c
projects/binutils-2.17/sys/powerpc/aim/swtch32.S
projects/binutils-2.17/sys/powerpc/aim/swtch64.S
projects/binutils-2.17/sys/powerpc/aim/trap.c
projects/binutils-2.17/sys/powerpc/aim/trap_subr32.S
projects/binutils-2.17/sys/powerpc/aim/trap_subr64.S
projects/binutils-2.17/sys/powerpc/aim/vm_machdep.c
projects/binutils-2.17/sys/powerpc/conf/GENERIC
projects/binutils-2.17/sys/powerpc/conf/GENERIC64
projects/binutils-2.17/sys/powerpc/conf/NOTES
projects/binutils-2.17/sys/powerpc/include/pcb.h
projects/binutils-2.17/sys/powerpc/include/slb.h
projects/binutils-2.17/sys/powerpc/include/sr.h
projects/binutils-2.17/sys/powerpc/powermac/cpcht.c
projects/binutils-2.17/sys/powerpc/powerpc/exec_machdep.c
projects/binutils-2.17/sys/powerpc/powerpc/genassym.c
projects/binutils-2.17/sys/sparc64/sparc64/pmap.c
projects/binutils-2.17/sys/sparc64/sparc64/tick.c
projects/binutils-2.17/sys/ufs/ufs/ufs_dirhash.c
projects/binutils-2.17/sys/vm/vm_phys.c
projects/binutils-2.17/sys/vm/vm_reserv.c
projects/binutils-2.17/sys/x86/x86/io_apic.c
projects/binutils-2.17/sys/x86/x86/local_apic.c
projects/binutils-2.17/sys/x86/x86/mca.c
projects/binutils-2.17/sys/x86/x86/msi.c
projects/binutils-2.17/usr.bin/kdump/kdump.1
projects/binutils-2.17/usr.bin/locate/locate/locate.rc
projects/binutils-2.17/usr.bin/locate/locate/updatedb.sh
projects/binutils-2.17/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c
projects/binutils-2.17/usr.sbin/config/main.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_config.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_drive.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_evt.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_flash.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_patrol.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_show.c
projects/binutils-2.17/usr.sbin/mfiutil/mfi_volume.c
projects/binutils-2.17/usr.sbin/pc-sysinstall/backend-query/disk-info.sh
projects/binutils-2.17/usr.sbin/rtadvd/rtadvd.conf.5
projects/binutils-2.17/usr.sbin/tcpdump/tcpdump/Makefile
projects/binutils-2.17/usr.sbin/tcpdump/tcpdump/config.h
Directory Properties:
projects/binutils-2.17/ (props changed)
projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/contrib/bind9/ (props changed)
projects/binutils-2.17/contrib/binutils/ (props changed)
projects/binutils-2.17/contrib/bzip2/ (props changed)
projects/binutils-2.17/contrib/ee/ (props changed)
projects/binutils-2.17/contrib/expat/ (props changed)
projects/binutils-2.17/contrib/file/ (props changed)
projects/binutils-2.17/contrib/gdb/ (props changed)
projects/binutils-2.17/contrib/gdtoa/ (props changed)
projects/binutils-2.17/contrib/gnu-sort/ (props changed)
projects/binutils-2.17/contrib/groff/ (props changed)
projects/binutils-2.17/contrib/less/ (props changed)
projects/binutils-2.17/contrib/libpcap/ (props changed)
projects/binutils-2.17/contrib/llvm/ (props changed)
projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed)
projects/binutils-2.17/contrib/ncurses/ (props changed)
projects/binutils-2.17/contrib/netcat/ (props changed)
projects/binutils-2.17/contrib/ntp/ (props changed)
projects/binutils-2.17/contrib/one-true-awk/ (props changed)
projects/binutils-2.17/contrib/openbsm/ (props changed)
projects/binutils-2.17/contrib/openpam/ (props changed)
projects/binutils-2.17/contrib/pf/ (props changed)
projects/binutils-2.17/contrib/sendmail/ (props changed)
projects/binutils-2.17/contrib/tcpdump/ (props changed)
projects/binutils-2.17/contrib/tcsh/ (props changed)
projects/binutils-2.17/contrib/top/ (props changed)
projects/binutils-2.17/contrib/top/install-sh (props changed)
projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed)
projects/binutils-2.17/contrib/tzcode/zic/ (props changed)
projects/binutils-2.17/contrib/tzdata/ (props changed)
projects/binutils-2.17/contrib/wpa/ (props changed)
projects/binutils-2.17/contrib/xz/ (props changed)
projects/binutils-2.17/crypto/openssh/ (props changed)
projects/binutils-2.17/crypto/openssl/ (props changed)
projects/binutils-2.17/lib/libc/ (props changed)
projects/binutils-2.17/lib/libc/stdtime/ (props changed)
projects/binutils-2.17/lib/libutil/ (props changed)
projects/binutils-2.17/lib/libz/ (props changed)
projects/binutils-2.17/sbin/ (props changed)
projects/binutils-2.17/sbin/ipfw/ (props changed)
projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed)
projects/binutils-2.17/share/zoneinfo/ (props changed)
projects/binutils-2.17/sys/ (props changed)
projects/binutils-2.17/sys/amd64/include/xen/ (props changed)
projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed)
projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed)
projects/binutils-2.17/sys/contrib/pf/ (props changed)
projects/binutils-2.17/sys/contrib/x86emu/ (props changed)
projects/binutils-2.17/sys/dev/xen/xenpci/ (props changed)
projects/binutils-2.17/usr.bin/calendar/ (props changed)
projects/binutils-2.17/usr.bin/csup/ (props changed)
projects/binutils-2.17/usr.bin/procstat/ (props changed)
projects/binutils-2.17/usr.sbin/zic/ (props changed)
Modified: projects/binutils-2.17/bin/rm/rm.1
==============================================================================
--- projects/binutils-2.17/bin/rm/rm.1 Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/rm/rm.1 Mon Nov 1 22:11:18 2010 (r214650)
@@ -32,7 +32,7 @@
.\" @(#)rm.1 8.5 (Berkeley) 12/5/94
.\" $FreeBSD$
.\"
-.Dd October 8, 2010
+.Dd October 31, 2010
.Dt RM 1
.Os
.Sh NAME
@@ -100,6 +100,11 @@ Specifying this flag for a read only fil
.Nm
to generate an error message and exit.
The file will not be removed or overwritten.
+.Pp
+N.B.: The
+.Fl P
+flag is not considered a security feature
+.Pq see Sx BUGS .
.It Fl R
Attempt to remove the file hierarchy rooted in each
.Ar file
@@ -229,8 +234,12 @@ command appeared in
.Sh BUGS
The
.Fl P
-option assumes that the underlying file system updates existing blocks
-in-place and does not store new data in a new location.
-This is true for UFS but not for ZFS, which is using a Copy-On-Write strategy.
-In addition, only regular files are overwritten, other types of files
-are not.
+option assumes that the underlying storage overwrites file blocks
+when data is written to an existing offset.
+Several factors including the file system and its backing store could defeat
+this assumption.
+This includes, but is not limited to file systems that use a
+Copy-On-Write strategy (e.g. ZFS or UFS when snapshots are being used), Flash
+media that are using a wear leveling algorithm, or when the backing datastore
+does journaling, etc.
+In addition, only regular files are overwritten, other types of files are not.
Modified: projects/binutils-2.17/bin/sh/eval.c
==============================================================================
--- projects/binutils-2.17/bin/sh/eval.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/eval.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -196,6 +196,7 @@ void
evaltree(union node *n, int flags)
{
int do_etest;
+ union node *next;
do_etest = 0;
if (n == NULL) {
@@ -203,84 +204,88 @@ evaltree(union node *n, int flags)
exitstatus = 0;
goto out;
}
+ do {
+ next = NULL;
#ifndef NO_HISTORY
- displayhist = 1; /* show history substitutions done with fc */
+ displayhist = 1; /* show history substitutions done with fc */
#endif
- TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type));
- switch (n->type) {
- case NSEMI:
- evaltree(n->nbinary.ch1, flags & ~EV_EXIT);
- if (evalskip)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NAND:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (evalskip || exitstatus != 0) {
- goto out;
+ TRACE(("evaltree(%p: %d) called\n", (void *)n, n->type));
+ switch (n->type) {
+ case NSEMI:
+ evaltree(n->nbinary.ch1, flags & ~EV_EXIT);
+ if (evalskip)
+ goto out;
+ next = n->nbinary.ch2;
+ break;
+ case NAND:
+ evaltree(n->nbinary.ch1, EV_TESTED);
+ if (evalskip || exitstatus != 0) {
+ goto out;
+ }
+ next = n->nbinary.ch2;
+ break;
+ case NOR:
+ evaltree(n->nbinary.ch1, EV_TESTED);
+ if (evalskip || exitstatus == 0)
+ goto out;
+ next = n->nbinary.ch2;
+ break;
+ case NREDIR:
+ evalredir(n, flags);
+ break;
+ case NSUBSHELL:
+ evalsubshell(n, flags);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ case NBACKGND:
+ evalsubshell(n, flags);
+ break;
+ case NIF: {
+ evaltree(n->nif.test, EV_TESTED);
+ if (evalskip)
+ goto out;
+ if (exitstatus == 0)
+ next = n->nif.ifpart;
+ else if (n->nif.elsepart)
+ next = n->nif.elsepart;
+ else
+ exitstatus = 0;
+ break;
}
- evaltree(n->nbinary.ch2, flags);
- break;
- case NOR:
- evaltree(n->nbinary.ch1, EV_TESTED);
- if (evalskip || exitstatus == 0)
- goto out;
- evaltree(n->nbinary.ch2, flags);
- break;
- case NREDIR:
- evalredir(n, flags);
- break;
- case NSUBSHELL:
- evalsubshell(n, flags);
- do_etest = !(flags & EV_TESTED);
- break;
- case NBACKGND:
- evalsubshell(n, flags);
- break;
- case NIF: {
- evaltree(n->nif.test, EV_TESTED);
- if (evalskip)
- goto out;
- if (exitstatus == 0)
- evaltree(n->nif.ifpart, flags);
- else if (n->nif.elsepart)
- evaltree(n->nif.elsepart, flags);
- else
+ case NWHILE:
+ case NUNTIL:
+ evalloop(n, flags & ~EV_EXIT);
+ break;
+ case NFOR:
+ evalfor(n, flags & ~EV_EXIT);
+ break;
+ case NCASE:
+ evalcase(n, flags);
+ break;
+ case NDEFUN:
+ defun(n->narg.text, n->narg.next);
exitstatus = 0;
- break;
- }
- case NWHILE:
- case NUNTIL:
- evalloop(n, flags & ~EV_EXIT);
- break;
- case NFOR:
- evalfor(n, flags & ~EV_EXIT);
- break;
- case NCASE:
- evalcase(n, flags);
- break;
- case NDEFUN:
- defun(n->narg.text, n->narg.next);
- exitstatus = 0;
- break;
- case NNOT:
- evaltree(n->nnot.com, EV_TESTED);
- exitstatus = !exitstatus;
- break;
-
- case NPIPE:
- evalpipe(n);
- do_etest = !(flags & EV_TESTED);
- break;
- case NCMD:
- evalcommand(n, flags, (struct backcmd *)NULL);
- do_etest = !(flags & EV_TESTED);
- break;
- default:
- out1fmt("Node type = %d\n", n->type);
- flushout(&output);
- break;
- }
+ break;
+ case NNOT:
+ evaltree(n->nnot.com, EV_TESTED);
+ exitstatus = !exitstatus;
+ break;
+
+ case NPIPE:
+ evalpipe(n);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ case NCMD:
+ evalcommand(n, flags, (struct backcmd *)NULL);
+ do_etest = !(flags & EV_TESTED);
+ break;
+ default:
+ out1fmt("Node type = %d\n", n->type);
+ flushout(&output);
+ break;
+ }
+ n = next;
+ } while (n != NULL);
out:
if (pendingsigs)
dotrap();
@@ -1130,7 +1135,7 @@ commandcmd(int argc, char **argv)
return typecmd_impl(2, argv - 1, cmd, path);
}
if (argc != 0)
- error("commandcmd() called while it should not be");
+ error("commandcmd bad call");
/*
* Do nothing successfully if no command was specified;
Modified: projects/binutils-2.17/bin/sh/expand.c
==============================================================================
--- projects/binutils-2.17/bin/sh/expand.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/expand.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -98,7 +98,7 @@ static struct arglist exparg; /* holds
static void argstr(char *, int);
static char *exptilde(char *, int);
static void expbackq(union node *, int, int);
-static int subevalvar(char *, char *, int, int, int, int);
+static int subevalvar(char *, char *, int, int, int, int, int);
static char *evalvar(char *, int);
static int varisset(char *, int);
static void varvalue(char *, int, int, int);
@@ -216,7 +216,12 @@ argstr(char *p, int flag)
char c;
int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */
int firsteq = 1;
+ int split_lit;
+ int lit_quoted;
+ split_lit = flag & EXP_SPLIT_LIT;
+ lit_quoted = flag & EXP_LIT_QUOTED;
+ flag &= ~(EXP_SPLIT_LIT | EXP_LIT_QUOTED);
if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE)))
p = exptilde(p, flag);
for (;;) {
@@ -225,17 +230,25 @@ argstr(char *p, int flag)
case CTLENDVAR:
goto breakloop;
case CTLQUOTEMARK:
+ lit_quoted = 1;
/* "$@" syntax adherence hack */
if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=')
break;
if ((flag & EXP_FULL) != 0)
STPUTC(c, expdest);
break;
+ case CTLQUOTEEND:
+ lit_quoted = 0;
+ break;
case CTLESC:
if (quotes)
STPUTC(c, expdest);
c = *p++;
STPUTC(c, expdest);
+ if (split_lit && !lit_quoted)
+ recordregion(expdest - stackblock() -
+ (quotes ? 2 : 1),
+ expdest - stackblock(), 0);
break;
case CTLVAR:
p = evalvar(p, flag);
@@ -255,18 +268,21 @@ argstr(char *p, int flag)
* assignments (after the first '=' and after ':'s).
*/
STPUTC(c, expdest);
- if (flag & EXP_VARTILDE && *p == '~') {
- if (c == '=') {
- if (firsteq)
- firsteq = 0;
- else
- break;
- }
+ if (split_lit && !lit_quoted)
+ recordregion(expdest - stackblock() - 1,
+ expdest - stackblock(), 0);
+ if (flag & EXP_VARTILDE && *p == '~' &&
+ (c != '=' || firsteq)) {
+ if (c == '=')
+ firsteq = 0;
p = exptilde(p, flag);
}
break;
default:
STPUTC(c, expdest);
+ if (split_lit && !lit_quoted)
+ recordregion(expdest - stackblock() - 1,
+ expdest - stackblock(), 0);
}
}
breakloop:;
@@ -510,7 +526,7 @@ expbackq(union node *cmd, int quoted, in
static int
subevalvar(char *p, char *str, int strloc, int subtype, int startloc,
- int varflags)
+ int varflags, int quotes)
{
char *startp;
char *loc = NULL;
@@ -555,12 +571,12 @@ subevalvar(char *p, char *str, int strlo
for (loc = startp; loc < str; loc++) {
c = *loc;
*loc = '\0';
- if (patmatch(str, startp, varflags & VSQUOTE)) {
+ if (patmatch(str, startp, quotes)) {
*loc = c;
goto recordleft;
}
*loc = c;
- if ((varflags & VSQUOTE) && *loc == CTLESC)
+ if (quotes && *loc == CTLESC)
loc++;
}
return 0;
@@ -569,14 +585,13 @@ subevalvar(char *p, char *str, int strlo
for (loc = str - 1; loc >= startp;) {
c = *loc;
*loc = '\0';
- if (patmatch(str, startp, varflags & VSQUOTE)) {
+ if (patmatch(str, startp, quotes)) {
*loc = c;
goto recordleft;
}
*loc = c;
loc--;
- if ((varflags & VSQUOTE) && loc > startp &&
- *(loc - 1) == CTLESC) {
+ if (quotes && loc > startp && *(loc - 1) == CTLESC) {
for (q = startp; q < loc; q++)
if (*q == CTLESC)
q++;
@@ -588,14 +603,13 @@ subevalvar(char *p, char *str, int strlo
case VSTRIMRIGHT:
for (loc = str - 1; loc >= startp;) {
- if (patmatch(str, loc, varflags & VSQUOTE)) {
+ if (patmatch(str, loc, quotes)) {
amount = loc - expdest;
STADJUST(amount, expdest);
return 1;
}
loc--;
- if ((varflags & VSQUOTE) && loc > startp &&
- *(loc - 1) == CTLESC) {
+ if (quotes && loc > startp && *(loc - 1) == CTLESC) {
for (q = startp; q < loc; q++)
if (*q == CTLESC)
q++;
@@ -607,12 +621,12 @@ subevalvar(char *p, char *str, int strlo
case VSTRIMRIGHTMAX:
for (loc = startp; loc < str - 1; loc++) {
- if (patmatch(str, loc, varflags & VSQUOTE)) {
+ if (patmatch(str, loc, quotes)) {
amount = loc - expdest;
STADJUST(amount, expdest);
return 1;
}
- if ((varflags & VSQUOTE) && *loc == CTLESC)
+ if (quotes && *loc == CTLESC)
loc++;
}
return 0;
@@ -742,7 +756,8 @@ record:
case VSPLUS:
case VSMINUS:
if (!set) {
- argstr(p, flag);
+ argstr(p, flag | (flag & EXP_FULL ? EXP_SPLIT_LIT : 0) |
+ (varflags & VSQUOTE ? EXP_LIT_QUOTED : 0));
break;
}
if (easy)
@@ -762,7 +777,7 @@ record:
STPUTC('\0', expdest);
patloc = expdest - stackblock();
if (subevalvar(p, NULL, patloc, subtype,
- startloc, varflags) == 0) {
+ startloc, varflags, quotes) == 0) {
int amount = (expdest - stackblock() - patloc) + 1;
STADJUST(-amount, expdest);
}
@@ -773,7 +788,8 @@ record:
case VSASSIGN:
case VSQUESTION:
if (!set) {
- if (subevalvar(p, var, 0, subtype, startloc, varflags)) {
+ if (subevalvar(p, var, 0, subtype, startloc, varflags,
+ quotes)) {
varflags &= ~VSNUL;
/*
* Remove any recorded regions beyond
@@ -1495,13 +1511,13 @@ rmescapes(char *str)
char *p, *q;
p = str;
- while (*p != CTLESC && *p != CTLQUOTEMARK) {
+ while (*p != CTLESC && *p != CTLQUOTEMARK && *p != CTLQUOTEEND) {
if (*p++ == '\0')
return;
}
q = p;
while (*p) {
- if (*p == CTLQUOTEMARK) {
+ if (*p == CTLQUOTEMARK || *p == CTLQUOTEEND) {
p++;
continue;
}
Modified: projects/binutils-2.17/bin/sh/expand.h
==============================================================================
--- projects/binutils-2.17/bin/sh/expand.h Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/expand.h Mon Nov 1 22:11:18 2010 (r214650)
@@ -52,6 +52,8 @@ struct arglist {
#define EXP_VARTILDE 0x4 /* expand tildes in an assignment */
#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */
#define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */
+#define EXP_SPLIT_LIT 0x20 /* IFS split literal text ${v+-a b c} */
+#define EXP_LIT_QUOTED 0x40 /* for EXP_SPLIT_LIT, start off quoted */
union node;
Modified: projects/binutils-2.17/bin/sh/histedit.c
==============================================================================
--- projects/binutils-2.17/bin/sh/histedit.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/histedit.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -297,7 +297,7 @@ histcmd(int argc, char **argv)
laststr = argv[1];
break;
default:
- error("too many args");
+ error("too many arguments");
}
/*
* Turn into event numbers.
@@ -329,7 +329,7 @@ histcmd(int argc, char **argv)
editfile = editfilestr;
if ((efp = fdopen(fd, "w")) == NULL) {
close(fd);
- error("can't allocate stdio buffer for temp");
+ error("Out of space");
}
}
Modified: projects/binutils-2.17/bin/sh/mksyntax.c
==============================================================================
--- projects/binutils-2.17/bin/sh/mksyntax.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/mksyntax.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -285,6 +285,7 @@ init(void)
syntax[base + CTLARI] = "CCTL";
syntax[base + CTLENDARI] = "CCTL";
syntax[base + CTLQUOTEMARK] = "CCTL";
+ syntax[base + CTLQUOTEEND] = "CCTL";
}
Modified: projects/binutils-2.17/bin/sh/parser.c
==============================================================================
--- projects/binutils-2.17/bin/sh/parser.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/parser.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -106,7 +106,7 @@ static struct parser_temp *parser_temp;
static int noaliases = 0;
-static union node *list(int);
+static union node *list(int, int);
static union node *andor(void);
static union node *pipeline(void);
static union node *command(void);
@@ -220,20 +220,20 @@ parsecmd(int interact)
if (t == TNL)
return NULL;
tokpushback++;
- return list(1);
+ return list(1, 1);
}
static union node *
-list(int nlflag)
+list(int nlflag, int erflag)
{
- union node *n1, *n2, *n3;
+ union node *ntop, *n1, *n2, *n3;
int tok;
checkkwd = 2;
- if (nlflag == 0 && tokendlist[peektoken()])
+ if (!nlflag && !erflag && tokendlist[peektoken()])
return NULL;
- n1 = NULL;
+ ntop = n1 = NULL;
for (;;) {
n2 = andor();
tok = readtoken();
@@ -250,14 +250,21 @@ list(int nlflag)
n2 = n3;
}
}
- if (n1 == NULL) {
- n1 = n2;
+ if (ntop == NULL)
+ ntop = n2;
+ else if (n1 == NULL) {
+ n1 = (union node *)stalloc(sizeof (struct nbinary));
+ n1->type = NSEMI;
+ n1->nbinary.ch1 = ntop;
+ n1->nbinary.ch2 = n2;
+ ntop = n1;
}
else {
n3 = (union node *)stalloc(sizeof (struct nbinary));
n3->type = NSEMI;
- n3->nbinary.ch1 = n1;
+ n3->nbinary.ch1 = n1->nbinary.ch2;
n3->nbinary.ch2 = n2;
+ n1->nbinary.ch2 = n3;
n1 = n3;
}
switch (tok) {
@@ -269,28 +276,28 @@ list(int nlflag)
if (tok == TNL) {
parseheredoc();
if (nlflag)
- return n1;
+ return ntop;
} else if (tok == TEOF && nlflag) {
parseheredoc();
- return n1;
+ return ntop;
} else {
tokpushback++;
}
checkkwd = 2;
- if (tokendlist[peektoken()])
- return n1;
+ if (!nlflag && !erflag && tokendlist[peektoken()])
+ return ntop;
break;
case TEOF:
if (heredoclist)
parseheredoc();
else
pungetc(); /* push back EOF on input */
- return n1;
+ return ntop;
default:
- if (nlflag)
+ if (nlflag || erflag)
synexpect(-1);
tokpushback++;
- return n1;
+ return ntop;
}
}
}
@@ -398,24 +405,24 @@ command(void)
case TIF:
n1 = (union node *)stalloc(sizeof (struct nif));
n1->type = NIF;
- if ((n1->nif.test = list(0)) == NULL)
+ if ((n1->nif.test = list(0, 0)) == NULL)
synexpect(-1);
if (readtoken() != TTHEN)
synexpect(TTHEN);
- n1->nif.ifpart = list(0);
+ n1->nif.ifpart = list(0, 0);
n2 = n1;
while (readtoken() == TELIF) {
n2->nif.elsepart = (union node *)stalloc(sizeof (struct nif));
n2 = n2->nif.elsepart;
n2->type = NIF;
- if ((n2->nif.test = list(0)) == NULL)
+ if ((n2->nif.test = list(0, 0)) == NULL)
synexpect(-1);
if (readtoken() != TTHEN)
synexpect(TTHEN);
- n2->nif.ifpart = list(0);
+ n2->nif.ifpart = list(0, 0);
}
if (lasttoken == TELSE)
- n2->nif.elsepart = list(0);
+ n2->nif.elsepart = list(0, 0);
else {
n2->nif.elsepart = NULL;
tokpushback++;
@@ -429,13 +436,13 @@ command(void)
int got;
n1 = (union node *)stalloc(sizeof (struct nbinary));
n1->type = (lasttoken == TWHILE)? NWHILE : NUNTIL;
- if ((n1->nbinary.ch1 = list(0)) == NULL)
+ if ((n1->nbinary.ch1 = list(0, 0)) == NULL)
synexpect(-1);
if ((got=readtoken()) != TDO) {
TRACE(("expecting DO got %s %s\n", tokname[got], got == TWORD ? wordtext : ""));
synexpect(TDO);
}
- n1->nbinary.ch2 = list(0);
+ n1->nbinary.ch2 = list(0, 0);
if (readtoken() != TDONE)
synexpect(TDONE);
checkkwd = 1;
@@ -487,7 +494,7 @@ TRACE(("expecting DO got %s %s\n", tokna
t = TEND;
else
synexpect(-1);
- n1->nfor.body = list(0);
+ n1->nfor.body = list(0, 0);
if (readtoken() != t)
synexpect(t);
checkkwd = 1;
@@ -527,7 +534,7 @@ TRACE(("expecting DO got %s %s\n", tokna
ap->narg.next = NULL;
if (lasttoken != TRP)
noaliases = 0, synexpect(TRP);
- cp->nclist.body = list(0);
+ cp->nclist.body = list(0, 0);
checkkwd = 2;
if ((t = readtoken()) != TESAC) {
@@ -545,14 +552,14 @@ TRACE(("expecting DO got %s %s\n", tokna
case TLP:
n1 = (union node *)stalloc(sizeof (struct nredir));
n1->type = NSUBSHELL;
- n1->nredir.n = list(0);
+ n1->nredir.n = list(0, 0);
n1->nredir.redirect = NULL;
if (readtoken() != TRP)
synexpect(TRP);
checkkwd = 1;
break;
case TBEGIN:
- n1 = list(0);
+ n1 = list(0, 0);
if (readtoken() != TEND)
synexpect(TEND);
checkkwd = 1;
@@ -644,9 +651,13 @@ simplecmd(union node **rpp, union node *
/*
* - Require plain text.
* - Functions with '/' cannot be called.
+ * - Reject name=().
+ * - Reject ksh extended glob patterns.
*/
if (!noexpand(n->narg.text) || quoteflag ||
- strchr(n->narg.text, '/'))
+ strchr(n->narg.text, '/') ||
+ strchr("!%*+-=?@}~",
+ n->narg.text[strlen(n->narg.text) - 1]))
synerror("Bad function name");
rmescapes(n->narg.text);
if (find_builtin(n->narg.text, &special) >= 0 &&
@@ -1066,7 +1077,7 @@ done:
doprompt = 0;
}
- n = list(0);
+ n = list(0, oldstyle);
if (oldstyle)
doprompt = saveprompt;
@@ -1161,7 +1172,7 @@ readtoken1(int firstc, char const *initi
loop: { /* for each line, until end of word */
CHECKEND(); /* set c to PEOF if at end of here document */
for (;;) { /* until end of line or end of word */
- CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */
+ CHECKSTRSPACE(4, out); /* permit 4 calls to USTPUTC */
synentry = state[level].syntax[c];
@@ -1203,12 +1214,18 @@ readtoken1(int firstc, char const *initi
newvarnest == 0)) &&
(c != '}' || state[level].category != TSTATE_VAR_OLD))
USTPUTC('\\', out);
+ if ((eofmark == NULL ||
+ newvarnest > 0) &&
+ state[level].syntax == BASESYNTAX)
+ USTPUTC(CTLQUOTEMARK, out);
if (SQSYNTAX[c] == CCTL)
USTPUTC(CTLESC, out);
- else if (eofmark == NULL ||
- newvarnest > 0)
- USTPUTC(CTLQUOTEMARK, out);
USTPUTC(c, out);
+ if ((eofmark == NULL ||
+ newvarnest > 0) &&
+ state[level].syntax == BASESYNTAX &&
+ state[level].category == TSTATE_VAR_OLD)
+ USTPUTC(CTLQUOTEEND, out);
quotef++;
}
break;
@@ -1224,6 +1241,8 @@ readtoken1(int firstc, char const *initi
if (eofmark != NULL && newvarnest == 0)
USTPUTC(c, out);
else {
+ if (state[level].category == TSTATE_VAR_OLD)
+ USTPUTC(CTLQUOTEEND, out);
state[level].syntax = BASESYNTAX;
quotef++;
}
@@ -1233,11 +1252,12 @@ readtoken1(int firstc, char const *initi
break;
case CENDVAR: /* '}' */
if (level > 0 &&
- (state[level].category == TSTATE_VAR_OLD ||
- state[level].category == TSTATE_VAR_NEW)) {
- if (state[level].category == TSTATE_VAR_OLD)
- state[level - 1].syntax = state[level].syntax;
- else
+ ((state[level].category == TSTATE_VAR_OLD &&
+ state[level].syntax ==
+ state[level - 1].syntax) ||
+ (state[level].category == TSTATE_VAR_NEW &&
+ state[level].syntax == BASESYNTAX))) {
+ if (state[level].category == TSTATE_VAR_NEW)
newvarnest--;
level--;
USTPUTC(CTLENDVAR, out);
@@ -1725,7 +1745,7 @@ getprompt(void *unused __unused)
char *fmt;
const char *pwd;
int i, trim;
- static char internal_error[] = "<internal prompt error>";
+ static char internal_error[] = "??";
/*
* Select prompt format.
Modified: projects/binutils-2.17/bin/sh/parser.h
==============================================================================
--- projects/binutils-2.17/bin/sh/parser.h Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/parser.h Mon Nov 1 22:11:18 2010 (r214650)
@@ -43,6 +43,7 @@
#define CTLARI '\206'
#define CTLENDARI '\207'
#define CTLQUOTEMARK '\210'
+#define CTLQUOTEEND '\211' /* only for ${v+-...} */
/* variable substitution byte (follows CTLVAR) */
#define VSTYPE 0x0f /* type of variable substitution */
Modified: projects/binutils-2.17/bin/sh/sh.1
==============================================================================
--- projects/binutils-2.17/bin/sh/sh.1 Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/sh.1 Mon Nov 1 22:11:18 2010 (r214650)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd October 16, 2010
+.Dd October 31, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -40,9 +40,24 @@
.Nd command interpreter (shell)
.Sh SYNOPSIS
.Nm
-.Op Fl /+abCEefIimnPpsTuVvx
+.Op Fl /+abCEefIimnPpTuVvx
.Op Fl /+o Ar longname
-.Op Fl c Ar string
+.Oo
+.Ar script
+.Op Ar arg ...
+.Oc
+.Nm
+.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+o Ar longname
+.Fl c Ar string
+.Oo
+.Ar name
+.Op Ar arg ...
+.Oc
+.Nm
+.Op Fl /+abCEefIimnPpTuVvx
+.Op Fl /+o Ar longname
+.Fl s
.Op Ar arg ...
.Sh DESCRIPTION
The
@@ -1109,7 +1124,12 @@ the process ID and its exit status until
.Ic wait
built-in command reports completion of the process.
.It Li $0
-(zero) Expands to the name of the shell or shell script.
+(zero) Expands to the name of the shell script if passed on the command line,
+the
+.Ar name
+operand if given (with
+.Fl c )
+or otherwise argument 0 passed to the shell.
.El
.Ss Special Variables
The following variables are set by the shell or
Modified: projects/binutils-2.17/bin/sh/var.c
==============================================================================
--- projects/binutils-2.17/bin/sh/var.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/bin/sh/var.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -826,7 +826,7 @@ setvarcmd(int argc, char **argv)
else if (argc == 3)
setvar(argv[1], argv[2], 0);
else
- error("List assignment not implemented");
+ error("too many arguments");
return 0;
}
Modified: projects/binutils-2.17/cddl/contrib/opensolaris/cmd/ztest/ztest.c
==============================================================================
--- projects/binutils-2.17/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/cddl/contrib/opensolaris/cmd/ztest/ztest.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -3362,8 +3362,7 @@ ztest_verify_blocks(char *pool)
int isalen;
FILE *fp;
- if (realpath(progname, zdb) == NULL)
- assert(!"realpath() failed");
+ strlcpy(zdb, "/usr/bin/ztest", sizeof(zdb));
/* zdb lives in /usr/sbin, while ztest lives in /usr/bin */
bin = strstr(zdb, "/usr/bin/");
Modified: projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
==============================================================================
--- projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c Mon Nov 1 22:11:18 2010 (r214650)
@@ -308,9 +308,9 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *m
struct timeval tv;
clock_t delta;
- ASSERT(abstime > 0);
+ abstime += lbolt;
top:
- delta = abstime;
+ delta = abstime - lbolt;
if (delta <= 0)
return (-1);
@@ -321,7 +321,7 @@ top:
ts.tv_nsec = tv.tv_usec * 1000 + (delta % hz) * (NANOSEC / hz);
ASSERT(ts.tv_nsec >= 0);
- if(ts.tv_nsec >= NANOSEC) {
+ if (ts.tv_nsec >= NANOSEC) {
ts.tv_sec++;
ts.tv_nsec -= NANOSEC;
}
Modified: projects/binutils-2.17/cddl/lib/drti/Makefile
==============================================================================
--- projects/binutils-2.17/cddl/lib/drti/Makefile Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/cddl/lib/drti/Makefile Mon Nov 1 22:11:18 2010 (r214650)
@@ -16,6 +16,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
- -DPIC -fpic
+ -DPIC ${PICFLAG}
.include <bsd.prog.mk>
Modified: projects/binutils-2.17/contrib/bind9/CHANGES
==============================================================================
--- projects/binutils-2.17/contrib/bind9/CHANGES Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/contrib/bind9/CHANGES Mon Nov 1 22:11:18 2010 (r214650)
@@ -1,9 +1,48 @@
- --- 9.6.2-P2 released ---
+ --- 9.6-ESV-R2 released ---
+
+2939. [func] Check that named successfully skips NSEC3 records
+ that fail to match the NSEC3PARAM record currently
+ in use. [RT# 21868]
+
+2937. [bug] Worked around an apparent race condition in over
+ memory conditions. Without this fix a DNS cache DB or
+ ADB could incorrectly stay in an over memory state,
+ effectively refusing further caching, which
+ subsequently made a BIND 9 caching server unworkable.
+ This fix prevents this problem from happening by
+ polling the state of the memory context, rather than
+ making a copy of the state, which appeared to cause
+ a race. This is a "workaround" in that it doesn't
+ solve the possible race per se, but several experiments
+ proved this change solves the symptom. Also, the
+ polling overhead hasn't been reported to be an issue.
+ This bug should only affect a caching server that
+ specifies a finite max-cache-size. It's also quite
+ likely that the bug happens only when enabling threads,
+ but it's not confirmed yet. [RT #21818]
+
+2925. [bug] Named failed to accept uncachable negative responses
+ from insecure zones. [RT# 21555]
+
+2921. [bug] The resolver could attempt to destroy a fetch context
+ too soon. [RT #19878]
+
+2900. [bug] The placeholder negative caching element was not
+ properly constructed triggering a INSIST in
+ dns_ncache_towire(). [RT #21346]
+
+2890. [bug] Handle the introduction of new trusted-keys and
+ DS, DLV RRsets better. [RT #21097]
+
+2869. [bug] Fix arguments to dns_keytable_findnextkeynode() call.
+ [RT #20877]
+
+ --- 9.6-ESV-R1 released ---
2876. [bug] Named could return SERVFAIL for negative responses
from unsigned zones. [RT #21131]
- --- 9.6.2-P1 released ---
+ --- 9.6-ESV released ---
2852. [bug] Handle broken DNSSEC trust chains better. [RT #15619]
Modified: projects/binutils-2.17/contrib/bind9/README
==============================================================================
--- projects/binutils-2.17/contrib/bind9/README Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/contrib/bind9/README Mon Nov 1 22:11:18 2010 (r214650)
@@ -42,6 +42,12 @@ BIND 9
Stichting NLnet - NLnet Foundation
Nominum, Inc.
+BIND 9.6-ESV (Extended Support Version)
+
+ BIND 9.6-ESV will be supported until March 31, 2013, at
+ which time you will need to upgrade to the current release
+ of BIND.
+
BIND 9.6.2
BIND 9.6.2 is a maintenance release, fixing bugs in 9.6.1.
Modified: projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html
==============================================================================
--- projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-dsfromkey.html Mon Nov 1 22:11:18 2010 (r214650)
@@ -1,5 +1,5 @@
<!--
- - Copyright (C) 2008 Internet Systems Consortium, Inc. ("ISC")
+ - Copyright (C) 2008, 2010 Internet Systems Consortium, Inc. ("ISC")
-
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
@@ -14,7 +14,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
-<!-- $Id: dnssec-dsfromkey.html,v 1.5 2008/11/08 01:11:47 tbox Exp $ -->
+<!-- $Id: dnssec-dsfromkey.html,v 1.5.110.2 2010/03/03 23:32:17 tbox Exp $ -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -33,14 +33,14 @@
<div class="cmdsynopsis"><p><code class="command">dnssec-dsfromkey</code> {-s} [<code class="option">-v <em class="replaceable"><code>level</code></em></code>] [<code class="option">-1</code>] [<code class="option">-2</code>] [<code class="option">-a <em class="replaceable"><code>alg</code></em></code>] [<code class="option">-c <em class="replaceable"><code>class</code></em></code>] [<code class="option">-d <em class="replaceable"><code>dir</code></em></code>] {dnsname}</p></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543424"></a><h2>DESCRIPTION</h2>
+<a name="id2543421"></a><h2>DESCRIPTION</h2>
<p><span><strong class="command">dnssec-dsfromkey</strong></span>
outputs the Delegation Signer (DS) resource record (RR), as defined in
RFC 3658 and RFC 4509, for the given key(s).
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543435"></a><h2>OPTIONS</h2>
+<a name="id2543433"></a><h2>OPTIONS</h2>
<div class="variablelist"><dl>
<dt><span class="term">-1</span></dt>
<dd><p>
@@ -81,7 +81,7 @@
</dl></div>
</div>
<div class="refsect1" lang="en">
-<a name="id2543563"></a><h2>EXAMPLE</h2>
+<a name="id2543561"></a><h2>EXAMPLE</h2>
<p>
To build the SHA-256 DS RR from the
<strong class="userinput"><code>Kexample.com.+003+26160</code></strong>
@@ -96,7 +96,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543593"></a><h2>FILES</h2>
+<a name="id2543591"></a><h2>FILES</h2>
<p>
The keyfile can be designed by the key identification
<code class="filename">Knnnn.+aaa+iiiii</code> or the full file name
@@ -110,13 +110,13 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543628"></a><h2>CAVEAT</h2>
+<a name="id2543626"></a><h2>CAVEAT</h2>
<p>
A keyfile error can give a "file not found" even if the file exists.
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543638"></a><h2>SEE ALSO</h2>
+<a name="id2543636"></a><h2>SEE ALSO</h2>
<p><span class="citerefentry"><span class="refentrytitle">dnssec-keygen</span>(8)</span>,
<span class="citerefentry"><span class="refentrytitle">dnssec-signzone</span>(8)</span>,
<em class="citetitle">BIND 9 Administrator Reference Manual</em>,
@@ -125,7 +125,7 @@
</p>
</div>
<div class="refsect1" lang="en">
-<a name="id2543674"></a><h2>AUTHOR</h2>
+<a name="id2543672"></a><h2>AUTHOR</h2>
<p><span class="corpauthor">Internet Systems Consortium</span>
</p>
</div>
Modified: projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html
==============================================================================
--- projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Mon Nov 1 21:37:28 2010 (r214649)
+++ projects/binutils-2.17/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html Mon Nov 1 22:11:18 2010 (r214650)
@@ -13,7 +13,7 @@
- OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list