From owner-svn-src-projects@FreeBSD.ORG Sat Mar 20 14:53:54 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 58A7C106564A; Sat, 20 Mar 2010 14:53:54 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 425968FC13; Sat, 20 Mar 2010 14:53:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2KErsmA004226; Sat, 20 Mar 2010 14:53:54 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2KErrQV004210; Sat, 20 Mar 2010 14:53:53 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201003201453.o2KErrQV004210@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 20 Mar 2010 14:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r205374 - in projects/ppc64: . bin/ps bin/sh cddl/contrib/opensolaris/cmd/zfs cddl/contrib/opensolaris/lib/libzfs/common contrib/bind9 contrib/bind9/bin/named contrib/bind9/doc/arm cont... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Mar 2010 14:53:54 -0000 Author: nwhitehorn Date: Sat Mar 20 14:53:52 2010 New Revision: 205374 URL: http://svn.freebsd.org/changeset/base/205374 Log: IFC @ 205370 Added: projects/ppc64/lib/libcompat/4.3/re_comp.c - copied unchanged from r205371, head/lib/libcompat/4.3/re_comp.c projects/ppc64/sys/arm/conf/LN2410SBC - copied unchanged from r205371, head/sys/arm/conf/LN2410SBC projects/ppc64/sys/arm/s3c2xx0/ - copied from r205371, head/sys/arm/s3c2xx0/ projects/ppc64/sys/dev/usb/controller/ohci_s3c24x0.c - copied unchanged from r205371, head/sys/dev/usb/controller/ohci_s3c24x0.c projects/ppc64/tools/regression/bin/sh/builtins/command11.0 - copied unchanged from r205371, head/tools/regression/bin/sh/builtins/command11.0 projects/ppc64/tools/regression/bin/sh/errors/assignment-error1.0 - copied unchanged from r205371, head/tools/regression/bin/sh/errors/assignment-error1.0 projects/ppc64/tools/regression/bin/sh/errors/redirection-error4.0 - copied unchanged from r205371, head/tools/regression/bin/sh/errors/redirection-error4.0 projects/ppc64/tools/regression/bin/sh/errors/redirection-error5.0 - copied unchanged from r205371, head/tools/regression/bin/sh/errors/redirection-error5.0 projects/ppc64/tools/regression/bin/sh/errors/redirection-error6.0 - copied unchanged from r205371, head/tools/regression/bin/sh/errors/redirection-error6.0 projects/ppc64/tools/regression/bin/sh/expansion/cmdsubst2.0 - copied unchanged from r205371, head/tools/regression/bin/sh/expansion/cmdsubst2.0 projects/ppc64/tools/regression/usr.bin/ncal/ - copied from r205371, head/tools/regression/usr.bin/ncal/ Deleted: projects/ppc64/crypto/openssl/apps/genpkey.c projects/ppc64/crypto/openssl/apps/pkey.c projects/ppc64/crypto/openssl/apps/pkeyparam.c projects/ppc64/crypto/openssl/apps/pkeyutl.c projects/ppc64/crypto/openssl/apps/ts.c projects/ppc64/crypto/openssl/apps/tsget projects/ppc64/crypto/openssl/crypto/aes/aes_x86core.c projects/ppc64/crypto/openssl/crypto/aes/asm/aes-armv4.pl projects/ppc64/crypto/openssl/crypto/aes/asm/aes-ppc.pl projects/ppc64/crypto/openssl/crypto/aes/asm/aes-s390x.pl projects/ppc64/crypto/openssl/crypto/aes/asm/aes-sparcv9.pl projects/ppc64/crypto/openssl/crypto/asn1/ameth_lib.c projects/ppc64/crypto/openssl/crypto/asn1/asn1_locl.h projects/ppc64/crypto/openssl/crypto/asn1/bio_asn1.c projects/ppc64/crypto/openssl/crypto/asn1/bio_ndef.c projects/ppc64/crypto/openssl/crypto/asn1/x_nx509.c projects/ppc64/crypto/openssl/crypto/bn/asm/alpha-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/armv4-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/mips3-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/ppc-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/ppc64-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/s390x-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/s390x.S projects/ppc64/crypto/openssl/crypto/bn/asm/sparcv9-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/sparcv9a-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/via-mont.pl projects/ppc64/crypto/openssl/crypto/bn/asm/x86-mont.pl projects/ppc64/crypto/openssl/crypto/camellia/asm/cmll-x86.pl projects/ppc64/crypto/openssl/crypto/camellia/asm/cmll-x86_64.pl projects/ppc64/crypto/openssl/crypto/ppccpuid.pl projects/ppc64/crypto/openssl/crypto/s390xcpuid.S projects/ppc64/crypto/openssl/crypto/sparcv9cap.c projects/ppc64/crypto/openssl/engines/axp.opt projects/ppc64/include/regexp.h projects/ppc64/lib/libcompat/4.3/regex.c projects/ppc64/lib/libcompat/regexp/ Modified: projects/ppc64/MAINTAINERS projects/ppc64/Makefile projects/ppc64/ObsoleteFiles.inc projects/ppc64/bin/ps/extern.h projects/ppc64/bin/ps/keyword.c projects/ppc64/bin/ps/print.c projects/ppc64/bin/ps/ps.1 projects/ppc64/bin/sh/eval.c projects/ppc64/bin/sh/parser.c projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h projects/ppc64/contrib/bind9/CHANGES projects/ppc64/contrib/bind9/bin/named/server.c projects/ppc64/contrib/bind9/doc/arm/Bv9ARM-book.xml projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.ch06.html projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.ch07.html projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.ch08.html projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.ch09.html projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.html projects/ppc64/contrib/bind9/doc/arm/Bv9ARM.pdf projects/ppc64/contrib/bind9/doc/arm/man.dig.html projects/ppc64/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html projects/ppc64/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html projects/ppc64/contrib/bind9/doc/arm/man.dnssec-keygen.html projects/ppc64/contrib/bind9/doc/arm/man.dnssec-signzone.html projects/ppc64/contrib/bind9/doc/arm/man.host.html projects/ppc64/contrib/bind9/doc/arm/man.named-checkconf.html projects/ppc64/contrib/bind9/doc/arm/man.named-checkzone.html projects/ppc64/contrib/bind9/doc/arm/man.named.html projects/ppc64/contrib/bind9/doc/arm/man.nsupdate.html projects/ppc64/contrib/bind9/doc/arm/man.rndc-confgen.html projects/ppc64/contrib/bind9/doc/arm/man.rndc.conf.html projects/ppc64/contrib/bind9/doc/arm/man.rndc.html projects/ppc64/contrib/bind9/lib/dns/api projects/ppc64/contrib/bind9/lib/dns/include/dns/rdataset.h projects/ppc64/contrib/bind9/lib/dns/include/dns/resolver.h projects/ppc64/contrib/bind9/lib/dns/include/dns/result.h projects/ppc64/contrib/bind9/lib/dns/include/dns/validator.h projects/ppc64/contrib/bind9/lib/dns/ncache.c projects/ppc64/contrib/bind9/lib/dns/rbtdb.c projects/ppc64/contrib/bind9/lib/dns/rdatalist.c projects/ppc64/contrib/bind9/lib/dns/rdataset.c projects/ppc64/contrib/bind9/lib/dns/rdataslab.c projects/ppc64/contrib/bind9/lib/dns/resolver.c projects/ppc64/contrib/bind9/lib/dns/result.c projects/ppc64/contrib/bind9/lib/dns/sdb.c projects/ppc64/contrib/bind9/lib/dns/sdlz.c projects/ppc64/contrib/bind9/lib/dns/validator.c projects/ppc64/contrib/bind9/lib/dns/view.c projects/ppc64/contrib/bind9/lib/lwres/man/lwres.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_buffer.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_config.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_context.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_gabn.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_gethostent.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_getipnode.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_gnba.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_hstrerror.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_inetntop.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_noop.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_packet.html projects/ppc64/contrib/bind9/lib/lwres/man/lwres_resutil.html projects/ppc64/contrib/bind9/version projects/ppc64/contrib/bsnmp/gensnmptree/gensnmptree.1 projects/ppc64/contrib/bsnmp/snmpd/snmpmod.3 projects/ppc64/contrib/top/utils.c projects/ppc64/crypto/openssl/CHANGES projects/ppc64/crypto/openssl/Configure projects/ppc64/crypto/openssl/FAQ projects/ppc64/crypto/openssl/Makefile projects/ppc64/crypto/openssl/Makefile.org projects/ppc64/crypto/openssl/NEWS projects/ppc64/crypto/openssl/README projects/ppc64/crypto/openssl/apps/CA.sh projects/ppc64/crypto/openssl/apps/Makefile projects/ppc64/crypto/openssl/apps/apps.c projects/ppc64/crypto/openssl/apps/ca.c projects/ppc64/crypto/openssl/apps/dsa.c projects/ppc64/crypto/openssl/apps/dsaparam.c projects/ppc64/crypto/openssl/apps/enc.c projects/ppc64/crypto/openssl/apps/gendsa.c projects/ppc64/crypto/openssl/apps/genrsa.c projects/ppc64/crypto/openssl/apps/openssl.c projects/ppc64/crypto/openssl/apps/pkcs12.c projects/ppc64/crypto/openssl/apps/req.c projects/ppc64/crypto/openssl/apps/s_apps.h projects/ppc64/crypto/openssl/apps/s_cb.c projects/ppc64/crypto/openssl/apps/s_client.c projects/ppc64/crypto/openssl/apps/s_server.c projects/ppc64/crypto/openssl/apps/s_socket.c projects/ppc64/crypto/openssl/apps/speed.c projects/ppc64/crypto/openssl/apps/x509.c projects/ppc64/crypto/openssl/config projects/ppc64/crypto/openssl/crypto/aes/aes_cfb.c projects/ppc64/crypto/openssl/crypto/aes/asm/aes-x86_64.pl projects/ppc64/crypto/openssl/crypto/asn1/a_mbstr.c projects/ppc64/crypto/openssl/crypto/asn1/a_object.c projects/ppc64/crypto/openssl/crypto/asn1/asn1.h projects/ppc64/crypto/openssl/crypto/asn1/asn1_err.c projects/ppc64/crypto/openssl/crypto/asn1/asn1_gen.c projects/ppc64/crypto/openssl/crypto/asn1/asn1_par.c projects/ppc64/crypto/openssl/crypto/asn1/t_x509.c projects/ppc64/crypto/openssl/crypto/bio/bio.h projects/ppc64/crypto/openssl/crypto/bio/bss_dgram.c projects/ppc64/crypto/openssl/crypto/bio/bss_file.c projects/ppc64/crypto/openssl/crypto/bn/asm/x86_64-gcc.c projects/ppc64/crypto/openssl/crypto/bn/bn_div.c projects/ppc64/crypto/openssl/crypto/bn/bn_exp.c projects/ppc64/crypto/openssl/crypto/bn/bn_gf2m.c projects/ppc64/crypto/openssl/crypto/bn/bn_mul.c projects/ppc64/crypto/openssl/crypto/bn/bntest.c projects/ppc64/crypto/openssl/crypto/camellia/Makefile projects/ppc64/crypto/openssl/crypto/cast/c_cfb64.c projects/ppc64/crypto/openssl/crypto/cast/c_ecb.c projects/ppc64/crypto/openssl/crypto/cast/c_enc.c projects/ppc64/crypto/openssl/crypto/cast/c_ofb64.c projects/ppc64/crypto/openssl/crypto/cast/cast.h projects/ppc64/crypto/openssl/crypto/cms/cms_ess.c projects/ppc64/crypto/openssl/crypto/cms/cms_lib.c projects/ppc64/crypto/openssl/crypto/comp/c_zlib.c projects/ppc64/crypto/openssl/crypto/cryptlib.c projects/ppc64/crypto/openssl/crypto/dsa/Makefile projects/ppc64/crypto/openssl/crypto/dsa/dsa_asn1.c projects/ppc64/crypto/openssl/crypto/dsa/dsa_lib.c projects/ppc64/crypto/openssl/crypto/dso/dso_dlfcn.c projects/ppc64/crypto/openssl/crypto/ec/ec2_smpl.c projects/ppc64/crypto/openssl/crypto/ecdsa/Makefile projects/ppc64/crypto/openssl/crypto/ecdsa/ecs_ossl.c projects/ppc64/crypto/openssl/crypto/ecdsa/ecs_sign.c projects/ppc64/crypto/openssl/crypto/engine/Makefile projects/ppc64/crypto/openssl/crypto/engine/eng_cnf.c projects/ppc64/crypto/openssl/crypto/engine/eng_cryptodev.c projects/ppc64/crypto/openssl/crypto/engine/eng_ctrl.c projects/ppc64/crypto/openssl/crypto/engine/eng_err.c projects/ppc64/crypto/openssl/crypto/engine/eng_table.c projects/ppc64/crypto/openssl/crypto/engine/engine.h projects/ppc64/crypto/openssl/crypto/err/Makefile projects/ppc64/crypto/openssl/crypto/err/err_all.c projects/ppc64/crypto/openssl/crypto/evp/c_allc.c projects/ppc64/crypto/openssl/crypto/evp/c_alld.c projects/ppc64/crypto/openssl/crypto/evp/digest.c projects/ppc64/crypto/openssl/crypto/evp/evp_lib.c projects/ppc64/crypto/openssl/crypto/evp/evp_locl.h projects/ppc64/crypto/openssl/crypto/lhash/lhash.c projects/ppc64/crypto/openssl/crypto/md5/asm/md5-x86_64.pl projects/ppc64/crypto/openssl/crypto/o_init.c projects/ppc64/crypto/openssl/crypto/o_str.c projects/ppc64/crypto/openssl/crypto/objects/obj_dat.c projects/ppc64/crypto/openssl/crypto/objects/obj_dat.h projects/ppc64/crypto/openssl/crypto/objects/obj_mac.h projects/ppc64/crypto/openssl/crypto/objects/obj_mac.num projects/ppc64/crypto/openssl/crypto/objects/objects.txt projects/ppc64/crypto/openssl/crypto/ocsp/ocsp_prn.c projects/ppc64/crypto/openssl/crypto/opensslv.h projects/ppc64/crypto/openssl/crypto/pem/pem_seal.c projects/ppc64/crypto/openssl/crypto/perlasm/x86_64-xlate.pl projects/ppc64/crypto/openssl/crypto/pkcs12/p12_attr.c projects/ppc64/crypto/openssl/crypto/pkcs12/p12_key.c projects/ppc64/crypto/openssl/crypto/pkcs12/p12_utl.c projects/ppc64/crypto/openssl/crypto/pkcs12/pkcs12.h projects/ppc64/crypto/openssl/crypto/pkcs7/pk7_mime.c projects/ppc64/crypto/openssl/crypto/rand/rand_win.c projects/ppc64/crypto/openssl/crypto/rand/randfile.c projects/ppc64/crypto/openssl/crypto/rsa/rsa.h projects/ppc64/crypto/openssl/crypto/rsa/rsa_eay.c projects/ppc64/crypto/openssl/crypto/rsa/rsa_eng.c projects/ppc64/crypto/openssl/crypto/rsa/rsa_oaep.c projects/ppc64/crypto/openssl/crypto/rsa/rsa_pss.c projects/ppc64/crypto/openssl/crypto/rsa/rsa_sign.c projects/ppc64/crypto/openssl/crypto/sha/sha512.c projects/ppc64/crypto/openssl/crypto/stack/safestack.h projects/ppc64/crypto/openssl/crypto/symhacks.h projects/ppc64/crypto/openssl/crypto/ui/ui_openssl.c projects/ppc64/crypto/openssl/crypto/x509/by_dir.c projects/ppc64/crypto/openssl/crypto/x509/x509.h projects/ppc64/crypto/openssl/crypto/x509/x509_lu.c projects/ppc64/crypto/openssl/crypto/x509/x509_vfy.c projects/ppc64/crypto/openssl/crypto/x509/x509_vfy.h projects/ppc64/crypto/openssl/crypto/x509/x509_vpm.c projects/ppc64/crypto/openssl/crypto/x509v3/pcy_tree.c projects/ppc64/crypto/openssl/crypto/x509v3/v3_alt.c projects/ppc64/crypto/openssl/crypto/x509v3/v3_ocsp.c projects/ppc64/crypto/openssl/demos/x509/mkcert.c projects/ppc64/crypto/openssl/demos/x509/mkreq.c projects/ppc64/crypto/openssl/doc/apps/enc.pod projects/ppc64/crypto/openssl/doc/apps/verify.pod projects/ppc64/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod projects/ppc64/crypto/openssl/doc/crypto/EVP_DigestInit.pod projects/ppc64/crypto/openssl/doc/crypto/PKCS12_parse.pod projects/ppc64/crypto/openssl/doc/crypto/bn_internal.pod projects/ppc64/crypto/openssl/doc/crypto/d2i_X509.pod projects/ppc64/crypto/openssl/doc/crypto/d2i_X509_CRL.pod projects/ppc64/crypto/openssl/doc/crypto/d2i_X509_REQ.pod projects/ppc64/crypto/openssl/doc/crypto/hmac.pod projects/ppc64/crypto/openssl/doc/crypto/pem.pod projects/ppc64/crypto/openssl/doc/ssl/SSL_CIPHER_get_name.pod projects/ppc64/crypto/openssl/doc/ssl/SSL_CTX_set_options.pod projects/ppc64/crypto/openssl/engines/Makefile projects/ppc64/crypto/openssl/engines/e_capi.c projects/ppc64/crypto/openssl/engines/e_capi_err.c projects/ppc64/crypto/openssl/engines/e_capi_err.h projects/ppc64/crypto/openssl/engines/e_ubsec.c projects/ppc64/crypto/openssl/fips/Makefile projects/ppc64/crypto/openssl/fips/aes/fips_aesavs.c projects/ppc64/crypto/openssl/fips/des/fips_desmovs.c projects/ppc64/crypto/openssl/fips/dsa/fips_dsa_key.c projects/ppc64/crypto/openssl/fips/dsa/fips_dsa_sign.c projects/ppc64/crypto/openssl/fips/dsa/fips_dsatest.c projects/ppc64/crypto/openssl/fips/dsa/fips_dssvs.c projects/ppc64/crypto/openssl/fips/fips_locl.h projects/ppc64/crypto/openssl/fips/fips_test_suite.c projects/ppc64/crypto/openssl/fips/fips_utl.h projects/ppc64/crypto/openssl/fips/fipsalgtest.pl projects/ppc64/crypto/openssl/fips/fipsld projects/ppc64/crypto/openssl/fips/hmac/fips_hmac.c projects/ppc64/crypto/openssl/fips/hmac/fips_hmac_selftest.c projects/ppc64/crypto/openssl/fips/rand/fips_rand.c projects/ppc64/crypto/openssl/fips/rand/fips_rngvs.c projects/ppc64/crypto/openssl/fips/rsa/fips_rsagtest.c projects/ppc64/crypto/openssl/fips/rsa/fips_rsastest.c projects/ppc64/crypto/openssl/fips/rsa/fips_rsavtest.c projects/ppc64/crypto/openssl/fips/sha/Makefile projects/ppc64/crypto/openssl/fips/sha/fips_sha1_selftest.c projects/ppc64/crypto/openssl/openssl.spec projects/ppc64/crypto/openssl/ssl/Makefile projects/ppc64/crypto/openssl/ssl/d1_both.c projects/ppc64/crypto/openssl/ssl/d1_clnt.c projects/ppc64/crypto/openssl/ssl/d1_enc.c projects/ppc64/crypto/openssl/ssl/d1_lib.c projects/ppc64/crypto/openssl/ssl/d1_pkt.c projects/ppc64/crypto/openssl/ssl/d1_srvr.c projects/ppc64/crypto/openssl/ssl/dtls1.h projects/ppc64/crypto/openssl/ssl/kssl.c projects/ppc64/crypto/openssl/ssl/s23_clnt.c projects/ppc64/crypto/openssl/ssl/s23_srvr.c projects/ppc64/crypto/openssl/ssl/s2_srvr.c projects/ppc64/crypto/openssl/ssl/s3_both.c projects/ppc64/crypto/openssl/ssl/s3_clnt.c projects/ppc64/crypto/openssl/ssl/s3_lib.c projects/ppc64/crypto/openssl/ssl/s3_pkt.c projects/ppc64/crypto/openssl/ssl/s3_srvr.c projects/ppc64/crypto/openssl/ssl/ssl.h projects/ppc64/crypto/openssl/ssl/ssl3.h projects/ppc64/crypto/openssl/ssl/ssl_algs.c projects/ppc64/crypto/openssl/ssl/ssl_asn1.c projects/ppc64/crypto/openssl/ssl/ssl_cert.c projects/ppc64/crypto/openssl/ssl/ssl_ciph.c projects/ppc64/crypto/openssl/ssl/ssl_err.c projects/ppc64/crypto/openssl/ssl/ssl_lib.c projects/ppc64/crypto/openssl/ssl/ssl_locl.h projects/ppc64/crypto/openssl/ssl/ssl_rsa.c projects/ppc64/crypto/openssl/ssl/ssl_sess.c projects/ppc64/crypto/openssl/ssl/ssl_stat.c projects/ppc64/crypto/openssl/ssl/ssl_txt.c projects/ppc64/crypto/openssl/ssl/t1_enc.c projects/ppc64/crypto/openssl/ssl/t1_lib.c projects/ppc64/crypto/openssl/ssl/tls1.h projects/ppc64/crypto/openssl/test/Makefile projects/ppc64/crypto/openssl/test/cms-test.pl projects/ppc64/crypto/openssl/util/domd projects/ppc64/crypto/openssl/util/libeay.num projects/ppc64/crypto/openssl/util/mk1mf.pl projects/ppc64/crypto/openssl/util/mkdef.pl projects/ppc64/crypto/openssl/util/mkerr.pl projects/ppc64/crypto/openssl/util/pl/Mingw32.pl projects/ppc64/crypto/openssl/util/pl/VC-32.pl projects/ppc64/crypto/openssl/util/pod2man.pl projects/ppc64/crypto/openssl/util/shlib_wrap.sh projects/ppc64/etc/Makefile projects/ppc64/etc/rc.d/tmp projects/ppc64/games/pom/pom.6 projects/ppc64/gnu/usr.bin/gdb/arch/arm/nm-fbsd.h projects/ppc64/include/Makefile projects/ppc64/lib/Makefile projects/ppc64/lib/bind/config.h projects/ppc64/lib/csu/mips/crti.S projects/ppc64/lib/libc/compat-43/sigpause.2 projects/ppc64/lib/libc/gen/daemon.c projects/ppc64/lib/libc/rpc/rpc_generic.c projects/ppc64/lib/libc/stdio/findfp.c projects/ppc64/lib/libc/stdio/local.h projects/ppc64/lib/libc/stdio/snprintf.c projects/ppc64/lib/libc/stdio/vasprintf.c projects/ppc64/lib/libc/stdio/vdprintf.c projects/ppc64/lib/libc/stdio/vfprintf.c projects/ppc64/lib/libc/stdio/vsnprintf.c projects/ppc64/lib/libc/stdio/vsprintf.c projects/ppc64/lib/libc/stdio/vsscanf.c projects/ppc64/lib/libc/stdio/vswprintf.c projects/ppc64/lib/libc/stdio/vswscanf.c projects/ppc64/lib/libc/stdio/xprintf.c projects/ppc64/lib/libc/string/strlen.c projects/ppc64/lib/libcompat/4.1/ascftime.c projects/ppc64/lib/libcompat/4.1/cftime.c projects/ppc64/lib/libcompat/4.1/ftime.c projects/ppc64/lib/libcompat/4.1/getpw.c projects/ppc64/lib/libcompat/4.3/cfree.c projects/ppc64/lib/libcompat/4.3/re_comp.3 projects/ppc64/lib/libcompat/Makefile projects/ppc64/lib/libgssapi/gss_init_sec_context.3 projects/ppc64/lib/libgssapi/gss_unwrap.3 projects/ppc64/lib/libkvm/kvm_getpcpu.3 projects/ppc64/lib/librpcsec_gss/rpcsec_gss.3 projects/ppc64/lib/libstand/bzipfs.c projects/ppc64/lib/libstand/gzipfs.c projects/ppc64/lib/msun/man/cimag.3 projects/ppc64/libexec/tftpd/tftpd.8 projects/ppc64/sbin/ifconfig/ifconfig.c projects/ppc64/sbin/ipfw/dummynet.c projects/ppc64/sbin/ipfw/ipfw2.c projects/ppc64/sbin/ipfw/ipfw2.h projects/ppc64/sbin/quotacheck/quotacheck.8 projects/ppc64/sbin/sysctl/sysctl.c projects/ppc64/secure/lib/libcrypto/Makefile.inc projects/ppc64/secure/lib/libcrypto/Makefile.man projects/ppc64/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/ppc64/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/ppc64/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/ppc64/secure/lib/libcrypto/man/BIO_ctrl.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_base64.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_md.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_null.3 projects/ppc64/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/ppc64/secure/lib/libcrypto/man/BIO_find_type.3 projects/ppc64/secure/lib/libcrypto/man/BIO_new.3 projects/ppc64/secure/lib/libcrypto/man/BIO_push.3 projects/ppc64/secure/lib/libcrypto/man/BIO_read.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_accept.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_bio.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_connect.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_fd.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_file.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_mem.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_null.3 projects/ppc64/secure/lib/libcrypto/man/BIO_s_socket.3 projects/ppc64/secure/lib/libcrypto/man/BIO_set_callback.3 projects/ppc64/secure/lib/libcrypto/man/BIO_should_retry.3 projects/ppc64/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/ppc64/secure/lib/libcrypto/man/BN_CTX_new.3 projects/ppc64/secure/lib/libcrypto/man/BN_CTX_start.3 projects/ppc64/secure/lib/libcrypto/man/BN_add.3 projects/ppc64/secure/lib/libcrypto/man/BN_add_word.3 projects/ppc64/secure/lib/libcrypto/man/BN_bn2bin.3 projects/ppc64/secure/lib/libcrypto/man/BN_cmp.3 projects/ppc64/secure/lib/libcrypto/man/BN_copy.3 projects/ppc64/secure/lib/libcrypto/man/BN_generate_prime.3 projects/ppc64/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/ppc64/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/ppc64/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/ppc64/secure/lib/libcrypto/man/BN_new.3 projects/ppc64/secure/lib/libcrypto/man/BN_num_bytes.3 projects/ppc64/secure/lib/libcrypto/man/BN_rand.3 projects/ppc64/secure/lib/libcrypto/man/BN_set_bit.3 projects/ppc64/secure/lib/libcrypto/man/BN_swap.3 projects/ppc64/secure/lib/libcrypto/man/BN_zero.3 projects/ppc64/secure/lib/libcrypto/man/CONF_modules_free.3 projects/ppc64/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/ppc64/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/ppc64/secure/lib/libcrypto/man/DH_generate_key.3 projects/ppc64/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/ppc64/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/ppc64/secure/lib/libcrypto/man/DH_new.3 projects/ppc64/secure/lib/libcrypto/man/DH_set_method.3 projects/ppc64/secure/lib/libcrypto/man/DH_size.3 projects/ppc64/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/ppc64/secure/lib/libcrypto/man/DSA_do_sign.3 projects/ppc64/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/ppc64/secure/lib/libcrypto/man/DSA_generate_key.3 projects/ppc64/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/ppc64/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/ppc64/secure/lib/libcrypto/man/DSA_new.3 projects/ppc64/secure/lib/libcrypto/man/DSA_set_method.3 projects/ppc64/secure/lib/libcrypto/man/DSA_sign.3 projects/ppc64/secure/lib/libcrypto/man/DSA_size.3 projects/ppc64/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/ppc64/secure/lib/libcrypto/man/ERR_clear_error.3 projects/ppc64/secure/lib/libcrypto/man/ERR_error_string.3 projects/ppc64/secure/lib/libcrypto/man/ERR_get_error.3 projects/ppc64/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/ppc64/secure/lib/libcrypto/man/ERR_load_strings.3 projects/ppc64/secure/lib/libcrypto/man/ERR_print_errors.3 projects/ppc64/secure/lib/libcrypto/man/ERR_put_error.3 projects/ppc64/secure/lib/libcrypto/man/ERR_remove_state.3 projects/ppc64/secure/lib/libcrypto/man/ERR_set_mark.3 projects/ppc64/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/ppc64/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/ppc64/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/ppc64/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/ppc64/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/ppc64/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/ppc64/secure/lib/libcrypto/man/EVP_SealInit.3 projects/ppc64/secure/lib/libcrypto/man/EVP_SignInit.3 projects/ppc64/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/ppc64/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/ppc64/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/ppc64/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/ppc64/secure/lib/libcrypto/man/OPENSSL_config.3 projects/ppc64/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/ppc64/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/ppc64/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/ppc64/secure/lib/libcrypto/man/PKCS12_create.3 projects/ppc64/secure/lib/libcrypto/man/PKCS12_parse.3 projects/ppc64/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/ppc64/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/ppc64/secure/lib/libcrypto/man/PKCS7_sign.3 projects/ppc64/secure/lib/libcrypto/man/PKCS7_verify.3 projects/ppc64/secure/lib/libcrypto/man/RAND_add.3 projects/ppc64/secure/lib/libcrypto/man/RAND_bytes.3 projects/ppc64/secure/lib/libcrypto/man/RAND_cleanup.3 projects/ppc64/secure/lib/libcrypto/man/RAND_egd.3 projects/ppc64/secure/lib/libcrypto/man/RAND_load_file.3 projects/ppc64/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/ppc64/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/ppc64/secure/lib/libcrypto/man/RSA_check_key.3 projects/ppc64/secure/lib/libcrypto/man/RSA_generate_key.3 projects/ppc64/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/ppc64/secure/lib/libcrypto/man/RSA_new.3 projects/ppc64/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/ppc64/secure/lib/libcrypto/man/RSA_print.3 projects/ppc64/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/ppc64/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/ppc64/secure/lib/libcrypto/man/RSA_set_method.3 projects/ppc64/secure/lib/libcrypto/man/RSA_sign.3 projects/ppc64/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/ppc64/secure/lib/libcrypto/man/RSA_size.3 projects/ppc64/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/ppc64/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/ppc64/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/ppc64/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/ppc64/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/ppc64/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/ppc64/secure/lib/libcrypto/man/X509_new.3 projects/ppc64/secure/lib/libcrypto/man/bio.3 projects/ppc64/secure/lib/libcrypto/man/blowfish.3 projects/ppc64/secure/lib/libcrypto/man/bn.3 projects/ppc64/secure/lib/libcrypto/man/bn_internal.3 projects/ppc64/secure/lib/libcrypto/man/buffer.3 projects/ppc64/secure/lib/libcrypto/man/crypto.3 projects/ppc64/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/ppc64/secure/lib/libcrypto/man/d2i_DHparams.3 projects/ppc64/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/ppc64/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/ppc64/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/ppc64/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/ppc64/secure/lib/libcrypto/man/des.3 projects/ppc64/secure/lib/libcrypto/man/dh.3 projects/ppc64/secure/lib/libcrypto/man/dsa.3 projects/ppc64/secure/lib/libcrypto/man/ecdsa.3 projects/ppc64/secure/lib/libcrypto/man/engine.3 projects/ppc64/secure/lib/libcrypto/man/err.3 projects/ppc64/secure/lib/libcrypto/man/evp.3 projects/ppc64/secure/lib/libcrypto/man/hmac.3 projects/ppc64/secure/lib/libcrypto/man/lh_stats.3 projects/ppc64/secure/lib/libcrypto/man/lhash.3 projects/ppc64/secure/lib/libcrypto/man/md5.3 projects/ppc64/secure/lib/libcrypto/man/mdc2.3 projects/ppc64/secure/lib/libcrypto/man/pem.3 projects/ppc64/secure/lib/libcrypto/man/rand.3 projects/ppc64/secure/lib/libcrypto/man/rc4.3 projects/ppc64/secure/lib/libcrypto/man/ripemd.3 projects/ppc64/secure/lib/libcrypto/man/rsa.3 projects/ppc64/secure/lib/libcrypto/man/sha.3 projects/ppc64/secure/lib/libcrypto/man/threads.3 projects/ppc64/secure/lib/libcrypto/man/ui.3 projects/ppc64/secure/lib/libcrypto/man/ui_compat.3 projects/ppc64/secure/lib/libcrypto/man/x509.3 projects/ppc64/secure/lib/libssl/Makefile projects/ppc64/secure/lib/libssl/Makefile.man projects/ppc64/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/ppc64/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_free.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_new.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/ppc64/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/ppc64/secure/lib/libssl/man/SSL_SESSION_free.3 projects/ppc64/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/ppc64/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/ppc64/secure/lib/libssl/man/SSL_accept.3 projects/ppc64/secure/lib/libssl/man/SSL_alert_type_string.3 projects/ppc64/secure/lib/libssl/man/SSL_clear.3 projects/ppc64/secure/lib/libssl/man/SSL_connect.3 projects/ppc64/secure/lib/libssl/man/SSL_do_handshake.3 projects/ppc64/secure/lib/libssl/man/SSL_free.3 projects/ppc64/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/ppc64/secure/lib/libssl/man/SSL_get_ciphers.3 projects/ppc64/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/ppc64/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/ppc64/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/ppc64/secure/lib/libssl/man/SSL_get_error.3 projects/ppc64/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/ppc64/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/ppc64/secure/lib/libssl/man/SSL_get_fd.3 projects/ppc64/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/ppc64/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/ppc64/secure/lib/libssl/man/SSL_get_rbio.3 projects/ppc64/secure/lib/libssl/man/SSL_get_session.3 projects/ppc64/secure/lib/libssl/man/SSL_get_verify_result.3 projects/ppc64/secure/lib/libssl/man/SSL_get_version.3 projects/ppc64/secure/lib/libssl/man/SSL_library_init.3 projects/ppc64/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/ppc64/secure/lib/libssl/man/SSL_new.3 projects/ppc64/secure/lib/libssl/man/SSL_pending.3 projects/ppc64/secure/lib/libssl/man/SSL_read.3 projects/ppc64/secure/lib/libssl/man/SSL_rstate_string.3 projects/ppc64/secure/lib/libssl/man/SSL_session_reused.3 projects/ppc64/secure/lib/libssl/man/SSL_set_bio.3 projects/ppc64/secure/lib/libssl/man/SSL_set_connect_state.3 projects/ppc64/secure/lib/libssl/man/SSL_set_fd.3 projects/ppc64/secure/lib/libssl/man/SSL_set_session.3 projects/ppc64/secure/lib/libssl/man/SSL_set_shutdown.3 projects/ppc64/secure/lib/libssl/man/SSL_set_verify_result.3 projects/ppc64/secure/lib/libssl/man/SSL_shutdown.3 projects/ppc64/secure/lib/libssl/man/SSL_state_string.3 projects/ppc64/secure/lib/libssl/man/SSL_want.3 projects/ppc64/secure/lib/libssl/man/SSL_write.3 projects/ppc64/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/ppc64/secure/lib/libssl/man/ssl.3 projects/ppc64/secure/usr.bin/openssl/man/CA.pl.1 projects/ppc64/secure/usr.bin/openssl/man/asn1parse.1 projects/ppc64/secure/usr.bin/openssl/man/ca.1 projects/ppc64/secure/usr.bin/openssl/man/ciphers.1 projects/ppc64/secure/usr.bin/openssl/man/crl.1 projects/ppc64/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/ppc64/secure/usr.bin/openssl/man/dgst.1 projects/ppc64/secure/usr.bin/openssl/man/dhparam.1 projects/ppc64/secure/usr.bin/openssl/man/dsa.1 projects/ppc64/secure/usr.bin/openssl/man/dsaparam.1 projects/ppc64/secure/usr.bin/openssl/man/ec.1 projects/ppc64/secure/usr.bin/openssl/man/ecparam.1 projects/ppc64/secure/usr.bin/openssl/man/enc.1 projects/ppc64/secure/usr.bin/openssl/man/errstr.1 projects/ppc64/secure/usr.bin/openssl/man/gendsa.1 projects/ppc64/secure/usr.bin/openssl/man/genrsa.1 projects/ppc64/secure/usr.bin/openssl/man/nseq.1 projects/ppc64/secure/usr.bin/openssl/man/ocsp.1 projects/ppc64/secure/usr.bin/openssl/man/openssl.1 projects/ppc64/secure/usr.bin/openssl/man/passwd.1 projects/ppc64/secure/usr.bin/openssl/man/pkcs12.1 projects/ppc64/secure/usr.bin/openssl/man/pkcs7.1 projects/ppc64/secure/usr.bin/openssl/man/pkcs8.1 projects/ppc64/secure/usr.bin/openssl/man/rand.1 projects/ppc64/secure/usr.bin/openssl/man/req.1 projects/ppc64/secure/usr.bin/openssl/man/rsa.1 projects/ppc64/secure/usr.bin/openssl/man/rsautl.1 projects/ppc64/secure/usr.bin/openssl/man/s_client.1 projects/ppc64/secure/usr.bin/openssl/man/s_server.1 projects/ppc64/secure/usr.bin/openssl/man/s_time.1 projects/ppc64/secure/usr.bin/openssl/man/sess_id.1 projects/ppc64/secure/usr.bin/openssl/man/smime.1 projects/ppc64/secure/usr.bin/openssl/man/speed.1 projects/ppc64/secure/usr.bin/openssl/man/spkac.1 projects/ppc64/secure/usr.bin/openssl/man/verify.1 projects/ppc64/secure/usr.bin/openssl/man/version.1 projects/ppc64/secure/usr.bin/openssl/man/x509.1 projects/ppc64/secure/usr.bin/openssl/man/x509v3_config.1 projects/ppc64/share/dict/web2 projects/ppc64/share/man/man4/acpi_wmi.4 projects/ppc64/share/man/man4/altq.4 projects/ppc64/share/man/man4/amdtemp.4 projects/ppc64/share/man/man4/cxgb.4 projects/ppc64/share/man/man4/ddb.4 projects/ppc64/share/man/man4/iscsi_initiator.4 projects/ppc64/share/man/man4/ndis.4 projects/ppc64/share/man/man4/sysmouse.4 projects/ppc64/share/man/man4/textdump.4 projects/ppc64/share/man/man4/uart.4 projects/ppc64/share/man/man4/urio.4 projects/ppc64/share/man/man9/fail.9 projects/ppc64/share/man/man9/vfs_mount.9 projects/ppc64/share/misc/pci_vendors projects/ppc64/sys/amd64/acpica/acpi_machdep.c projects/ppc64/sys/amd64/amd64/mca.c projects/ppc64/sys/amd64/amd64/pmap.c projects/ppc64/sys/amd64/conf/GENERIC projects/ppc64/sys/amd64/conf/XENHVM projects/ppc64/sys/amd64/include/mca.h projects/ppc64/sys/amd64/include/specialreg.h projects/ppc64/sys/arm/arm/busdma_machdep.c projects/ppc64/sys/arm/arm/identcpu.c projects/ppc64/sys/arm/arm/vm_machdep.c projects/ppc64/sys/arm/conf/BWCT.hints projects/ppc64/sys/cam/scsi/scsi_sg.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c projects/ppc64/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/ppc64/sys/compat/freebsd32/freebsd32.h projects/ppc64/sys/compat/freebsd32/freebsd32_ipc.h projects/ppc64/sys/compat/freebsd32/freebsd32_misc.c projects/ppc64/sys/compat/freebsd32/freebsd32_proto.h projects/ppc64/sys/compat/freebsd32/freebsd32_syscall.h projects/ppc64/sys/compat/freebsd32/freebsd32_syscalls.c projects/ppc64/sys/compat/freebsd32/freebsd32_sysent.c projects/ppc64/sys/compat/freebsd32/freebsd32_util.h projects/ppc64/sys/compat/freebsd32/syscalls.master projects/ppc64/sys/compat/x86bios/x86bios.c projects/ppc64/sys/dev/aac/aac.c projects/ppc64/sys/dev/agp/agp_i810.c projects/ppc64/sys/dev/ata/ata-raid.c projects/ppc64/sys/dev/bce/if_bce.c projects/ppc64/sys/dev/bce/if_bcefw.h projects/ppc64/sys/dev/bce/if_bcereg.h projects/ppc64/sys/dev/bwn/if_bwn.c projects/ppc64/sys/dev/drm/drm_pciids.h projects/ppc64/sys/dev/drm/i915_drv.h projects/ppc64/sys/dev/drm/i915_reg.h projects/ppc64/sys/dev/isp/isp_freebsd.c projects/ppc64/sys/dev/isp/isp_freebsd.h projects/ppc64/sys/dev/isp/isp_pci.c projects/ppc64/sys/dev/isp/isp_sbus.c projects/ppc64/sys/dev/mii/brgphy.c projects/ppc64/sys/dev/mii/brgphyreg.h projects/ppc64/sys/dev/mii/mii.c projects/ppc64/sys/dev/mii/miidevs projects/ppc64/sys/dev/msk/if_msk.c projects/ppc64/sys/dev/msk/if_mskreg.h projects/ppc64/sys/dev/mxge/if_mxge.c projects/ppc64/sys/dev/pci/vga_pci.c projects/ppc64/sys/dev/siis/siis.c projects/ppc64/sys/dev/usb/controller/uss820dci.c projects/ppc64/sys/dev/usb/input/ukbd.c projects/ppc64/sys/dev/usb/serial/uftdi.c projects/ppc64/sys/dev/usb/serial/uvisor.c projects/ppc64/sys/dev/usb/template/usb_template.c projects/ppc64/sys/dev/usb/template/usb_template.h projects/ppc64/sys/dev/usb/template/usb_template_mtp.c projects/ppc64/sys/dev/usb/usb_device.c projects/ppc64/sys/dev/usb/usb_device.h projects/ppc64/sys/dev/usb/usb_generic.c projects/ppc64/sys/dev/usb/usb_transfer.c projects/ppc64/sys/dev/usb/usbdevs projects/ppc64/sys/dev/usb/wlan/if_run.c projects/ppc64/sys/dev/usb/wlan/if_runreg.h projects/ppc64/sys/dev/usb/wlan/if_runvar.h projects/ppc64/sys/dev/xen/netback/netback.c projects/ppc64/sys/fs/fdescfs/fdesc_vnops.c projects/ppc64/sys/geom/gate/g_gate.c projects/ppc64/sys/i386/acpica/acpi_machdep.c projects/ppc64/sys/i386/conf/GENERIC projects/ppc64/sys/i386/conf/XEN projects/ppc64/sys/i386/i386/mca.c projects/ppc64/sys/i386/i386/pmap.c projects/ppc64/sys/i386/include/mca.h projects/ppc64/sys/i386/include/specialreg.h projects/ppc64/sys/ia64/conf/GENERIC projects/ppc64/sys/ia64/ia64/clock.c projects/ppc64/sys/ia64/ia64/exception.S projects/ppc64/sys/ia64/ia64/highfp.c projects/ppc64/sys/ia64/ia64/interrupt.c projects/ppc64/sys/ia64/ia64/locore.S projects/ppc64/sys/ia64/ia64/machdep.c projects/ppc64/sys/ia64/ia64/mp_machdep.c projects/ppc64/sys/ia64/ia64/nexus.c projects/ppc64/sys/ia64/ia64/sal.c projects/ppc64/sys/ia64/include/clock.h projects/ppc64/sys/ia64/include/intr.h projects/ppc64/sys/ia64/include/intrcnt.h projects/ppc64/sys/ia64/include/smp.h projects/ppc64/sys/kern/kern_ktr.c projects/ppc64/sys/kern/kern_syscalls.c projects/ppc64/sys/kern/subr_eventhandler.c projects/ppc64/sys/kern/sysv_ipc.c projects/ppc64/sys/kern/sysv_msg.c projects/ppc64/sys/kern/sysv_sem.c projects/ppc64/sys/kern/sysv_shm.c projects/ppc64/sys/kern/uipc_mqueue.c projects/ppc64/sys/kern/uipc_sem.c projects/ppc64/sys/kern/uipc_syscalls.c projects/ppc64/sys/kern/vfs_aio.c projects/ppc64/sys/mips/cavium/dev/rgmii/octeon_rgmx.c projects/ppc64/sys/mips/cavium/octeon_machdep.c projects/ppc64/sys/mips/conf/AR71XX projects/ppc64/sys/mips/conf/OCTEON1 projects/ppc64/sys/mips/conf/OCTEON1-32 projects/ppc64/sys/mips/include/clock.h projects/ppc64/sys/mips/include/cpuregs.h projects/ppc64/sys/mips/include/db_machdep.h projects/ppc64/sys/mips/include/param.h projects/ppc64/sys/mips/include/pmap.h projects/ppc64/sys/mips/include/trap.h projects/ppc64/sys/mips/mips/db_trace.c projects/ppc64/sys/mips/mips/exception.S projects/ppc64/sys/mips/mips/mp_machdep.c projects/ppc64/sys/mips/mips/nexus.c projects/ppc64/sys/mips/mips/pmap.c projects/ppc64/sys/mips/mips/tick.c projects/ppc64/sys/mips/mips/trap.c projects/ppc64/sys/mips/mips/vm_machdep.c projects/ppc64/sys/mips/sibyte/sb_asm.S projects/ppc64/sys/mips/sibyte/sb_machdep.c projects/ppc64/sys/mips/sibyte/sb_scd.c projects/ppc64/sys/mips/sibyte/sb_scd.h projects/ppc64/sys/modules/zfs/Makefile projects/ppc64/sys/net/bpf.c projects/ppc64/sys/net/flowtable.c projects/ppc64/sys/net/flowtable.h projects/ppc64/sys/net/if.h projects/ppc64/sys/net/if_llatbl.c projects/ppc64/sys/net/if_llatbl.h projects/ppc64/sys/net/if_tap.c projects/ppc64/sys/net/if_tun.c projects/ppc64/sys/net/if_var.h projects/ppc64/sys/net/route.h projects/ppc64/sys/net/vnet.c projects/ppc64/sys/net/vnet.h projects/ppc64/sys/net80211/ieee80211_adhoc.c projects/ppc64/sys/net80211/ieee80211_ht.c projects/ppc64/sys/net80211/ieee80211_mesh.c projects/ppc64/sys/net80211/ieee80211_proto.c projects/ppc64/sys/net80211/ieee80211_sta.c projects/ppc64/sys/net80211/ieee80211_tdma.c projects/ppc64/sys/netgraph/ng_socket.c projects/ppc64/sys/netgraph/ng_socketvar.h projects/ppc64/sys/netinet/in_pcb.c projects/ppc64/sys/netinet/in_pcb.h projects/ppc64/sys/netinet/ip_divert.c projects/ppc64/sys/netinet/ip_fw.h projects/ppc64/sys/netinet/ip_input.c projects/ppc64/sys/netinet/ip_ipsec.c projects/ppc64/sys/netinet/ip_output.c projects/ppc64/sys/netinet/ipfw/ip_dn_io.c projects/ppc64/sys/netinet/ipfw/ip_dn_private.h projects/ppc64/sys/netinet/ipfw/ip_dummynet.c projects/ppc64/sys/netinet/ipfw/ip_fw2.c projects/ppc64/sys/netinet/ipfw/ip_fw_dynamic.c projects/ppc64/sys/netinet/ipfw/ip_fw_log.c projects/ppc64/sys/netinet/raw_ip.c projects/ppc64/sys/netinet/sctp_crc32.c projects/ppc64/sys/netinet/sctp_crc32.h projects/ppc64/sys/netinet/tcp_subr.c projects/ppc64/sys/netinet/udp_usrreq.c projects/ppc64/sys/netinet6/ip6_output.c projects/ppc64/sys/pc98/conf/GENERIC projects/ppc64/sys/powerpc/aim/mmu_oea64.c projects/ppc64/sys/powerpc/conf/GENERIC projects/ppc64/sys/powerpc/powermac/uninorth.c projects/ppc64/sys/sparc64/conf/GENERIC projects/ppc64/sys/sparc64/include/dcr.h projects/ppc64/sys/sparc64/include/tlb.h projects/ppc64/sys/sparc64/include/tte.h projects/ppc64/sys/sparc64/include/ver.h projects/ppc64/sys/sparc64/pci/schizo.c projects/ppc64/sys/sparc64/pci/schizovar.h projects/ppc64/sys/sparc64/sparc64/cheetah.c projects/ppc64/sys/sparc64/sparc64/genassym.c projects/ppc64/sys/sparc64/sparc64/pmap.c projects/ppc64/sys/sparc64/sparc64/swtch.S projects/ppc64/sys/sun4v/conf/GENERIC projects/ppc64/sys/sys/eventhandler.h projects/ppc64/sys/sys/pmc.h projects/ppc64/sys/sys/sysent.h projects/ppc64/sys/vm/uma_int.h projects/ppc64/tools/regression/aio/aiotest/aiotest.c projects/ppc64/tools/regression/mqueue/mqtest1/mqtest1.c projects/ppc64/tools/regression/mqueue/mqtest2/mqtest2.c projects/ppc64/tools/regression/mqueue/mqtest3/mqtest3.c projects/ppc64/tools/regression/mqueue/mqtest4/mqtest4.c projects/ppc64/tools/regression/mqueue/mqtest5/mqtest5.c projects/ppc64/tools/regression/posixsem/posixsem.c projects/ppc64/tools/regression/posixsem2/semtest.c projects/ppc64/tools/regression/usr.bin/Makefile projects/ppc64/usr.bin/find/find.1 projects/ppc64/usr.bin/ncal/ncal.1 projects/ppc64/usr.bin/ncal/ncal.c projects/ppc64/usr.bin/netstat/netgraph.c projects/ppc64/usr.bin/tar/bsdtar.1 projects/ppc64/usr.bin/unifdef/unifdef.1 projects/ppc64/usr.bin/unifdef/unifdef.c projects/ppc64/usr.bin/unifdef/unifdefall.sh projects/ppc64/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt projects/ppc64/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c projects/ppc64/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def projects/ppc64/usr.sbin/freebsd-update/freebsd-update.8 projects/ppc64/usr.sbin/jls/jls.c projects/ppc64/usr.sbin/lastlogin/lastlogin.c projects/ppc64/usr.sbin/mergemaster/mergemaster.8 projects/ppc64/usr.sbin/mergemaster/mergemaster.sh projects/ppc64/usr.sbin/pkg_install/updating/pkg_updating.1 projects/ppc64/usr.sbin/pmcannotate/pmcannotate.8 projects/ppc64/usr.sbin/powerd/powerd.8 projects/ppc64/usr.sbin/ppp/arp.c projects/ppc64/usr.sbin/uhsoctl/uhsoctl.1 projects/ppc64/usr.sbin/zic/Makefile Directory Properties: projects/ppc64/ (props changed) projects/ppc64/contrib/bind9/ (props changed) projects/ppc64/contrib/expat/ (props changed) projects/ppc64/contrib/groff/ (props changed) projects/ppc64/contrib/one-true-awk/ (props changed) projects/ppc64/contrib/tzcode/stdtime/ (props changed) projects/ppc64/contrib/tzcode/zic/ (props changed) projects/ppc64/contrib/tzdata/ (props changed) projects/ppc64/crypto/openssl/ (props changed) projects/ppc64/lib/libz/ (props changed) projects/ppc64/sys/ (props changed) projects/ppc64/sys/contrib/x86emu/ (props changed) projects/ppc64/sys/dev/xen/xenpci/ (props changed) Modified: projects/ppc64/MAINTAINERS ============================================================================== --- projects/ppc64/MAINTAINERS Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/MAINTAINERS Sat Mar 20 14:53:52 2010 (r205374) @@ -36,8 +36,6 @@ pci bus imp,jhb Pre-commit review reque cdboot jhb Pre-commit review requested. pxeboot jhb Pre-commit review requested. witness jhb Pre-commit review requested. -twe aradford@amcc.com Pre-commit review requested -twa aradford@amcc.com Pre-commit review requested CAM gibbs, ken Pre-commit review requested. send to scsi@freebsd.org devstat(9) ken Pre-commit review requested. @@ -65,9 +63,6 @@ linprocfs des Advance notification reque lpr gad Pre-commit review requested, particularly for lpd/recvjob.c and lpd/printjob.c. newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it. -pkill gad Heads-up appreciated. -ps gad I am working on a number of changes to this. Would - like advance notice of major changes planned to it. cvs peter Heads-up appreciated, try not to break it. nvi peter Try not to break it. libz peter Try not to break it. @@ -76,9 +71,6 @@ share/mk ru This is a vital component of offer a pre-commit review for anything non-trivial. ipfw ipfw Pre-commit review preferred. send to ipfw@freebsd.org drm rnoland Just keep me informed of changes, try not to break it. -libufs jmallett Willing to handle problems, help with work. -fdc(4) joerg Just keep me informed of changes, try not to break it. -sppp(4) joerg Just keep me informed of changes, try not to break it. unifdef(1) fanf Pre-commit review requested. ntp roberto Pre-commit review requested. inetd dwmalone Recommends pre-commit review. @@ -144,4 +136,3 @@ $ cd /usr/src; find */* -type f|xargs eg sys/modules/3dfx/Makefile:MAINTAINER= cokane@FreeBSD.org sys/modules/urio/Makefile:MAINTAINER= Iwasa Kazmi tools/tools/sysdoc/Makefile:MAINTAINER= trhodes@FreeBSD.org -usr.sbin/zic/Makefile:MAINTAINER= wollman@FreeBSD.org Modified: projects/ppc64/Makefile ============================================================================== --- projects/ppc64/Makefile Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/Makefile Sat Mar 20 14:53:52 2010 (r205374) @@ -311,6 +311,7 @@ universe_${target}: "check _.${target}.buildworld for details" | ${MAKEFAIL})) @echo ">> ${target} buildworld completed on `LC_ALL=C date`" .endif +.if !defined(MAKE_JUST_WORLDS) .if exists(${.CURDIR}/sys/${target}/conf/NOTES) @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ @@ -319,6 +320,7 @@ universe_${target}: .endif @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \ universe_kernels +.endif @echo ">> ${target} completed on `LC_ALL=C date`" .endfor universe_kernels: universe_kernconfs Modified: projects/ppc64/ObsoleteFiles.inc ============================================================================== --- projects/ppc64/ObsoleteFiles.inc Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/ObsoleteFiles.inc Sat Mar 20 14:53:52 2010 (r205374) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100314: removal of regexp.h +OLD_FILES+=usr/include/regexp.h +OLD_FILES+=usr/share/man/man3/regexp.3.gz +OLD_FILES+=usr/share/man/man3/regsub.3.gz # 20100303: actual removal of utmp.h OLD_FILES+=usr/include/utmp.h # 20100227: [ia64] removed and Modified: projects/ppc64/bin/ps/extern.h ============================================================================== --- projects/ppc64/bin/ps/extern.h Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/ps/extern.h Sat Mar 20 14:53:52 2010 (r205374) @@ -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: projects/ppc64/bin/ps/keyword.c ============================================================================== --- projects/ppc64/bin/ps/keyword.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/ps/keyword.c Sat Mar 20 14:53:52 2010 (r205374) @@ -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: projects/ppc64/bin/ps/print.c ============================================================================== --- projects/ppc64/bin/ps/print.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/ps/print.c Sat Mar 20 14:53:52 2010 (r205374) @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -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: projects/ppc64/bin/ps/ps.1 ============================================================================== --- projects/ppc64/bin/ps/ps.1 Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/ps/ps.1 Sat Mar 20 14:53:52 2010 (r205374) @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd March 5, 2010 +.Dd March 17, 2010 .Dt PS 1 .Os .Sh NAME @@ -479,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 ) Modified: projects/ppc64/bin/sh/eval.c ============================================================================== --- projects/ppc64/bin/sh/eval.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/sh/eval.c Sat Mar 20 14:53:52 2010 (r205374) @@ -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. @@ -680,7 +718,7 @@ 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="; int cmd_flags = 0, bltinonly = 0; @@ -891,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]; Modified: projects/ppc64/bin/sh/parser.c ============================================================================== --- projects/ppc64/bin/sh/parser.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/bin/sh/parser.c Sat Mar 20 14:53:52 2010 (r205374) @@ -863,6 +863,164 @@ breakloop: } +/* + * Called to parse command substitutions. + */ + +STATIC char * +parsebackq(char *out, struct nodelist **pbqlist, + int oldstyle, int dblquote, int quoted) +{ + struct nodelist **nlpp; + union node *n; + char *volatile str; + struct jmploc jmploc; + struct jmploc *const savehandler = handler; + int savelen; + int saveprompt; + const int bq_startlinno = plinno; + char *volatile ostr = NULL; + struct parsefile *const savetopfile = getcurrentfile(); + + str = NULL; + if (setjmp(jmploc.loc)) { + popfilesupto(savetopfile); + if (str) + ckfree(str); + if (ostr) + ckfree(ostr); + handler = savehandler; + if (exception == EXERROR) { + startlinno = bq_startlinno; + synerror("Error in command substitution"); + } + longjmp(handler->loc, 1); + } + INTOFF; + savelen = out - stackblock(); + if (savelen > 0) { + str = ckmalloc(savelen); + memcpy(str, stackblock(), savelen); + } + handler = &jmploc; + INTON; + if (oldstyle) { + /* We must read until the closing backquote, giving special + treatment to some slashes, and then push the string and + reread it as input, interpreting it normally. */ + char *oout; + int c; + int olen; + + + STARTSTACKSTR(oout); + for (;;) { + if (needprompt) { + setprompt(2); + needprompt = 0; + } + switch (c = pgetc()) { + case '`': + goto done; + + case '\\': + if ((c = pgetc()) == '\n') { + plinno++; + if (doprompt) + setprompt(2); + else + setprompt(0); + /* + * If eating a newline, avoid putting + * the newline into the new character + * stream (via the STPUTC after the + * switch). + */ + continue; + } + if (c != '\\' && c != '`' && c != '$' + && (!dblquote || c != '"')) + STPUTC('\\', oout); + break; + + case '\n': + plinno++; + needprompt = doprompt; + break; + + case PEOF: + startlinno = plinno; + synerror("EOF in backquote substitution"); + break; + + default: + break; + } + STPUTC(c, oout); + } +done: + STPUTC('\0', oout); + olen = oout - stackblock(); + INTOFF; + ostr = ckmalloc(olen); + memcpy(ostr, stackblock(), olen); + setinputstring(ostr, 1); + INTON; + } + nlpp = pbqlist; + while (*nlpp) + nlpp = &(*nlpp)->next; + *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); + (*nlpp)->next = NULL; + + if (oldstyle) { + saveprompt = doprompt; + doprompt = 0; + } + + n = list(0); + + if (oldstyle) + doprompt = saveprompt; + else { + if (readtoken() != TRP) + synexpect(TRP); + } + + (*nlpp)->n = n; + if (oldstyle) { + /* + * Start reading from old file again, ignoring any pushed back + * tokens left from the backquote parsing + */ + popfile(); + tokpushback = 0; + } + while (stackblocksize() <= savelen) + growstackblock(); + STARTSTACKSTR(out); + if (str) { + memcpy(out, str, savelen); + STADJUST(savelen, out); + INTOFF; + ckfree(str); + str = NULL; + INTON; + } + if (ostr) { + INTOFF; + ckfree(ostr); + ostr = NULL; + INTON; + } + handler = savehandler; + if (quoted) + USTPUTC(CTLBACKQ | CTLQUOTE, out); + else + USTPUTC(CTLBACKQ, out); + return out; +} + /* * If eofmark is NULL, read a word or a redirection symbol. If eofmark @@ -879,8 +1037,6 @@ breakloop: #define CHECKEND() {goto checkend; checkend_return:;} #define PARSEREDIR() {goto parseredir; parseredir_return:;} #define PARSESUB() {goto parsesub; parsesub_return:;} -#define PARSEBACKQOLD() {oldstyle = 1; goto parsebackq; parsebackq_oldreturn:;} -#define PARSEBACKQNEW() {oldstyle = 0; goto parsebackq; parsebackq_newreturn:;} #define PARSEARITH() {goto parsearith; parsearith_return:;} STATIC int @@ -896,7 +1052,6 @@ readtoken1(int firstc, char const *synta int varnest; /* levels of variables expansion */ int arinest; /* levels of arithmetic expansion */ int parenlevel; /* levels of parens in arithmetic */ - int oldstyle; char const *prevsyntax; /* syntax before arithmetic */ int synentry; @@ -1029,7 +1184,8 @@ readtoken1(int firstc, char const *synta } break; case CBQUOTE: /* '`' */ - PARSEBACKQOLD(); + out = parsebackq(out, &bqlist, 1, dblquote, + arinest || dblquote); break; case CEOF: goto endword; /* exit outer loop */ @@ -1189,7 +1345,8 @@ parsesub: { PARSEARITH(); } else { pungetc(); - PARSEBACKQNEW(); + out = parsebackq(out, &bqlist, 0, dblquote, + arinest || dblquote); } } else { USTPUTC(CTLVAR, out); @@ -1296,167 +1453,6 @@ parsesub: { /* - * Called to parse command substitutions. Newstyle is set if the command - * is enclosed inside $(...); nlpp is a pointer to the head of the linked - * list of commands (passed by reference), and savelen is the number of - * characters on the top of the stack which must be preserved. - */ - -parsebackq: { - struct nodelist **nlpp; - union node *n; - char *volatile str; - struct jmploc jmploc; - struct jmploc *const savehandler = handler; - int savelen; - int saveprompt; - const int bq_startlinno = plinno; - char *volatile ostr = NULL; - struct parsefile *const savetopfile = getcurrentfile(); - - str = NULL; - if (setjmp(jmploc.loc)) { - popfilesupto(savetopfile); - if (str) - ckfree(str); - if (ostr) - ckfree(ostr); - handler = savehandler; - if (exception == EXERROR) { - startlinno = bq_startlinno; - synerror("Error in command substitution"); - } - longjmp(handler->loc, 1); - } - INTOFF; - savelen = out - stackblock(); - if (savelen > 0) { - str = ckmalloc(savelen); - memcpy(str, stackblock(), savelen); - } - handler = &jmploc; - INTON; - if (oldstyle) { - /* We must read until the closing backquote, giving special - treatment to some slashes, and then push the string and - reread it as input, interpreting it normally. */ - char *oout; - int c; - int olen; - - - STARTSTACKSTR(oout); - for (;;) { - if (needprompt) { - setprompt(2); - needprompt = 0; - } - switch (c = pgetc()) { - case '`': - goto done; - - case '\\': - if ((c = pgetc()) == '\n') { - plinno++; - if (doprompt) - setprompt(2); - else - setprompt(0); - /* - * If eating a newline, avoid putting - * the newline into the new character - * stream (via the STPUTC after the - * switch). - */ - continue; - } - if (c != '\\' && c != '`' && c != '$' - && (!dblquote || c != '"')) - STPUTC('\\', oout); - break; - - case '\n': - plinno++; - needprompt = doprompt; - break; - - case PEOF: - startlinno = plinno; - synerror("EOF in backquote substitution"); - break; - - default: - break; - } - STPUTC(c, oout); - } -done: - STPUTC('\0', oout); - olen = oout - stackblock(); - INTOFF; - ostr = ckmalloc(olen); - memcpy(ostr, stackblock(), olen); - setinputstring(ostr, 1); - INTON; - } - nlpp = &bqlist; - while (*nlpp) - nlpp = &(*nlpp)->next; - *nlpp = (struct nodelist *)stalloc(sizeof (struct nodelist)); - (*nlpp)->next = NULL; - - if (oldstyle) { - saveprompt = doprompt; - doprompt = 0; - } - - n = list(0); - - if (oldstyle) - doprompt = saveprompt; - else { - if (readtoken() != TRP) - synexpect(TRP); - } - - (*nlpp)->n = n; - if (oldstyle) { - /* - * Start reading from old file again, ignoring any pushed back - * tokens left from the backquote parsing - */ - popfile(); - tokpushback = 0; - } - while (stackblocksize() <= savelen) - growstackblock(); - STARTSTACKSTR(out); - if (str) { - memcpy(out, str, savelen); - STADJUST(savelen, out); - INTOFF; - ckfree(str); - str = NULL; - INTON; - } - if (ostr) { - INTOFF; - ckfree(ostr); - ostr = NULL; - INTON; - } - handler = savehandler; - if (arinest || dblquote) - USTPUTC(CTLBACKQ | CTLQUOTE, out); - else - USTPUTC(CTLBACKQ, out); - if (oldstyle) - goto parsebackq_oldreturn; - else - goto parsebackq_newreturn; -} - -/* * Parse an arithmetic expansion (indicate start of one and set state) */ parsearith: { Modified: projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c ============================================================================== --- projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c Sat Mar 20 14:53:52 2010 (r205374) @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -53,11 +53,14 @@ typedef struct zfs_node { } zfs_node_t; typedef struct callback_data { - uu_avl_t *cb_avl; - int cb_flags; - zfs_type_t cb_types; - zfs_sort_column_t *cb_sortcol; - zprop_list_t **cb_proplist; + uu_avl_t *cb_avl; + int cb_flags; + zfs_type_t cb_types; + zfs_sort_column_t *cb_sortcol; + zprop_list_t **cb_proplist; + int cb_depth_limit; + int cb_depth; + uint8_t cb_props_table[ZFS_NUM_PROPS]; } callback_data_t; uu_avl_pool_t *avl_pool; @@ -98,10 +101,17 @@ zfs_callback(zfs_handle_t *zhp, void *da uu_avl_node_init(node, &node->zn_avlnode, avl_pool); if (uu_avl_find(cb->cb_avl, node, cb->cb_sortcol, &idx) == NULL) { - if (cb->cb_proplist && - zfs_expand_proplist(zhp, cb->cb_proplist) != 0) { - free(node); - return (-1); + if (cb->cb_proplist) { + if ((*cb->cb_proplist) && + !(*cb->cb_proplist)->pl_all) + zfs_prune_proplist(zhp, + cb->cb_props_table); + + if (zfs_expand_proplist(zhp, cb->cb_proplist) + != 0) { + free(node); + return (-1); + } } uu_avl_insert(cb->cb_avl, node, idx); dontclose = 1; @@ -113,11 +123,15 @@ zfs_callback(zfs_handle_t *zhp, void *da /* * Recurse if necessary. */ - if (cb->cb_flags & ZFS_ITER_RECURSE) { + if (cb->cb_flags & ZFS_ITER_RECURSE && + ((cb->cb_flags & ZFS_ITER_DEPTH_LIMIT) == 0 || + cb->cb_depth < cb->cb_depth_limit)) { + cb->cb_depth++; if (zfs_get_type(zhp) == ZFS_TYPE_FILESYSTEM) (void) zfs_iter_filesystems(zhp, zfs_callback, data); if ((zfs_get_type(zhp) != ZFS_TYPE_SNAPSHOT) && include_snaps) (void) zfs_iter_snapshots(zhp, zfs_callback, data); + cb->cb_depth--; } if (!dontclose) @@ -325,10 +339,10 @@ zfs_sort(const void *larg, const void *r int zfs_for_each(int argc, char **argv, int flags, zfs_type_t types, - zfs_sort_column_t *sortcol, zprop_list_t **proplist, + zfs_sort_column_t *sortcol, zprop_list_t **proplist, int limit, zfs_iter_f callback, void *data) { - callback_data_t cb; + callback_data_t cb = {0}; int ret = 0; zfs_node_t *node; uu_avl_walk_t *walk; @@ -346,6 +360,45 @@ zfs_for_each(int argc, char **argv, int cb.cb_flags = flags; cb.cb_proplist = proplist; cb.cb_types = types; + cb.cb_depth_limit = limit; + /* + * If cb_proplist is provided then in the zfs_handles created we + * retain only those properties listed in cb_proplist and sortcol. + * The rest are pruned. So, the caller should make sure that no other + * properties other than those listed in cb_proplist/sortcol are + * accessed. + * + * If cb_proplist is NULL then we retain all the properties. We + * always retain the zoned property, which some other properties + * need (userquota & friends), and the createtxg property, which + * we need to sort snapshots. + */ + if (cb.cb_proplist && *cb.cb_proplist) { + zprop_list_t *p = *cb.cb_proplist; + + while (p) { + if (p->pl_prop >= ZFS_PROP_TYPE && + p->pl_prop < ZFS_NUM_PROPS) { + cb.cb_props_table[p->pl_prop] = B_TRUE; + } + p = p->pl_next; + } + + while (sortcol) { + if (sortcol->sc_prop >= ZFS_PROP_TYPE && + sortcol->sc_prop < ZFS_NUM_PROPS) { + cb.cb_props_table[sortcol->sc_prop] = B_TRUE; + } + sortcol = sortcol->sc_next; + } + + cb.cb_props_table[ZFS_PROP_ZONED] = B_TRUE; + cb.cb_props_table[ZFS_PROP_CREATETXG] = B_TRUE; + } else { + (void) memset(cb.cb_props_table, B_TRUE, + sizeof (cb.cb_props_table)); + } + if ((cb.cb_avl = uu_avl_create(avl_pool, NULL, UU_DEFAULT)) == NULL) { (void) fprintf(stderr, gettext("internal error: out of memory\n")); Modified: projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h ============================================================================== --- projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h Sat Mar 20 14:53:52 2010 (r205374) @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -41,9 +41,10 @@ typedef struct zfs_sort_column { #define ZFS_ITER_RECURSE (1 << 0) #define ZFS_ITER_ARGS_CAN_BE_PATHS (1 << 1) #define ZFS_ITER_PROP_LISTSNAPS (1 << 2) +#define ZFS_ITER_DEPTH_LIMIT (1 << 3) int zfs_for_each(int, char **, int options, zfs_type_t, - zfs_sort_column_t *, zprop_list_t **, zfs_iter_f, void *); + zfs_sort_column_t *, zprop_list_t **, int, zfs_iter_f, void *); int zfs_add_sort_column(zfs_sort_column_t **, const char *, boolean_t); void zfs_free_sort_columns(zfs_sort_column_t *); Modified: projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Sat Mar 20 14:53:52 2010 (r205374) @@ -190,8 +190,8 @@ get_usage(zfs_help_t idx) return (gettext("\tdestroy [-rRf] " "\n")); case HELP_GET: - return (gettext("\tget [-rHp] [-o field[,...]] " - "[-s source[,...]]\n" + return (gettext("\tget [-rHp] [-d max] " + "[-o field[,...]] [-s source[,...]]\n" "\t <\"all\" | property[,...]> " "[filesystem|volume|snapshot] ...\n")); case HELP_INHERIT: @@ -205,8 +205,8 @@ get_usage(zfs_help_t idx) case HELP_UNJAIL: return (gettext("\tunjail \n")); case HELP_LIST: - return (gettext("\tlist [-rH] [-o property[,...]] " - "[-t type[,...]] [-s property] ...\n" + return (gettext("\tlist [-rH][-d max] " + "[-o property[,...]] [-t type[,...]] [-s property] ...\n" "\t [-S property] ... " "[filesystem|volume|snapshot] ...\n")); case HELP_MOUNT: @@ -432,6 +432,27 @@ parseprop(nvlist_t *props) } +static int +parse_depth(char *opt, int *flags) +{ + char *tmp; + int depth; + + depth = (int)strtol(opt, &tmp, 0); + if (*tmp) { + (void) fprintf(stderr, + gettext("%s is not an integer\n"), optarg); + usage(B_FALSE); + } + if (depth < 0) { + (void) fprintf(stderr, + gettext("Depth can not be negative.\n")); + usage(B_FALSE); + } + *flags |= (ZFS_ITER_DEPTH_LIMIT|ZFS_ITER_RECURSE); + return (depth); +} + /* * zfs clone [-p] [-o prop=value] ... * @@ -1119,6 +1140,7 @@ zfs_do_get(int argc, char **argv) int i, c, flags = 0; char *value, *fields; int ret; + int limit = 0; zprop_list_t fake_name = { 0 }; /* @@ -1132,11 +1154,14 @@ zfs_do_get(int argc, char **argv) cb.cb_type = ZFS_TYPE_DATASET; /* check options */ - while ((c = getopt(argc, argv, ":o:s:rHp")) != -1) { + while ((c = getopt(argc, argv, ":d:o:s:rHp")) != -1) { switch (c) { case 'p': cb.cb_literal = B_TRUE; break; + case 'd': + limit = parse_depth(optarg, &flags); + break; case 'r': flags |= ZFS_ITER_RECURSE; break; @@ -1267,7 +1292,7 @@ zfs_do_get(int argc, char **argv) /* run for each object */ ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, NULL, - &cb.cb_proplist, get_callback, &cb); + &cb.cb_proplist, limit, get_callback, &cb); if (cb.cb_proplist == &fake_name) zprop_free_list(fake_name.pl_next); @@ -1380,10 +1405,10 @@ zfs_do_inherit(int argc, char **argv) if (flags & ZFS_ITER_RECURSE) { ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, - NULL, NULL, inherit_recurse_cb, propname); + NULL, NULL, 0, inherit_recurse_cb, propname); } else { ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_DATASET, - NULL, NULL, inherit_cb, propname); + NULL, NULL, 0, inherit_cb, propname); } return (ret); @@ -1578,7 +1603,7 @@ zfs_do_upgrade(int argc, char **argv) if (cb.cb_version == 0) cb.cb_version = ZPL_VERSION; ret = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_set_callback, &cb); + NULL, NULL, 0, upgrade_set_callback, &cb); (void) printf(gettext("%llu filesystems upgraded\n"), cb.cb_numupgraded); if (cb.cb_numsamegraded) { @@ -1596,14 +1621,14 @@ zfs_do_upgrade(int argc, char **argv) flags |= ZFS_ITER_RECURSE; ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_list_callback, &cb); + NULL, NULL, 0, upgrade_list_callback, &cb); found = cb.cb_foundone; cb.cb_foundone = B_FALSE; cb.cb_newer = B_TRUE; ret = zfs_for_each(0, NULL, flags, ZFS_TYPE_FILESYSTEM, - NULL, NULL, upgrade_list_callback, &cb); + NULL, NULL, 0, upgrade_list_callback, &cb); if (!cb.cb_foundone && !found) { (void) printf(gettext("All filesystems are " @@ -1615,11 +1640,12 @@ zfs_do_upgrade(int argc, char **argv) } /* - * list [-rH] [-o property[,property]...] [-t type[,type]...] + * list [-r][-d max] [-H] [-o property[,property]...] [-t type[,type]...] * [-s property [-s property]...] [-S property [-S property]...] * ... * * -r Recurse over all children + * -d Limit recursion by depth. * -H Scripted mode; elide headers and separate columns by tabs * -o Control which fields to display. * -t Control which object types to display. @@ -1769,16 +1795,20 @@ zfs_do_list(int argc, char **argv) char *fields = NULL; list_cbdata_t cb = { 0 }; char *value; + int limit = 0; int ret; zfs_sort_column_t *sortcol = NULL; int flags = ZFS_ITER_PROP_LISTSNAPS | ZFS_ITER_ARGS_CAN_BE_PATHS; /* check options */ - while ((c = getopt(argc, argv, ":o:rt:Hs:S:")) != -1) { + while ((c = getopt(argc, argv, ":d:o:rt:Hs:S:")) != -1) { switch (c) { case 'o': fields = optarg; break; + case 'd': + limit = parse_depth(optarg, &flags); + break; case 'r': flags |= ZFS_ITER_RECURSE; break; @@ -1869,7 +1899,7 @@ zfs_do_list(int argc, char **argv) cb.cb_first = B_TRUE; ret = zfs_for_each(argc, argv, flags, types, sortcol, &cb.cb_proplist, - list_callback, &cb); + limit, list_callback, &cb); zprop_free_list(cb.cb_proplist); zfs_free_sort_columns(sortcol); @@ -2252,7 +2282,7 @@ zfs_do_set(int argc, char **argv) } ret = zfs_for_each(argc - 2, argv + 2, NULL, - ZFS_TYPE_DATASET, NULL, NULL, set_callback, &cb); + ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); return (ret); } @@ -2886,7 +2916,7 @@ zfs_do_unallow(int argc, char **argv) flags |= ZFS_ITER_RECURSE; error = zfs_for_each(argc, argv, flags, ZFS_TYPE_FILESYSTEM|ZFS_TYPE_VOLUME, NULL, - NULL, unallow_callback, (void *)zperms); + NULL, 0, unallow_callback, (void *)zperms); if (zperms) nvlist_free(zperms); Modified: projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h ============================================================================== --- projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h Sat Mar 20 14:53:52 2010 (r205374) @@ -369,6 +369,7 @@ typedef struct zprop_list { } zprop_list_t; extern int zfs_expand_proplist(zfs_handle_t *, zprop_list_t **); +extern void zfs_prune_proplist(zfs_handle_t *, uint8_t *); #define ZFS_MOUNTPOINT_NONE "none" #define ZFS_MOUNTPOINT_LEGACY "legacy" Modified: projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Mar 20 14:49:44 2010 (r205373) +++ projects/ppc64/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Sat Mar 20 14:53:52 2010 (r205374) @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2045,6 +2045,8 @@ getprop_uint64(zfs_handle_t *zhp, zfs_pr verify(nvlist_lookup_uint64(nv, ZPROP_VALUE, &value) == 0); (void) nvlist_lookup_string(nv, ZPROP_SOURCE, source); } else { + verify(!zhp->zfs_props_table || + zhp->zfs_props_table[prop] == B_TRUE); value = zfs_prop_default_numeric(prop); *source = ""; } @@ -2064,6 +2066,8 @@ getprop_string(zfs_handle_t *zhp, zfs_pr verify(nvlist_lookup_string(nv, ZPROP_VALUE, &value) == 0); (void) nvlist_lookup_string(nv, ZPROP_SOURCE, source); } else { + verify(!zhp->zfs_props_table || + zhp->zfs_props_table[prop] == B_TRUE); if ((value = (char *)zfs_prop_default_string(prop)) == NULL) value = ""; *source = ""; @@ -4267,6 +4271,30 @@ zfs_deleg_share_nfs(libzfs_handle_t *hdl return (error); } +void +zfs_prune_proplist(zfs_handle_t *zhp, uint8_t *props) +{ + nvpair_t *curr; + + /* + * Keep a reference to the props-table against which we prune the + * properties. + */ + zhp->zfs_props_table = props; + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***