svn commit: r206516 - in user/imp/tbemd: bin/cp bin/ls bin/pax
bin/ps bin/rcp bin/setfacl bin/sh bin/test
cddl/contrib/opensolaris/cmd/zfs
cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolari...
Warner Losh
imp at FreeBSD.org
Mon Apr 12 23:04:39 UTC 2010
Author: imp
Date: Mon Apr 12 23:04:38 2010
New Revision: 206516
URL: http://svn.freebsd.org/changeset/base/206516
Log:
merge from head: part 2 of many.
Added:
user/imp/tbemd/crypto/openssh/PROTOCOL.certkeys
- copied unchanged from r206514, head/crypto/openssh/PROTOCOL.certkeys
user/imp/tbemd/crypto/openssh/PROTOCOL.mux
- copied unchanged from r206514, head/crypto/openssh/PROTOCOL.mux
user/imp/tbemd/crypto/openssh/openbsd-compat/pwcache.c
- copied unchanged from r206514, head/crypto/openssh/openbsd-compat/pwcache.c
user/imp/tbemd/crypto/openssh/pkcs11.h
- copied unchanged from r206514, head/crypto/openssh/pkcs11.h
user/imp/tbemd/crypto/openssh/roaming_client.c
- copied unchanged from r206514, head/crypto/openssh/roaming_client.c
user/imp/tbemd/crypto/openssh/roaming_serv.c
- copied unchanged from r206514, head/crypto/openssh/roaming_serv.c
user/imp/tbemd/crypto/openssh/ssh-pkcs11-client.c
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11-client.c
user/imp/tbemd/crypto/openssh/ssh-pkcs11-helper.0
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11-helper.0
user/imp/tbemd/crypto/openssh/ssh-pkcs11-helper.8
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11-helper.8
user/imp/tbemd/crypto/openssh/ssh-pkcs11-helper.c
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11-helper.c
user/imp/tbemd/crypto/openssh/ssh-pkcs11.c
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11.c
user/imp/tbemd/crypto/openssh/ssh-pkcs11.h
- copied unchanged from r206514, head/crypto/openssh/ssh-pkcs11.h
user/imp/tbemd/crypto/openssl/engines/alpha.opt
- copied unchanged from r206514, head/crypto/openssl/engines/alpha.opt
user/imp/tbemd/crypto/openssl/engines/ia64.opt
- copied unchanged from r206514, head/crypto/openssl/engines/ia64.opt
user/imp/tbemd/crypto/openssl/ssl/t1_reneg.c
- copied unchanged from r206514, head/crypto/openssl/ssl/t1_reneg.c
Deleted:
user/imp/tbemd/bin/pax/cpio.1
user/imp/tbemd/bin/pax/tar.1
user/imp/tbemd/contrib/cpio/
user/imp/tbemd/crypto/openssh/README.smartcard
user/imp/tbemd/crypto/openssh/scard-opensc.c
user/imp/tbemd/crypto/openssh/scard.c
user/imp/tbemd/crypto/openssh/scard.h
user/imp/tbemd/crypto/openssl/apps/genpkey.c
user/imp/tbemd/crypto/openssl/apps/pkey.c
user/imp/tbemd/crypto/openssl/apps/pkeyparam.c
user/imp/tbemd/crypto/openssl/apps/pkeyutl.c
user/imp/tbemd/crypto/openssl/apps/ts.c
user/imp/tbemd/crypto/openssl/apps/tsget
user/imp/tbemd/crypto/openssl/crypto/aes/aes_x86core.c
user/imp/tbemd/crypto/openssl/crypto/aes/asm/aes-armv4.pl
user/imp/tbemd/crypto/openssl/crypto/aes/asm/aes-ppc.pl
user/imp/tbemd/crypto/openssl/crypto/aes/asm/aes-s390x.pl
user/imp/tbemd/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl
user/imp/tbemd/crypto/openssl/crypto/asn1/ameth_lib.c
user/imp/tbemd/crypto/openssl/crypto/asn1/asn1_locl.h
user/imp/tbemd/crypto/openssl/crypto/asn1/bio_asn1.c
user/imp/tbemd/crypto/openssl/crypto/asn1/bio_ndef.c
user/imp/tbemd/crypto/openssl/crypto/asn1/x_nx509.c
user/imp/tbemd/crypto/openssl/crypto/bn/asm/alpha-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/armv4-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/mips3-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/ppc-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/ppc64-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/s390x-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/s390x.S
user/imp/tbemd/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/via-mont.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/x86-mont.pl
user/imp/tbemd/crypto/openssl/crypto/camellia/asm/
user/imp/tbemd/crypto/openssl/crypto/ppccpuid.pl
user/imp/tbemd/crypto/openssl/crypto/s390xcpuid.S
user/imp/tbemd/crypto/openssl/crypto/sparcv9cap.c
user/imp/tbemd/crypto/openssl/engines/axp.opt
Modified:
user/imp/tbemd/bin/cp/utils.c
user/imp/tbemd/bin/ls/cmp.c
user/imp/tbemd/bin/pax/Makefile
user/imp/tbemd/bin/pax/getoldopt.c
user/imp/tbemd/bin/ps/extern.h
user/imp/tbemd/bin/ps/keyword.c
user/imp/tbemd/bin/ps/print.c
user/imp/tbemd/bin/ps/ps.1
user/imp/tbemd/bin/rcp/rcp.c
user/imp/tbemd/bin/setfacl/file.c
user/imp/tbemd/bin/setfacl/mask.c
user/imp/tbemd/bin/setfacl/merge.c
user/imp/tbemd/bin/setfacl/remove.c
user/imp/tbemd/bin/setfacl/setfacl.1
user/imp/tbemd/bin/setfacl/setfacl.c
user/imp/tbemd/bin/setfacl/setfacl.h
user/imp/tbemd/bin/setfacl/util.c
user/imp/tbemd/bin/sh/eval.c
user/imp/tbemd/bin/sh/exec.c
user/imp/tbemd/bin/sh/exec.h
user/imp/tbemd/bin/sh/expand.c
user/imp/tbemd/bin/sh/mksyntax.c
user/imp/tbemd/bin/sh/options.c
user/imp/tbemd/bin/sh/parser.c
user/imp/tbemd/bin/sh/sh.1
user/imp/tbemd/bin/test/test.c
user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs.8
user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
user/imp/tbemd/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
user/imp/tbemd/cddl/contrib/opensolaris/cmd/zpool/zpool.8
user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
user/imp/tbemd/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
user/imp/tbemd/contrib/bind9/CHANGES
user/imp/tbemd/contrib/bind9/bin/named/server.c
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM-book.xml
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch06.html
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch07.html
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch08.html
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.ch09.html
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.html
user/imp/tbemd/contrib/bind9/doc/arm/Bv9ARM.pdf
user/imp/tbemd/contrib/bind9/doc/arm/man.dig.html
user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-keygen.html
user/imp/tbemd/contrib/bind9/doc/arm/man.dnssec-signzone.html
user/imp/tbemd/contrib/bind9/doc/arm/man.host.html
user/imp/tbemd/contrib/bind9/doc/arm/man.named-checkconf.html
user/imp/tbemd/contrib/bind9/doc/arm/man.named-checkzone.html
user/imp/tbemd/contrib/bind9/doc/arm/man.named.html
user/imp/tbemd/contrib/bind9/doc/arm/man.nsupdate.html
user/imp/tbemd/contrib/bind9/doc/arm/man.rndc-confgen.html
user/imp/tbemd/contrib/bind9/doc/arm/man.rndc.conf.html
user/imp/tbemd/contrib/bind9/doc/arm/man.rndc.html
user/imp/tbemd/contrib/bind9/lib/dns/api
user/imp/tbemd/contrib/bind9/lib/dns/include/dns/rdataset.h
user/imp/tbemd/contrib/bind9/lib/dns/include/dns/resolver.h
user/imp/tbemd/contrib/bind9/lib/dns/include/dns/result.h
user/imp/tbemd/contrib/bind9/lib/dns/include/dns/validator.h
user/imp/tbemd/contrib/bind9/lib/dns/ncache.c
user/imp/tbemd/contrib/bind9/lib/dns/rbtdb.c
user/imp/tbemd/contrib/bind9/lib/dns/rdatalist.c
user/imp/tbemd/contrib/bind9/lib/dns/rdataset.c
user/imp/tbemd/contrib/bind9/lib/dns/rdataslab.c
user/imp/tbemd/contrib/bind9/lib/dns/resolver.c
user/imp/tbemd/contrib/bind9/lib/dns/result.c
user/imp/tbemd/contrib/bind9/lib/dns/sdb.c
user/imp/tbemd/contrib/bind9/lib/dns/sdlz.c
user/imp/tbemd/contrib/bind9/lib/dns/validator.c
user/imp/tbemd/contrib/bind9/lib/dns/view.c
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_buffer.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_config.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_context.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gabn.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gethostent.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getipnode.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_gnba.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_hstrerror.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_inetntop.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_noop.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_packet.html
user/imp/tbemd/contrib/bind9/lib/lwres/man/lwres_resutil.html
user/imp/tbemd/contrib/bind9/version
user/imp/tbemd/contrib/bsnmp/gensnmpdef/gensnmpdef.c
user/imp/tbemd/contrib/bsnmp/gensnmptree/gensnmptree.1
user/imp/tbemd/contrib/bsnmp/snmpd/config.c
user/imp/tbemd/contrib/bsnmp/snmpd/snmpmod.3
user/imp/tbemd/contrib/gcc/config/mips/freebsd.h
user/imp/tbemd/contrib/ipfilter/ipsend/sbpf.c
user/imp/tbemd/contrib/netcat/FREEBSD-upgrade
user/imp/tbemd/contrib/netcat/FREEBSD-vendor
user/imp/tbemd/contrib/netcat/nc.1
user/imp/tbemd/contrib/netcat/netcat.c
user/imp/tbemd/contrib/openpam/include/security/pam_appl.h
user/imp/tbemd/contrib/top/utils.c
user/imp/tbemd/contrib/top/utils.h
user/imp/tbemd/contrib/tzdata/antarctica
user/imp/tbemd/contrib/tzdata/asia
user/imp/tbemd/contrib/tzdata/australasia
user/imp/tbemd/contrib/tzdata/europe
user/imp/tbemd/contrib/tzdata/southamerica
user/imp/tbemd/contrib/tzdata/zone.tab
user/imp/tbemd/crypto/openssh/ChangeLog
user/imp/tbemd/crypto/openssh/INSTALL
user/imp/tbemd/crypto/openssh/PROTOCOL
user/imp/tbemd/crypto/openssh/PROTOCOL.agent
user/imp/tbemd/crypto/openssh/README
user/imp/tbemd/crypto/openssh/addrmatch.c
user/imp/tbemd/crypto/openssh/auth-krb5.c
user/imp/tbemd/crypto/openssh/auth-options.c
user/imp/tbemd/crypto/openssh/auth-options.h
user/imp/tbemd/crypto/openssh/auth-rh-rsa.c
user/imp/tbemd/crypto/openssh/auth-rhosts.c
user/imp/tbemd/crypto/openssh/auth-rsa.c
user/imp/tbemd/crypto/openssh/auth.c
user/imp/tbemd/crypto/openssh/auth.h
user/imp/tbemd/crypto/openssh/auth2-hostbased.c
user/imp/tbemd/crypto/openssh/auth2-pubkey.c
user/imp/tbemd/crypto/openssh/authfd.c
user/imp/tbemd/crypto/openssh/authfd.h
user/imp/tbemd/crypto/openssh/authfile.c
user/imp/tbemd/crypto/openssh/authfile.h
user/imp/tbemd/crypto/openssh/bufaux.c
user/imp/tbemd/crypto/openssh/buffer.c
user/imp/tbemd/crypto/openssh/buffer.h
user/imp/tbemd/crypto/openssh/canohost.c
user/imp/tbemd/crypto/openssh/channels.c
user/imp/tbemd/crypto/openssh/channels.h
user/imp/tbemd/crypto/openssh/clientloop.c
user/imp/tbemd/crypto/openssh/clientloop.h
user/imp/tbemd/crypto/openssh/config.guess
user/imp/tbemd/crypto/openssh/config.h
user/imp/tbemd/crypto/openssh/config.h.in
user/imp/tbemd/crypto/openssh/defines.h
user/imp/tbemd/crypto/openssh/dh.c
user/imp/tbemd/crypto/openssh/dns.c
user/imp/tbemd/crypto/openssh/dns.h
user/imp/tbemd/crypto/openssh/hostfile.c
user/imp/tbemd/crypto/openssh/hostfile.h
user/imp/tbemd/crypto/openssh/kex.c
user/imp/tbemd/crypto/openssh/kex.h
user/imp/tbemd/crypto/openssh/kexdhs.c
user/imp/tbemd/crypto/openssh/kexgexs.c
user/imp/tbemd/crypto/openssh/key.c
user/imp/tbemd/crypto/openssh/key.h
user/imp/tbemd/crypto/openssh/loginrec.c
user/imp/tbemd/crypto/openssh/match.h
user/imp/tbemd/crypto/openssh/misc.c
user/imp/tbemd/crypto/openssh/misc.h
user/imp/tbemd/crypto/openssh/monitor.c
user/imp/tbemd/crypto/openssh/monitor_fdpass.c
user/imp/tbemd/crypto/openssh/monitor_wrap.c
user/imp/tbemd/crypto/openssh/mux.c
user/imp/tbemd/crypto/openssh/myproposal.h
user/imp/tbemd/crypto/openssh/nchan.c
user/imp/tbemd/crypto/openssh/openbsd-compat/bsd-cygwin_util.c
user/imp/tbemd/crypto/openssh/openbsd-compat/openbsd-compat.h
user/imp/tbemd/crypto/openssh/openbsd-compat/openssl-compat.c
user/imp/tbemd/crypto/openssh/openbsd-compat/port-aix.c
user/imp/tbemd/crypto/openssh/openbsd-compat/port-aix.h
user/imp/tbemd/crypto/openssh/openbsd-compat/port-linux.c
user/imp/tbemd/crypto/openssh/openbsd-compat/port-linux.h
user/imp/tbemd/crypto/openssh/openbsd-compat/readpassphrase.c
user/imp/tbemd/crypto/openssh/pathnames.h
user/imp/tbemd/crypto/openssh/platform.c
user/imp/tbemd/crypto/openssh/platform.h
user/imp/tbemd/crypto/openssh/readconf.c
user/imp/tbemd/crypto/openssh/readconf.h
user/imp/tbemd/crypto/openssh/roaming.h
user/imp/tbemd/crypto/openssh/roaming_common.c
user/imp/tbemd/crypto/openssh/scp.1
user/imp/tbemd/crypto/openssh/scp.c
user/imp/tbemd/crypto/openssh/servconf.c
user/imp/tbemd/crypto/openssh/servconf.h
user/imp/tbemd/crypto/openssh/session.c
user/imp/tbemd/crypto/openssh/sftp-client.c
user/imp/tbemd/crypto/openssh/sftp-client.h
user/imp/tbemd/crypto/openssh/sftp-common.c
user/imp/tbemd/crypto/openssh/sftp-common.h
user/imp/tbemd/crypto/openssh/sftp-server.8
user/imp/tbemd/crypto/openssh/sftp-server.c
user/imp/tbemd/crypto/openssh/sftp.1
user/imp/tbemd/crypto/openssh/sftp.c
user/imp/tbemd/crypto/openssh/ssh-add.1
user/imp/tbemd/crypto/openssh/ssh-add.c
user/imp/tbemd/crypto/openssh/ssh-agent.1
user/imp/tbemd/crypto/openssh/ssh-agent.c
user/imp/tbemd/crypto/openssh/ssh-dss.c
user/imp/tbemd/crypto/openssh/ssh-keygen.1
user/imp/tbemd/crypto/openssh/ssh-keygen.c
user/imp/tbemd/crypto/openssh/ssh-keyscan.1
user/imp/tbemd/crypto/openssh/ssh-keyscan.c
user/imp/tbemd/crypto/openssh/ssh-keysign.c
user/imp/tbemd/crypto/openssh/ssh-rand-helper.c
user/imp/tbemd/crypto/openssh/ssh-rsa.c
user/imp/tbemd/crypto/openssh/ssh.1
user/imp/tbemd/crypto/openssh/ssh.c
user/imp/tbemd/crypto/openssh/ssh2.h
user/imp/tbemd/crypto/openssh/ssh_config
user/imp/tbemd/crypto/openssh/ssh_config.5
user/imp/tbemd/crypto/openssh/ssh_namespace.h
user/imp/tbemd/crypto/openssh/sshconnect.c
user/imp/tbemd/crypto/openssh/sshconnect2.c
user/imp/tbemd/crypto/openssh/sshd.8
user/imp/tbemd/crypto/openssh/sshd.c
user/imp/tbemd/crypto/openssh/sshd_config
user/imp/tbemd/crypto/openssh/sshd_config.5
user/imp/tbemd/crypto/openssh/sshpty.h
user/imp/tbemd/crypto/openssh/sshtty.c
user/imp/tbemd/crypto/openssh/version.h
user/imp/tbemd/crypto/openssl/CHANGES
user/imp/tbemd/crypto/openssl/Configure
user/imp/tbemd/crypto/openssl/FAQ
user/imp/tbemd/crypto/openssl/Makefile
user/imp/tbemd/crypto/openssl/Makefile.org
user/imp/tbemd/crypto/openssl/NEWS
user/imp/tbemd/crypto/openssl/README
user/imp/tbemd/crypto/openssl/apps/CA.sh
user/imp/tbemd/crypto/openssl/apps/Makefile
user/imp/tbemd/crypto/openssl/apps/apps.c
user/imp/tbemd/crypto/openssl/apps/ca.c
user/imp/tbemd/crypto/openssl/apps/dsa.c
user/imp/tbemd/crypto/openssl/apps/dsaparam.c
user/imp/tbemd/crypto/openssl/apps/enc.c
user/imp/tbemd/crypto/openssl/apps/gendsa.c
user/imp/tbemd/crypto/openssl/apps/genrsa.c
user/imp/tbemd/crypto/openssl/apps/openssl.c
user/imp/tbemd/crypto/openssl/apps/pkcs12.c
user/imp/tbemd/crypto/openssl/apps/req.c
user/imp/tbemd/crypto/openssl/apps/s_apps.h
user/imp/tbemd/crypto/openssl/apps/s_cb.c
user/imp/tbemd/crypto/openssl/apps/s_client.c
user/imp/tbemd/crypto/openssl/apps/s_server.c
user/imp/tbemd/crypto/openssl/apps/s_socket.c
user/imp/tbemd/crypto/openssl/apps/speed.c
user/imp/tbemd/crypto/openssl/apps/x509.c
user/imp/tbemd/crypto/openssl/config
user/imp/tbemd/crypto/openssl/crypto/aes/aes_cfb.c
user/imp/tbemd/crypto/openssl/crypto/aes/asm/aes-x86_64.pl
user/imp/tbemd/crypto/openssl/crypto/asn1/a_mbstr.c
user/imp/tbemd/crypto/openssl/crypto/asn1/a_object.c
user/imp/tbemd/crypto/openssl/crypto/asn1/asn1.h
user/imp/tbemd/crypto/openssl/crypto/asn1/asn1_err.c
user/imp/tbemd/crypto/openssl/crypto/asn1/asn1_gen.c
user/imp/tbemd/crypto/openssl/crypto/asn1/asn1_par.c
user/imp/tbemd/crypto/openssl/crypto/asn1/t_x509.c
user/imp/tbemd/crypto/openssl/crypto/bio/bio.h
user/imp/tbemd/crypto/openssl/crypto/bio/bss_dgram.c
user/imp/tbemd/crypto/openssl/crypto/bio/bss_file.c
user/imp/tbemd/crypto/openssl/crypto/bn/asm/ppc.pl
user/imp/tbemd/crypto/openssl/crypto/bn/asm/x86_64-gcc.c
user/imp/tbemd/crypto/openssl/crypto/bn/bn_div.c
user/imp/tbemd/crypto/openssl/crypto/bn/bn_exp.c
user/imp/tbemd/crypto/openssl/crypto/bn/bn_gf2m.c
user/imp/tbemd/crypto/openssl/crypto/bn/bn_mul.c
user/imp/tbemd/crypto/openssl/crypto/bn/bntest.c
user/imp/tbemd/crypto/openssl/crypto/camellia/Makefile
user/imp/tbemd/crypto/openssl/crypto/cast/c_cfb64.c
user/imp/tbemd/crypto/openssl/crypto/cast/c_ecb.c
user/imp/tbemd/crypto/openssl/crypto/cast/c_enc.c
user/imp/tbemd/crypto/openssl/crypto/cast/c_ofb64.c
user/imp/tbemd/crypto/openssl/crypto/cast/cast.h
user/imp/tbemd/crypto/openssl/crypto/cms/cms_ess.c
user/imp/tbemd/crypto/openssl/crypto/cms/cms_lib.c
user/imp/tbemd/crypto/openssl/crypto/comp/c_zlib.c
user/imp/tbemd/crypto/openssl/crypto/cryptlib.c
user/imp/tbemd/crypto/openssl/crypto/dsa/Makefile
user/imp/tbemd/crypto/openssl/crypto/dsa/dsa_asn1.c
user/imp/tbemd/crypto/openssl/crypto/dsa/dsa_lib.c
user/imp/tbemd/crypto/openssl/crypto/dso/dso_dlfcn.c
user/imp/tbemd/crypto/openssl/crypto/ec/ec2_smpl.c
user/imp/tbemd/crypto/openssl/crypto/ecdsa/Makefile
user/imp/tbemd/crypto/openssl/crypto/ecdsa/ecs_ossl.c
user/imp/tbemd/crypto/openssl/crypto/ecdsa/ecs_sign.c
user/imp/tbemd/crypto/openssl/crypto/engine/Makefile
user/imp/tbemd/crypto/openssl/crypto/engine/eng_all.c
user/imp/tbemd/crypto/openssl/crypto/engine/eng_cnf.c
user/imp/tbemd/crypto/openssl/crypto/engine/eng_cryptodev.c
user/imp/tbemd/crypto/openssl/crypto/engine/eng_ctrl.c
user/imp/tbemd/crypto/openssl/crypto/engine/eng_err.c
user/imp/tbemd/crypto/openssl/crypto/engine/eng_table.c
user/imp/tbemd/crypto/openssl/crypto/engine/engine.h
user/imp/tbemd/crypto/openssl/crypto/err/Makefile
user/imp/tbemd/crypto/openssl/crypto/err/err_all.c
user/imp/tbemd/crypto/openssl/crypto/evp/c_allc.c
user/imp/tbemd/crypto/openssl/crypto/evp/c_alld.c
user/imp/tbemd/crypto/openssl/crypto/evp/digest.c
user/imp/tbemd/crypto/openssl/crypto/evp/evp_lib.c
user/imp/tbemd/crypto/openssl/crypto/evp/evp_locl.h
user/imp/tbemd/crypto/openssl/crypto/evp/names.c
user/imp/tbemd/crypto/openssl/crypto/lhash/lhash.c
user/imp/tbemd/crypto/openssl/crypto/md32_common.h
user/imp/tbemd/crypto/openssl/crypto/md5/asm/md5-x86_64.pl
user/imp/tbemd/crypto/openssl/crypto/o_init.c
user/imp/tbemd/crypto/openssl/crypto/o_str.c
user/imp/tbemd/crypto/openssl/crypto/objects/obj_dat.c
user/imp/tbemd/crypto/openssl/crypto/objects/obj_dat.h
user/imp/tbemd/crypto/openssl/crypto/objects/obj_mac.h
user/imp/tbemd/crypto/openssl/crypto/objects/obj_mac.num
user/imp/tbemd/crypto/openssl/crypto/objects/objects.txt
user/imp/tbemd/crypto/openssl/crypto/ocsp/ocsp_prn.c
user/imp/tbemd/crypto/openssl/crypto/opensslv.h
user/imp/tbemd/crypto/openssl/crypto/pem/pem_seal.c
user/imp/tbemd/crypto/openssl/crypto/perlasm/x86_64-xlate.pl
user/imp/tbemd/crypto/openssl/crypto/pkcs12/p12_attr.c
user/imp/tbemd/crypto/openssl/crypto/pkcs12/p12_key.c
user/imp/tbemd/crypto/openssl/crypto/pkcs12/p12_utl.c
user/imp/tbemd/crypto/openssl/crypto/pkcs12/pkcs12.h
user/imp/tbemd/crypto/openssl/crypto/pkcs7/pk7_mime.c
user/imp/tbemd/crypto/openssl/crypto/rand/rand_win.c
user/imp/tbemd/crypto/openssl/crypto/rand/randfile.c
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa.h
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa_eay.c
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa_eng.c
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa_oaep.c
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa_pss.c
user/imp/tbemd/crypto/openssl/crypto/rsa/rsa_sign.c
user/imp/tbemd/crypto/openssl/crypto/sha/sha512.c
user/imp/tbemd/crypto/openssl/crypto/stack/safestack.h
user/imp/tbemd/crypto/openssl/crypto/symhacks.h
user/imp/tbemd/crypto/openssl/crypto/ui/ui_openssl.c
user/imp/tbemd/crypto/openssl/crypto/x509/by_dir.c
user/imp/tbemd/crypto/openssl/crypto/x509/x509.h
user/imp/tbemd/crypto/openssl/crypto/x509/x509_lu.c
user/imp/tbemd/crypto/openssl/crypto/x509/x509_vfy.c
user/imp/tbemd/crypto/openssl/crypto/x509/x509_vfy.h
user/imp/tbemd/crypto/openssl/crypto/x509/x509_vpm.c
user/imp/tbemd/crypto/openssl/crypto/x509v3/pcy_tree.c
user/imp/tbemd/crypto/openssl/crypto/x509v3/v3_alt.c
user/imp/tbemd/crypto/openssl/crypto/x509v3/v3_ocsp.c
user/imp/tbemd/crypto/openssl/demos/x509/mkcert.c
user/imp/tbemd/crypto/openssl/demos/x509/mkreq.c
user/imp/tbemd/crypto/openssl/doc/apps/enc.pod
user/imp/tbemd/crypto/openssl/doc/apps/verify.pod
user/imp/tbemd/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod
user/imp/tbemd/crypto/openssl/doc/crypto/EVP_DigestInit.pod
user/imp/tbemd/crypto/openssl/doc/crypto/PKCS12_parse.pod
user/imp/tbemd/crypto/openssl/doc/crypto/bn_internal.pod
user/imp/tbemd/crypto/openssl/doc/crypto/d2i_X509.pod
user/imp/tbemd/crypto/openssl/doc/crypto/d2i_X509_CRL.pod
user/imp/tbemd/crypto/openssl/doc/crypto/d2i_X509_REQ.pod
user/imp/tbemd/crypto/openssl/doc/crypto/hmac.pod
user/imp/tbemd/crypto/openssl/doc/crypto/pem.pod
user/imp/tbemd/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod
user/imp/tbemd/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod
user/imp/tbemd/crypto/openssl/engines/Makefile
user/imp/tbemd/crypto/openssl/engines/e_capi.c
user/imp/tbemd/crypto/openssl/engines/e_capi_err.c
user/imp/tbemd/crypto/openssl/engines/e_capi_err.h
user/imp/tbemd/crypto/openssl/engines/e_chil.c
user/imp/tbemd/crypto/openssl/engines/e_ubsec.c
user/imp/tbemd/crypto/openssl/fips/Makefile
user/imp/tbemd/crypto/openssl/fips/aes/fips_aesavs.c
user/imp/tbemd/crypto/openssl/fips/des/fips_desmovs.c
user/imp/tbemd/crypto/openssl/fips/dsa/fips_dsa_key.c
user/imp/tbemd/crypto/openssl/fips/dsa/fips_dsa_sign.c
user/imp/tbemd/crypto/openssl/fips/dsa/fips_dsatest.c
user/imp/tbemd/crypto/openssl/fips/dsa/fips_dssvs.c
user/imp/tbemd/crypto/openssl/fips/fips_locl.h
user/imp/tbemd/crypto/openssl/fips/fips_test_suite.c
user/imp/tbemd/crypto/openssl/fips/fips_utl.h
user/imp/tbemd/crypto/openssl/fips/fipsalgtest.pl
user/imp/tbemd/crypto/openssl/fips/fipsld
user/imp/tbemd/crypto/openssl/fips/hmac/fips_hmac.c
user/imp/tbemd/crypto/openssl/fips/hmac/fips_hmac_selftest.c
user/imp/tbemd/crypto/openssl/fips/rand/fips_rand.c
user/imp/tbemd/crypto/openssl/fips/rand/fips_rngvs.c
user/imp/tbemd/crypto/openssl/fips/rsa/fips_rsagtest.c
user/imp/tbemd/crypto/openssl/fips/rsa/fips_rsastest.c
user/imp/tbemd/crypto/openssl/fips/rsa/fips_rsavtest.c
user/imp/tbemd/crypto/openssl/fips/sha/Makefile
user/imp/tbemd/crypto/openssl/fips/sha/fips_sha1_selftest.c
user/imp/tbemd/crypto/openssl/openssl.spec
user/imp/tbemd/crypto/openssl/ssl/Makefile
user/imp/tbemd/crypto/openssl/ssl/d1_both.c
user/imp/tbemd/crypto/openssl/ssl/d1_clnt.c
user/imp/tbemd/crypto/openssl/ssl/d1_enc.c
user/imp/tbemd/crypto/openssl/ssl/d1_lib.c
user/imp/tbemd/crypto/openssl/ssl/d1_pkt.c
user/imp/tbemd/crypto/openssl/ssl/d1_srvr.c
user/imp/tbemd/crypto/openssl/ssl/dtls1.h
user/imp/tbemd/crypto/openssl/ssl/kssl.c
user/imp/tbemd/crypto/openssl/ssl/s23_clnt.c
user/imp/tbemd/crypto/openssl/ssl/s23_srvr.c
user/imp/tbemd/crypto/openssl/ssl/s2_srvr.c
user/imp/tbemd/crypto/openssl/ssl/s3_both.c
user/imp/tbemd/crypto/openssl/ssl/s3_clnt.c
user/imp/tbemd/crypto/openssl/ssl/s3_lib.c
user/imp/tbemd/crypto/openssl/ssl/s3_pkt.c
user/imp/tbemd/crypto/openssl/ssl/s3_srvr.c
user/imp/tbemd/crypto/openssl/ssl/ssl.h
user/imp/tbemd/crypto/openssl/ssl/ssl3.h
user/imp/tbemd/crypto/openssl/ssl/ssl_algs.c
user/imp/tbemd/crypto/openssl/ssl/ssl_asn1.c
user/imp/tbemd/crypto/openssl/ssl/ssl_cert.c
user/imp/tbemd/crypto/openssl/ssl/ssl_ciph.c
user/imp/tbemd/crypto/openssl/ssl/ssl_err.c
user/imp/tbemd/crypto/openssl/ssl/ssl_lib.c
user/imp/tbemd/crypto/openssl/ssl/ssl_locl.h
user/imp/tbemd/crypto/openssl/ssl/ssl_rsa.c
user/imp/tbemd/crypto/openssl/ssl/ssl_sess.c
user/imp/tbemd/crypto/openssl/ssl/ssl_stat.c
user/imp/tbemd/crypto/openssl/ssl/ssl_txt.c
user/imp/tbemd/crypto/openssl/ssl/t1_enc.c
user/imp/tbemd/crypto/openssl/ssl/t1_lib.c
user/imp/tbemd/crypto/openssl/ssl/tls1.h
user/imp/tbemd/crypto/openssl/test/Makefile
user/imp/tbemd/crypto/openssl/test/cms-test.pl
user/imp/tbemd/crypto/openssl/util/domd
user/imp/tbemd/crypto/openssl/util/libeay.num
user/imp/tbemd/crypto/openssl/util/mk1mf.pl
user/imp/tbemd/crypto/openssl/util/mkdef.pl
user/imp/tbemd/crypto/openssl/util/mkerr.pl
user/imp/tbemd/crypto/openssl/util/pl/Mingw32.pl
user/imp/tbemd/crypto/openssl/util/pl/VC-32.pl
user/imp/tbemd/crypto/openssl/util/pod2man.pl
user/imp/tbemd/crypto/openssl/util/shlib_wrap.sh
Directory Properties:
user/imp/tbemd/contrib/bind9/ (props changed)
user/imp/tbemd/contrib/netcat/ (props changed)
user/imp/tbemd/contrib/openpam/ (props changed)
user/imp/tbemd/contrib/tzcode/stdtime/ (props changed)
user/imp/tbemd/contrib/tzcode/zic/ (props changed)
user/imp/tbemd/contrib/tzdata/ (props changed)
user/imp/tbemd/crypto/openssh/ (props changed)
user/imp/tbemd/crypto/openssl/ (props changed)
Modified: user/imp/tbemd/bin/cp/utils.c
==============================================================================
--- user/imp/tbemd/bin/cp/utils.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/cp/utils.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -323,8 +323,8 @@ setfile(struct stat *fs, int fd)
fs->st_mode &= S_ISUID | S_ISGID | S_ISVTX |
S_IRWXU | S_IRWXG | S_IRWXO;
- TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atimespec);
- TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtimespec);
+ TIMESPEC_TO_TIMEVAL(&tv[0], &fs->st_atim);
+ TIMESPEC_TO_TIMEVAL(&tv[1], &fs->st_mtim);
if (islink ? lutimes(to.p_path, tv) : utimes(to.p_path, tv)) {
warn("%sutimes: %s", islink ? "l" : "", to.p_path);
rval = 1;
Modified: user/imp/tbemd/bin/ls/cmp.c
==============================================================================
--- user/imp/tbemd/bin/ls/cmp.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/ls/cmp.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -66,17 +66,17 @@ int
modcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_mtimespec.tv_sec >
- a->fts_statp->st_mtimespec.tv_sec)
+ if (b->fts_statp->st_mtim.tv_sec >
+ a->fts_statp->st_mtim.tv_sec)
return (1);
- if (b->fts_statp->st_mtimespec.tv_sec <
- a->fts_statp->st_mtimespec.tv_sec)
+ if (b->fts_statp->st_mtim.tv_sec <
+ a->fts_statp->st_mtim.tv_sec)
return (-1);
- if (b->fts_statp->st_mtimespec.tv_nsec >
- a->fts_statp->st_mtimespec.tv_nsec)
+ if (b->fts_statp->st_mtim.tv_nsec >
+ a->fts_statp->st_mtim.tv_nsec)
return (1);
- if (b->fts_statp->st_mtimespec.tv_nsec <
- a->fts_statp->st_mtimespec.tv_nsec)
+ if (b->fts_statp->st_mtim.tv_nsec <
+ a->fts_statp->st_mtim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -92,17 +92,17 @@ int
acccmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_atimespec.tv_sec >
- a->fts_statp->st_atimespec.tv_sec)
+ if (b->fts_statp->st_atim.tv_sec >
+ a->fts_statp->st_atim.tv_sec)
return (1);
- if (b->fts_statp->st_atimespec.tv_sec <
- a->fts_statp->st_atimespec.tv_sec)
+ if (b->fts_statp->st_atim.tv_sec <
+ a->fts_statp->st_atim.tv_sec)
return (-1);
- if (b->fts_statp->st_atimespec.tv_nsec >
- a->fts_statp->st_atimespec.tv_nsec)
+ if (b->fts_statp->st_atim.tv_nsec >
+ a->fts_statp->st_atim.tv_nsec)
return (1);
- if (b->fts_statp->st_atimespec.tv_nsec <
- a->fts_statp->st_atimespec.tv_nsec)
+ if (b->fts_statp->st_atim.tv_nsec <
+ a->fts_statp->st_atim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -118,17 +118,17 @@ int
birthcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_birthtimespec.tv_sec >
- a->fts_statp->st_birthtimespec.tv_sec)
+ if (b->fts_statp->st_birthtim.tv_sec >
+ a->fts_statp->st_birthtim.tv_sec)
return (1);
- if (b->fts_statp->st_birthtimespec.tv_sec <
- a->fts_statp->st_birthtimespec.tv_sec)
+ if (b->fts_statp->st_birthtim.tv_sec <
+ a->fts_statp->st_birthtim.tv_sec)
return (-1);
- if (b->fts_statp->st_birthtimespec.tv_nsec >
- a->fts_statp->st_birthtimespec.tv_nsec)
+ if (b->fts_statp->st_birthtim.tv_nsec >
+ a->fts_statp->st_birthtim.tv_nsec)
return (1);
- if (b->fts_statp->st_birthtimespec.tv_nsec <
- a->fts_statp->st_birthtimespec.tv_nsec)
+ if (b->fts_statp->st_birthtim.tv_nsec <
+ a->fts_statp->st_birthtim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
@@ -144,17 +144,17 @@ int
statcmp(const FTSENT *a, const FTSENT *b)
{
- if (b->fts_statp->st_ctimespec.tv_sec >
- a->fts_statp->st_ctimespec.tv_sec)
+ if (b->fts_statp->st_ctim.tv_sec >
+ a->fts_statp->st_ctim.tv_sec)
return (1);
- if (b->fts_statp->st_ctimespec.tv_sec <
- a->fts_statp->st_ctimespec.tv_sec)
+ if (b->fts_statp->st_ctim.tv_sec <
+ a->fts_statp->st_ctim.tv_sec)
return (-1);
- if (b->fts_statp->st_ctimespec.tv_nsec >
- a->fts_statp->st_ctimespec.tv_nsec)
+ if (b->fts_statp->st_ctim.tv_nsec >
+ a->fts_statp->st_ctim.tv_nsec)
return (1);
- if (b->fts_statp->st_ctimespec.tv_nsec <
- a->fts_statp->st_ctimespec.tv_nsec)
+ if (b->fts_statp->st_ctim.tv_nsec <
+ a->fts_statp->st_ctim.tv_nsec)
return (-1);
return (strcoll(a->fts_name, b->fts_name));
}
Modified: user/imp/tbemd/bin/pax/Makefile
==============================================================================
--- user/imp/tbemd/bin/pax/Makefile Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/pax/Makefile Mon Apr 12 23:04:38 2010 (r206516)
@@ -29,8 +29,5 @@ PROG= pax
SRCS= ar_io.c ar_subs.c buf_subs.c cache.c cpio.c file_subs.c ftree.c \
gen_subs.c getoldopt.c options.c pat_rep.c pax.c sel_subs.c \
tables.c tar.c tty_subs.c
-#XXX NOTYET
-#MAN= pax.1 tar.1 cpio.1
-#LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
.include <bsd.prog.mk>
Modified: user/imp/tbemd/bin/pax/getoldopt.c
==============================================================================
--- user/imp/tbemd/bin/pax/getoldopt.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/pax/getoldopt.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -1,4 +1,4 @@
-/* $OpenBSD: getoldopt.c,v 1.4 2000/01/22 20:24:51 deraadt Exp $ */
+/* $OpenBSD: getoldopt.c,v 1.9 2009/10/27 23:59:22 deraadt Exp $ */
/* $NetBSD: getoldopt.c,v 1.3 1995/03/21 09:07:28 cgd Exp $ */
/*-
@@ -7,7 +7,7 @@
* otherwise, it uses the old rules used by tar, dump, and ps.
*
* Written 25 August 1985 by John Gilmore (ihnp4!hoptoad!gnu) and placed
- * in the Pubic Domain for your edification and enjoyment.
+ * in the Public Domain for your edification and enjoyment.
*/
#include <sys/cdefs.h>
@@ -33,7 +33,8 @@ getoldopt(int argc, char **argv, const c
optarg = NULL;
if (key == NULL) { /* First time */
- if (argc < 2) return EOF;
+ if (argc < 2)
+ return (-1);
key = argv[1];
if (*key == '-')
use_getopt++;
@@ -42,18 +43,18 @@ getoldopt(int argc, char **argv, const c
}
if (use_getopt)
- return getopt(argc, argv, optstring);
+ return (getopt(argc, argv, optstring));
c = *key++;
if (c == '\0') {
key--;
- return EOF;
+ return (-1);
}
place = strchr(optstring, c);
if (place == NULL || c == ':') {
fprintf(stderr, "%s: unknown option %c\n", argv[0], c);
- return('?');
+ return ('?');
}
place++;
@@ -64,9 +65,9 @@ getoldopt(int argc, char **argv, const c
} else {
fprintf(stderr, "%s: %c argument missing\n",
argv[0], c);
- return('?');
+ return ('?');
}
}
- return(c);
+ return (c);
}
Modified: user/imp/tbemd/bin/ps/extern.h
==============================================================================
--- user/imp/tbemd/bin/ps/extern.h Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/ps/extern.h Mon Apr 12 23:04:38 2010 (r206516)
@@ -48,6 +48,7 @@ void command(KINFO *, VARENT *);
void cputime(KINFO *, VARENT *);
int donlist(void);
void elapsed(KINFO *, VARENT *);
+void elapseds(KINFO *, VARENT *);
void emulname(KINFO *, VARENT *);
VARENT *find_varentry(VAR *);
const char *fmt_argv(char **, char *, size_t);
Modified: user/imp/tbemd/bin/ps/keyword.c
==============================================================================
--- user/imp/tbemd/bin/ps/keyword.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/ps/keyword.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -89,6 +89,7 @@ static VAR var[] = {
{"emul", "EMUL", NULL, LJUST, emulname, NULL, EMULLEN, 0, CHAR,
NULL, 0},
{"etime", "ELAPSED", NULL, USER, elapsed, NULL, 12, 0, CHAR, NULL, 0},
+ {"etimes", "ELAPSED", NULL, USER, elapseds, NULL, 12, 0, CHAR, NULL, 0},
{"f", "F", NULL, 0, kvar, NULL, 7, KOFF(ki_flag), INT, "x", 0},
{"flags", "", "f", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
{"ignored", "", "sigignore", 0, NULL, NULL, 0, 0, CHAR, NULL, 0},
Modified: user/imp/tbemd/bin/ps/print.c
==============================================================================
--- user/imp/tbemd/bin/ps/print.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/ps/print.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$");
#include <nlist.h>
#include <pwd.h>
#include <stddef.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -618,6 +619,21 @@ elapsed(KINFO *k, VARENT *ve)
(void)printf("%*s", v->width, obuff);
}
+void
+elapseds(KINFO *k, VARENT *ve)
+{
+ VAR *v;
+ time_t val;
+
+ v = ve->var;
+ if (!k->ki_valid) {
+ (void)printf("%-*s", v->width, "-");
+ return;
+ }
+ val = now - k->ki_p->ki_start.tv_sec;
+ (void)printf("%*jd", v->width, (intmax_t)val);
+}
+
double
getpcpu(const KINFO *k)
{
Modified: user/imp/tbemd/bin/ps/ps.1
==============================================================================
--- user/imp/tbemd/bin/ps/ps.1 Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/ps/ps.1 Mon Apr 12 23:04:38 2010 (r206516)
@@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd July 9, 2009
+.Dd March 17, 2010
.Dt PS 1
.Os
.Sh NAME
@@ -284,11 +284,10 @@ The percentage of real memory used by th
The flags associated with the process as in
the include file
.In sys/proc.h :
-.Bl -column P_STOPPED_SINGLE 0x4000000
+.Bl -column P_SINGLE_BOUNDARY 0x40000000
.It Dv "P_ADVLOCK" Ta No "0x00001 Process may hold a POSIX advisory lock"
.It Dv "P_CONTROLT" Ta No "0x00002 Has a controlling terminal"
.It Dv "P_KTHREAD" Ta No "0x00004 Kernel thread"
-.It Dv "P_NOLOAD" Ta No "0x00008 Ignore during load avg calculations"
.It Dv "P_PPWAIT" Ta No "0x00010 Parent is waiting for child to exec/exit"
.It Dv "P_PROFIL" Ta No "0x00020 Has started profiling"
.It Dv "P_STOPPROF" Ta No "0x00040 Has thread in requesting to stop prof"
@@ -305,8 +304,14 @@ the include file
.It Dv "P_STOPPED_SINGLE" Ta No "0x80000 Only one thread can continue"
.It Dv "P_PROTECTED" Ta No "0x100000 Do not kill on memory overcommit"
.It Dv "P_SIGEVENT" Ta No "0x200000 Process pending signals changed"
+.It Dv "P_SINGLE_BOUNDARY" Ta No "0x400000 Threads should suspend at user boundary"
+.It Dv "P_HWPMC" Ta No "0x800000 Process is using HWPMCs"
.It Dv "P_JAILED" Ta No "0x1000000 Process is in jail"
.It Dv "P_INEXEC" Ta No "0x4000000 Process is in execve()"
+.It Dv "P_STATCHILD" Ta No "0x8000000 Child process stopped or exited"
+.It Dv "P_INMEM" Ta No "0x10000000 Loaded into memory"
+.It Dv "P_SWAPPINGOUT" Ta No "0x20000000 Process is being swapped out"
+.It Dv "P_SWAPPINGIN" Ta No "0x40000000 Process is being swapped in"
.El
.It Cm label
The MAC label of the process.
@@ -474,7 +479,12 @@ command and arguments
.It Cm cpu
short-term CPU usage factor (for scheduling)
.It Cm etime
-elapsed running time
+elapsed running time, format
+.Op days- Ns
+.Op hours: Ns
+minutes:seconds.
+.It Cm etimes
+elapsed running time, in decimal integer seconds
.It Cm flags
the process flags, in hexadecimal (alias
.Cm f )
@@ -615,6 +625,13 @@ wait channel (as a symbolic name)
.It Cm xstat
exit or stop status (valid only for stopped or zombie process)
.El
+.Pp
+Note that the
+.Cm pending
+column displays bitmask of signals pending in the process queue when
+.Fl H
+option is not specified, otherwise the per-thread queue of pending signals
+is shown.
.Sh ENVIRONMENT
The following environment variables affect the execution of
.Nm :
Modified: user/imp/tbemd/bin/rcp/rcp.c
==============================================================================
--- user/imp/tbemd/bin/rcp/rcp.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/rcp/rcp.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -390,8 +390,8 @@ syserr: run_err("%s: %s", name, strerr
* versions expecting microseconds.
*/
(void)snprintf(buf, sizeof(buf), "T%ld 0 %ld 0\n",
- (long)stb.st_mtimespec.tv_sec,
- (long)stb.st_atimespec.tv_sec);
+ (long)stb.st_mtim.tv_sec,
+ (long)stb.st_atim.tv_sec);
(void)write(rem, buf, strlen(buf));
if (response() < 0)
goto next;
@@ -454,8 +454,8 @@ rsource(char *name, struct stat *statp)
last++;
if (pflag) {
(void)snprintf(path, sizeof(path), "T%ld 0 %ld 0\n",
- (long)statp->st_mtimespec.tv_sec,
- (long)statp->st_atimespec.tv_sec);
+ (long)statp->st_mtim.tv_sec,
+ (long)statp->st_atim.tv_sec);
(void)write(rem, path, strlen(path));
if (response() < 0) {
closedir(dirp);
Modified: user/imp/tbemd/bin/setfacl/file.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/file.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/file.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/setfacl/mask.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/mask.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/mask.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/setfacl/merge.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/merge.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/merge.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/setfacl/remove.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/remove.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/remove.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/setfacl/setfacl.1
==============================================================================
--- user/imp/tbemd/bin/setfacl/setfacl.1 Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/setfacl.1 Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
-.\" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-.\" POSSIBILITY OF SUCH DAMAGE.
+.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
.\"
.\" $FreeBSD$
.\"
Modified: user/imp/tbemd/bin/setfacl/setfacl.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/setfacl.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/setfacl.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/setfacl/setfacl.h
==============================================================================
--- user/imp/tbemd/bin/setfacl/setfacl.h Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/setfacl.h Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*
* $FreeBSD$
*/
Modified: user/imp/tbemd/bin/setfacl/util.c
==============================================================================
--- user/imp/tbemd/bin/setfacl/util.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/setfacl/util.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -14,14 +14,14 @@
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR THE VOICES IN HIS HEAD BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
*/
#include <sys/cdefs.h>
Modified: user/imp/tbemd/bin/sh/eval.c
==============================================================================
--- user/imp/tbemd/bin/sh/eval.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/eval.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -91,6 +91,7 @@ STATIC void evalloop(union node *, int);
STATIC void evalfor(union node *, int);
STATIC void evalcase(union node *, int);
STATIC void evalsubshell(union node *, int);
+STATIC void evalredir(union node *, int);
STATIC void expredir(union node *);
STATIC void evalpipe(union node *);
STATIC void evalcommand(union node *, int, struct backcmd *);
@@ -221,10 +222,7 @@ evaltree(union node *n, int flags)
evaltree(n->nbinary.ch2, flags);
break;
case NREDIR:
- expredir(n->nredir.redirect);
- redirect(n->nredir.redirect, REDIR_PUSH);
- evaltree(n->nredir.n, flags);
- popredir();
+ evalredir(n, flags);
break;
case NSUBSHELL:
evalsubshell(n, flags);
@@ -415,6 +413,46 @@ evalsubshell(union node *n, int flags)
}
+/*
+ * Evaluate a redirected compound command.
+ */
+
+STATIC void
+evalredir(union node *n, int flags)
+{
+ struct jmploc jmploc;
+ struct jmploc *savehandler;
+ volatile int in_redirect = 1;
+
+ expredir(n->nredir.redirect);
+ savehandler = handler;
+ if (setjmp(jmploc.loc)) {
+ int e;
+
+ handler = savehandler;
+ e = exception;
+ if (e == EXERROR || e == EXEXEC) {
+ popredir();
+ if (in_redirect) {
+ exitstatus = 2;
+ return;
+ }
+ }
+ longjmp(handler->loc, 1);
+ } else {
+ INTOFF;
+ handler = &jmploc;
+ redirect(n->nredir.redirect, REDIR_PUSH);
+ in_redirect = 0;
+ INTON;
+ evaltree(n->nredir.n, flags);
+ }
+ INTOFF;
+ handler = savehandler;
+ popredir();
+ INTON;
+}
+
/*
* Compute the names of the files in a redirection list.
@@ -597,6 +635,7 @@ evalcommand(union node *cmd, int flags,
char *lastarg;
int realstatus;
int do_clearcmdentry;
+ char *path = pathval();
/* First expand the arguments. */
TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags));
@@ -679,10 +718,10 @@ evalcommand(union node *cmd, int flags,
/* Variable assignment(s) without command */
cmdentry.cmdtype = CMDBUILTIN;
cmdentry.u.index = BLTINCMD;
- cmdentry.special = 1;
+ cmdentry.special = 0;
} else {
static const char PATH[] = "PATH=";
- char *path = pathval();
+ int cmd_flags = 0, bltinonly = 0;
/*
* Modify the command lookup path, if a PATH= assignment
@@ -713,24 +752,68 @@ evalcommand(union node *cmd, int flags,
do_clearcmdentry = 1;
}
- find_command(argv[0], &cmdentry, 0, path);
- /* implement the bltin builtin here */
- if (cmdentry.cmdtype == CMDBUILTIN && cmdentry.u.index == BLTINCMD) {
- for (;;) {
- argv++;
- if (--argc == 0)
- break;
- if ((cmdentry.u.index = find_builtin(*argv,
- &cmdentry.special)) < 0) {
+ for (;;) {
+ if (bltinonly) {
+ cmdentry.u.index = find_builtin(*argv, &cmdentry.special);
+ if (cmdentry.u.index < 0) {
cmdentry.u.index = BLTINCMD;
argv--;
argc++;
break;
}
- if (cmdentry.u.index != BLTINCMD)
+ } else
+ find_command(argv[0], &cmdentry, cmd_flags, path);
+ /* implement the bltin and command builtins here */
+ if (cmdentry.cmdtype != CMDBUILTIN)
+ break;
+ if (cmdentry.u.index == BLTINCMD) {
+ if (argc == 1)
break;
- }
+ argv++;
+ argc--;
+ bltinonly = 1;
+ } else if (cmdentry.u.index == COMMANDCMD) {
+ if (argc == 1)
+ break;
+ if (!strcmp(argv[1], "-p")) {
+ if (argc == 2)
+ break;
+ if (argv[2][0] == '-') {
+ if (strcmp(argv[2], "--"))
+ break;
+ if (argc == 3)
+ break;
+ argv += 3;
+ argc -= 3;
+ } else {
+ argv += 2;
+ argc -= 2;
+ }
+ path = _PATH_STDPATH;
+ clearcmdentry(0);
+ do_clearcmdentry = 1;
+ } else if (!strcmp(argv[1], "--")) {
+ if (argc == 2)
+ break;
+ argv += 2;
+ argc -= 2;
+ } else if (argv[1][0] == '-')
+ break;
+ else {
+ argv++;
+ argc--;
+ }
+ cmd_flags |= DO_NOFUNC;
+ bltinonly = 0;
+ } else
+ break;
}
+ /*
+ * Special builtins lose their special properties when
+ * called via 'command'.
+ */
+ if (cmd_flags & DO_NOFUNC)
+ cmdentry.special = 0;
}
/* Fork off a child process if necessary. */
@@ -741,9 +824,7 @@ evalcommand(union node *cmd, int flags,
&& (cmdentry.cmdtype != CMDBUILTIN
|| cmdentry.u.index == CDCMD
|| cmdentry.u.index == DOTCMD
- || cmdentry.u.index == EVALCMD))
- || (cmdentry.cmdtype == CMDBUILTIN &&
- cmdentry.u.index == COMMANDCMD)) {
+ || cmdentry.u.index == EVALCMD))) {
jp = makejob(cmd, 1);
mode = cmd->ncmd.backgnd;
if (flags & EV_BACKCMD) {
@@ -770,7 +851,6 @@ evalcommand(union node *cmd, int flags,
#ifdef DEBUG
trputs("Shell function: "); trargs(argv);
#endif
- redirect(cmd->ncmd.redirect, REDIR_PUSH);
saveparam = shellparam;
shellparam.malloc = 0;
shellparam.reset = 1;
@@ -788,6 +868,8 @@ evalcommand(union node *cmd, int flags,
else {
freeparam(&shellparam);
shellparam = saveparam;
+ if (exception == EXERROR || exception == EXEXEC)
+ popredir();
}
unreffunc(cmdentry.u.func);
poplocalvars();
@@ -798,6 +880,7 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
funcnest++;
+ redirect(cmd->ncmd.redirect, REDIR_PUSH);
INTON;
for (sp = varlist.list ; sp ; sp = sp->next)
mklocal(sp->text);
@@ -846,6 +929,12 @@ evalcommand(union node *cmd, int flags,
}
handler = &jmploc;
redirect(cmd->ncmd.redirect, mode);
+ /*
+ * If there is no command word, redirection errors should
+ * not be fatal but assignment errors should.
+ */
+ if (argc == 0 && !(flags & EV_BACKCMD))
+ cmdentry.special = 1;
if (cmdentry.special)
listsetvar(cmdenviron);
commandname = argv[0];
@@ -871,6 +960,9 @@ cmddone:
backcmd->nleft = memout.nextc - memout.buf;
memout.buf = NULL;
}
+ if (cmdentry.u.index != EXECCMD &&
+ (e == -1 || e == EXERROR || e == EXEXEC))
+ popredir();
if (e != -1) {
if ((e != EXERROR && e != EXEXEC)
|| cmdentry.special)
@@ -879,8 +971,6 @@ cmddone:
if (flags != EV_BACKCMD)
FORCEINTON;
}
- if (cmdentry.u.index != EXECCMD)
- popredir();
} else {
#ifdef DEBUG
trputs("normal command: "); trargs(argv);
@@ -889,7 +979,7 @@ cmddone:
for (sp = varlist.list ; sp ; sp = sp->next)
setvareq(sp->text, VEXPORT|VSTACK);
envp = environment();
- shellexec(argv, envp, pathval(), cmdentry.u.index);
+ shellexec(argv, envp, path, cmdentry.u.index);
/*NOTREACHED*/
}
goto out;
@@ -996,15 +1086,11 @@ int
commandcmd(int argc, char **argv)
{
static char stdpath[] = _PATH_STDPATH;
- struct jmploc loc, *old;
- struct strlist *sp;
char *path;
int ch;
int cmd = -1;
- for (sp = cmdenviron; sp ; sp = sp->next)
- setvareq(sp->text, VEXPORT|VSTACK);
- path = pathval();
+ path = bltinlookup("PATH", 1);
optind = optreset = 1;
opterr = 0;
@@ -1032,22 +1118,14 @@ commandcmd(int argc, char **argv)
error("wrong number of arguments");
return typecmd_impl(2, argv - 1, cmd, path);
}
- if (argc != 0) {
- old = handler;
- handler = &loc;
- if (setjmp(handler->loc) == 0)
- shellexec(argv, environment(), path, 0);
- handler = old;
- if (exception == EXEXEC)
- exit(exerrno);
- exraise(exception);
- }
+ if (argc != 0)
+ error("commandcmd() called while it should not be");
/*
* Do nothing successfully if no command was specified;
* ksh also does this.
*/
- exit(0);
+ return 0;
}
Modified: user/imp/tbemd/bin/sh/exec.c
==============================================================================
--- user/imp/tbemd/bin/sh/exec.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/exec.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -248,7 +248,7 @@ hashcmd(int argc __unused, char **argv _
&& (cmdp->cmdtype == CMDNORMAL
|| (cmdp->cmdtype == CMDBUILTIN && builtinloc >= 0)))
delete_cmd_entry();
- find_command(name, &entry, 1, pathval());
+ find_command(name, &entry, DO_ERR, pathval());
if (verbose) {
if (entry.cmdtype != CMDUNKNOWN) { /* if no error msg */
cmdp = cmdlookup(name, 0);
@@ -310,10 +310,10 @@ printentry(struct tblentry *cmdp, int ve
*/
void
-find_command(const char *name, struct cmdentry *entry, int printerr,
+find_command(const char *name, struct cmdentry *entry, int act,
const char *path)
{
- struct tblentry *cmdp;
+ struct tblentry *cmdp, loc_cmd;
int idx;
int prev;
char *fullname;
@@ -330,13 +330,19 @@ find_command(const char *name, struct cm
}
/* If name is in the table, and not invalidated by cd, we're done */
- if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0)
- goto success;
+ if ((cmdp = cmdlookup(name, 0)) != NULL && cmdp->rehash == 0) {
+ if (cmdp->cmdtype == CMDFUNCTION && act & DO_NOFUNC)
+ cmdp = NULL;
+ else
+ goto success;
+ }
/* If %builtin not in path, check for builtin next */
if (builtinloc < 0 && (i = find_builtin(name, &spec)) >= 0) {
INTOFF;
cmdp = cmdlookup(name, 1);
+ if (cmdp->cmdtype == CMDFUNCTION)
+ cmdp = &loc_cmd;
cmdp->cmdtype = CMDBUILTIN;
cmdp->param.index = i;
cmdp->special = spec;
@@ -365,6 +371,8 @@ loop:
goto loop;
INTOFF;
cmdp = cmdlookup(name, 1);
+ if (cmdp->cmdtype == CMDFUNCTION)
+ cmdp = &loc_cmd;
cmdp->cmdtype = CMDBUILTIN;
cmdp->param.index = i;
cmdp->special = spec;
@@ -414,6 +422,8 @@ loop:
TRACE(("searchexec \"%s\" returns \"%s\"\n", name, fullname));
INTOFF;
cmdp = cmdlookup(name, 1);
+ if (cmdp->cmdtype == CMDFUNCTION)
+ cmdp = &loc_cmd;
cmdp->cmdtype = CMDNORMAL;
cmdp->param.index = idx;
INTON;
@@ -421,9 +431,9 @@ loop:
}
/* We failed. If there was an entry for this command, delete it */
- if (cmdp)
+ if (cmdp && cmdp->cmdtype != CMDFUNCTION)
delete_cmd_entry();
- if (printerr) {
+ if (act & DO_ERR) {
if (e == ENOENT || e == ENOTDIR)
outfmt(out2, "%s: not found\n", name);
else
Modified: user/imp/tbemd/bin/sh/exec.h
==============================================================================
--- user/imp/tbemd/bin/sh/exec.h Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/exec.h Mon Apr 12 23:04:38 2010 (r206516)
@@ -57,6 +57,10 @@ struct cmdentry {
};
+/* action to find_command() */
+#define DO_ERR 0x01 /* prints errors */
+#define DO_NOFUNC 0x02 /* don't return shell functions, for command */
+
extern const char *pathopt; /* set by padvance */
extern int exerrno; /* last exec error */
Modified: user/imp/tbemd/bin/sh/expand.c
==============================================================================
--- user/imp/tbemd/bin/sh/expand.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/expand.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -273,7 +273,6 @@ exptilde(char *p, int flag)
switch(c) {
case CTLESC: /* This means CTL* are always considered quoted. */
case CTLVAR:
- case CTLENDVAR:
case CTLBACKQ:
case CTLBACKQ | CTLQUOTE:
case CTLARI:
@@ -285,6 +284,7 @@ exptilde(char *p, int flag)
goto done;
break;
case '/':
+ case CTLENDVAR:
goto done;
}
p++;
@@ -506,7 +506,9 @@ subevalvar(char *p, char *str, int strlo
int amount;
herefd = -1;
- argstr(p, 0);
+ argstr(p, (subtype == VSTRIMLEFT || subtype == VSTRIMLEFTMAX ||
+ subtype == VSTRIMRIGHT || subtype == VSTRIMRIGHTMAX ?
+ EXP_CASE : 0) | EXP_TILDE);
STACKSTRNUL(expdest);
herefd = saveherefd;
argbackq = saveargbackq;
Modified: user/imp/tbemd/bin/sh/mksyntax.c
==============================================================================
--- user/imp/tbemd/bin/sh/mksyntax.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/mksyntax.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -232,7 +232,6 @@ main(int argc __unused, char **argv __un
add("\n", "CNL");
add("\\", "CBACK");
add("`", "CBQUOTE");
- add("'", "CSQUOTE");
add("\"", "CDQUOTE");
add("$", "CVAR");
add("}", "CENDVAR");
Modified: user/imp/tbemd/bin/sh/options.c
==============================================================================
--- user/imp/tbemd/bin/sh/options.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/options.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -93,8 +93,11 @@ procargs(int argc, char **argv)
options(1);
if (*argptr == NULL && minusc == NULL)
sflag = 1;
- if (iflag == 2 && sflag == 1 && isatty(0) && isatty(1))
+ if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) {
iflag = 1;
+ if (Eflag == 2)
+ Eflag = 1;
+ }
if (mflag == 2)
mflag = iflag;
for (i = 0; i < NOPTS; i++)
Modified: user/imp/tbemd/bin/sh/parser.c
==============================================================================
--- user/imp/tbemd/bin/sh/parser.c Mon Apr 12 23:03:24 2010 (r206515)
+++ user/imp/tbemd/bin/sh/parser.c Mon Apr 12 23:04:38 2010 (r206516)
@@ -79,6 +79,10 @@ struct heredoc {
int striptabs; /* if set, strip leading tabs */
};
+struct parser_temp {
+ struct parser_temp *next;
+ void *data;
+};
STATIC struct heredoc *heredoclist; /* list of here documents to read */
@@ -94,6 +98,7 @@ STATIC struct heredoc *heredoc;
STATIC int quoteflag; /* set if (part of) last token was quoted */
STATIC int startlinno; /* line # where last token started */
STATIC int funclinno; /* line # where the current function started */
+STATIC struct parser_temp *parser_temp;
/* XXX When 'noaliases' is set to one, no alias expansion takes place. */
static int noaliases = 0;
@@ -117,6 +122,73 @@ STATIC void synerror(const char *);
STATIC void setprompt(int);
+STATIC void *
+parser_temp_alloc(size_t len)
+{
+ struct parser_temp *t;
+
+ INTOFF;
+ t = ckmalloc(sizeof(*t));
+ t->data = NULL;
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list