svn commit: r206285 - in user/jmallett/octeon: . bin/cp bin/ls
bin/pax bin/rcp bin/sh bin/test
cddl/contrib/opensolaris/lib/libzfs/common
contrib/bsnmp/gensnmpdef contrib/bsnmp/snmpd contrib/top co...
Juli Mallett
jmallett at FreeBSD.org
Tue Apr 6 19:26:00 UTC 2010
Author: jmallett
Date: Tue Apr 6 19:25:58 2010
New Revision: 206285
URL: http://svn.freebsd.org/changeset/base/206285
Log:
Merge from head.
Added:
user/jmallett/octeon/lib/libpmc/pmc.corei7.3
- copied unchanged from r206283, head/lib/libpmc/pmc.corei7.3
user/jmallett/octeon/lib/libpmc/pmc.corei7uc.3
- copied unchanged from r206283, head/lib/libpmc/pmc.corei7uc.3
user/jmallett/octeon/lib/libpmc/pmc.ucf.3
- copied unchanged from r206283, head/lib/libpmc/pmc.ucf.3
user/jmallett/octeon/lib/libpmc/pmc.westmere.3
- copied unchanged from r206283, head/lib/libpmc/pmc.westmere.3
user/jmallett/octeon/lib/libpmc/pmc.westmereuc.3
- copied unchanged from r206283, head/lib/libpmc/pmc.westmereuc.3
user/jmallett/octeon/share/examples/indent/
- copied from r206283, head/share/examples/indent/
user/jmallett/octeon/sys/dev/e1000/if_lem.c
- copied unchanged from r206283, head/sys/dev/e1000/if_lem.c
user/jmallett/octeon/sys/dev/e1000/if_lem.h
- copied unchanged from r206283, head/sys/dev/e1000/if_lem.h
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_uncore.c
- copied unchanged from r206283, head/sys/dev/hwpmc/hwpmc_uncore.c
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_uncore.h
- copied unchanged from r206283, head/sys/dev/hwpmc/hwpmc_uncore.h
user/jmallett/octeon/sys/modules/alq/
- copied from r206283, head/sys/modules/alq/
user/jmallett/octeon/tools/regression/bin/sh/expansion/arith4.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/arith4.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/arith5.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/arith5.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/plus-minus2.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/plus-minus2.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/tilde1.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/tilde1.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/tilde2.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/tilde2.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/trim1.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/trim1.0
user/jmallett/octeon/tools/regression/bin/sh/expansion/trim2.0
- copied unchanged from r206283, head/tools/regression/bin/sh/expansion/trim2.0
user/jmallett/octeon/tools/regression/bin/sh/parser/heredoc2.0
- copied unchanged from r206283, head/tools/regression/bin/sh/parser/heredoc2.0
user/jmallett/octeon/usr.bin/calendar/dates.c
- copied unchanged from r206283, head/usr.bin/calendar/dates.c
user/jmallett/octeon/usr.bin/calendar/events.c
- copied unchanged from r206283, head/usr.bin/calendar/events.c
user/jmallett/octeon/usr.bin/calendar/locale.c
- copied unchanged from r206283, head/usr.bin/calendar/locale.c
user/jmallett/octeon/usr.bin/calendar/parsedata.c
- copied unchanged from r206283, head/usr.bin/calendar/parsedata.c
user/jmallett/octeon/usr.bin/calendar/pom.c
- copied unchanged from r206283, head/usr.bin/calendar/pom.c
user/jmallett/octeon/usr.bin/calendar/sunpos.c
- copied unchanged from r206283, head/usr.bin/calendar/sunpos.c
user/jmallett/octeon/usr.sbin/services_mkdb/
- copied from r206283, head/usr.sbin/services_mkdb/
Deleted:
user/jmallett/octeon/bin/pax/cpio.1
user/jmallett/octeon/bin/pax/tar.1
user/jmallett/octeon/sys/ia64/include/nexusvar.h
Modified:
user/jmallett/octeon/ObsoleteFiles.inc
user/jmallett/octeon/UPDATING
user/jmallett/octeon/bin/cp/utils.c
user/jmallett/octeon/bin/ls/cmp.c
user/jmallett/octeon/bin/pax/Makefile
user/jmallett/octeon/bin/pax/getoldopt.c
user/jmallett/octeon/bin/rcp/rcp.c
user/jmallett/octeon/bin/sh/expand.c
user/jmallett/octeon/bin/sh/mksyntax.c
user/jmallett/octeon/bin/sh/options.c
user/jmallett/octeon/bin/sh/parser.c
user/jmallett/octeon/bin/sh/sh.1
user/jmallett/octeon/bin/test/test.c
user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
user/jmallett/octeon/contrib/bsnmp/gensnmpdef/gensnmpdef.c
user/jmallett/octeon/contrib/bsnmp/snmpd/config.c
user/jmallett/octeon/contrib/top/utils.h
user/jmallett/octeon/contrib/tzdata/asia
user/jmallett/octeon/contrib/tzdata/europe
user/jmallett/octeon/contrib/tzdata/zone.tab
user/jmallett/octeon/crypto/openssl/CHANGES
user/jmallett/octeon/crypto/openssl/FAQ
user/jmallett/octeon/crypto/openssl/Makefile
user/jmallett/octeon/crypto/openssl/NEWS
user/jmallett/octeon/crypto/openssl/README
user/jmallett/octeon/crypto/openssl/apps/req.c
user/jmallett/octeon/crypto/openssl/apps/speed.c
user/jmallett/octeon/crypto/openssl/config
user/jmallett/octeon/crypto/openssl/crypto/asn1/a_object.c
user/jmallett/octeon/crypto/openssl/crypto/bio/bss_file.c
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/ppc.pl
user/jmallett/octeon/crypto/openssl/crypto/bn/asm/x86_64-gcc.c
user/jmallett/octeon/crypto/openssl/crypto/bn/bn_div.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_all.c
user/jmallett/octeon/crypto/openssl/crypto/engine/eng_cryptodev.c
user/jmallett/octeon/crypto/openssl/crypto/evp/digest.c
user/jmallett/octeon/crypto/openssl/crypto/evp/evp_locl.h
user/jmallett/octeon/crypto/openssl/crypto/evp/names.c
user/jmallett/octeon/crypto/openssl/crypto/md32_common.h
user/jmallett/octeon/crypto/openssl/crypto/ocsp/ocsp_prn.c
user/jmallett/octeon/crypto/openssl/crypto/opensslv.h
user/jmallett/octeon/crypto/openssl/crypto/rand/rand_win.c
user/jmallett/octeon/crypto/openssl/engines/e_capi.c
user/jmallett/octeon/crypto/openssl/engines/e_chil.c
user/jmallett/octeon/crypto/openssl/fips/Makefile
user/jmallett/octeon/crypto/openssl/openssl.spec
user/jmallett/octeon/crypto/openssl/ssl/kssl.c
user/jmallett/octeon/crypto/openssl/ssl/s3_pkt.c
user/jmallett/octeon/etc/inetd.conf
user/jmallett/octeon/etc/rc.subr
user/jmallett/octeon/games/fortune/Notes
user/jmallett/octeon/games/fortune/datfiles/fortunes
user/jmallett/octeon/games/fortune/datfiles/fortunes-o.real
user/jmallett/octeon/games/fortune/datfiles/fortunes.sp.ok
user/jmallett/octeon/games/fortune/datfiles/limerick
user/jmallett/octeon/games/fortune/datfiles/startrek
user/jmallett/octeon/games/fortune/datfiles/zippy
user/jmallett/octeon/gnu/usr.bin/diff/context.c.diff
user/jmallett/octeon/gnu/usr.bin/diff/diff.c.diff
user/jmallett/octeon/include/inttypes.h
user/jmallett/octeon/include/netdb.h
user/jmallett/octeon/include/nsswitch.h
user/jmallett/octeon/lib/libc/db/hash/hash.c
user/jmallett/octeon/lib/libc/db/hash/hash.h
user/jmallett/octeon/lib/libc/db/man/hash.3
user/jmallett/octeon/lib/libc/gen/__getosreldate.c
user/jmallett/octeon/lib/libc/gen/_spinlock_stub.c
user/jmallett/octeon/lib/libc/gen/_thread_init.c
user/jmallett/octeon/lib/libc/net/getservent.c
user/jmallett/octeon/lib/libc/net/nsdispatch.3
user/jmallett/octeon/lib/libc/posix1e/acl_to_text_nfs4.c
user/jmallett/octeon/lib/libc/stdio/printf.3
user/jmallett/octeon/lib/libc/stdio/vasprintf.c
user/jmallett/octeon/lib/libc/sys/stat.2
user/jmallett/octeon/lib/libpmc/Makefile
user/jmallett/octeon/lib/libpmc/libpmc.c
user/jmallett/octeon/lib/libstand/assert.c
user/jmallett/octeon/lib/libusbhid/data.c
user/jmallett/octeon/lib/libusbhid/descr.c
user/jmallett/octeon/lib/libusbhid/parse.c
user/jmallett/octeon/lib/libusbhid/usage.c
user/jmallett/octeon/lib/libusbhid/usbhid.h
user/jmallett/octeon/lib/libusbhid/usbvar.h
user/jmallett/octeon/lib/libz/ChangeLog
user/jmallett/octeon/lib/libz/README
user/jmallett/octeon/lib/libz/crc32.c
user/jmallett/octeon/lib/libz/deflate.c
user/jmallett/octeon/lib/libz/gzguts.h (contents, props changed)
user/jmallett/octeon/lib/libz/gzlib.c
user/jmallett/octeon/lib/libz/gzread.c
user/jmallett/octeon/lib/libz/inftrees.c
user/jmallett/octeon/lib/libz/minigzip.c
user/jmallett/octeon/lib/libz/zconf.h
user/jmallett/octeon/lib/libz/zlib.3
user/jmallett/octeon/lib/libz/zlib.h
user/jmallett/octeon/lib/libz/zutil.c
user/jmallett/octeon/lib/libz/zutil.h
user/jmallett/octeon/libexec/fingerd/fingerd.8
user/jmallett/octeon/libexec/fingerd/fingerd.c
user/jmallett/octeon/sbin/geom/class/multipath/geom_multipath.c
user/jmallett/octeon/sbin/hastd/primary.c
user/jmallett/octeon/sbin/ipfw/ipfw2.c
user/jmallett/octeon/secure/lib/libcrypto/Makefile.inc
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_OBJECT_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_length.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3
user/jmallett/octeon/secure/lib/libcrypto/man/ASN1_generate_nconf.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_ctrl.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_base64.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_buffer.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_cipher.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_md.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_null.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_f_ssl.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_find_type.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_push.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_read.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_accept.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_bio.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_connect.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_fd.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_mem.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_null.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_s_socket.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_set_callback.3
user/jmallett/octeon/secure/lib/libcrypto/man/BIO_should_retry.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_BLINDING_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_CTX_start.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_add.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_add_word.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_bn2bin.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_cmp.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_copy.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_generate_prime.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_inverse.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_num_bytes.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_rand.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_set_bit.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_swap.3
user/jmallett/octeon/secure/lib/libcrypto/man/BN_zero.3
user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_free.3
user/jmallett/octeon/secure/lib/libcrypto/man/CONF_modules_load_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_generate_parameters.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/DH_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_SIG_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_do_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_dup_DH.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_generate_parameters.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/DSA_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_GET_LIB.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_clear_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_error_string.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_get_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_crypto_strings.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_load_strings.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_print_errors.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_put_error.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_remove_state.3
user/jmallett/octeon/secure/lib/libcrypto/man/ERR_set_mark.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_BytesToKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_DigestInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_EncryptInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_OpenInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SealInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_SignInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/EVP_VerifyInit.3
user/jmallett/octeon/secure/lib/libcrypto/man/OBJ_nid2obj.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_Applink.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_config.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_ia32cap.3
user/jmallett/octeon/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3
user/jmallett/octeon/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_create.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS12_parse.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_decrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/PKCS7_verify.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_add.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_bytes.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_cleanup.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_egd.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_load_file.3
user/jmallett/octeon/secure/lib/libcrypto/man/RAND_set_rand_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_blinding_on.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_check_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_generate_key.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_print.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_private_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_public_encrypt.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_set_method.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3
user/jmallett/octeon/secure/lib/libcrypto/man/RSA_size.3
user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_read_PKCS7.3
user/jmallett/octeon/secure/lib/libcrypto/man/SMIME_write_PKCS7.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_NAME_print_ex.3
user/jmallett/octeon/secure/lib/libcrypto/man/X509_new.3
user/jmallett/octeon/secure/lib/libcrypto/man/bio.3
user/jmallett/octeon/secure/lib/libcrypto/man/blowfish.3
user/jmallett/octeon/secure/lib/libcrypto/man/bn.3
user/jmallett/octeon/secure/lib/libcrypto/man/bn_internal.3
user/jmallett/octeon/secure/lib/libcrypto/man/buffer.3
user/jmallett/octeon/secure/lib/libcrypto/man/crypto.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DHparams.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_DSAPublicKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_RSAPublicKey.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_ALGOR.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_CRL.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_NAME.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_REQ.3
user/jmallett/octeon/secure/lib/libcrypto/man/d2i_X509_SIG.3
user/jmallett/octeon/secure/lib/libcrypto/man/des.3
user/jmallett/octeon/secure/lib/libcrypto/man/dh.3
user/jmallett/octeon/secure/lib/libcrypto/man/dsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/ecdsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/engine.3
user/jmallett/octeon/secure/lib/libcrypto/man/err.3
user/jmallett/octeon/secure/lib/libcrypto/man/evp.3
user/jmallett/octeon/secure/lib/libcrypto/man/hmac.3
user/jmallett/octeon/secure/lib/libcrypto/man/lh_stats.3
user/jmallett/octeon/secure/lib/libcrypto/man/lhash.3
user/jmallett/octeon/secure/lib/libcrypto/man/md5.3
user/jmallett/octeon/secure/lib/libcrypto/man/mdc2.3
user/jmallett/octeon/secure/lib/libcrypto/man/pem.3
user/jmallett/octeon/secure/lib/libcrypto/man/rand.3
user/jmallett/octeon/secure/lib/libcrypto/man/rc4.3
user/jmallett/octeon/secure/lib/libcrypto/man/ripemd.3
user/jmallett/octeon/secure/lib/libcrypto/man/rsa.3
user/jmallett/octeon/secure/lib/libcrypto/man/sha.3
user/jmallett/octeon/secure/lib/libcrypto/man/threads.3
user/jmallett/octeon/secure/lib/libcrypto/man/ui.3
user/jmallett/octeon/secure/lib/libcrypto/man/ui_compat.3
user/jmallett/octeon/secure/lib/libcrypto/man/x509.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CIPHER_get_name.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_COMP_add_compression_method.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_add_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_ctrl.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_flush_sessions.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_new.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_number.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_sessions.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_store.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_info_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_options.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_timeout.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_set_verify.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_CTX_use_certificate.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_SESSION_get_time.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_accept.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_alert_type_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_clear.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_connect.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_do_handshake.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_free.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_SSL_CTX.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ciphers.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_client_CA_list.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_current_cipher.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_default_timeout.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_error.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_ex_new_index.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_fd.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_cert_chain.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_peer_certificate.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_rbio.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_verify_result.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_get_version.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_library_init.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_load_client_CA_file.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_new.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_pending.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_read.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_rstate_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_session_reused.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_bio.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_connect_state.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_fd.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_session.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_set_verify_result.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_shutdown.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_state_string.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_want.3
user/jmallett/octeon/secure/lib/libssl/man/SSL_write.3
user/jmallett/octeon/secure/lib/libssl/man/d2i_SSL_SESSION.3
user/jmallett/octeon/secure/lib/libssl/man/ssl.3
user/jmallett/octeon/secure/usr.bin/openssl/man/CA.pl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/asn1parse.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ca.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ciphers.1
user/jmallett/octeon/secure/usr.bin/openssl/man/crl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/crl2pkcs7.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dgst.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dhparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/dsaparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ec.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ecparam.1
user/jmallett/octeon/secure/usr.bin/openssl/man/enc.1
user/jmallett/octeon/secure/usr.bin/openssl/man/errstr.1
user/jmallett/octeon/secure/usr.bin/openssl/man/gendsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/genrsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/nseq.1
user/jmallett/octeon/secure/usr.bin/openssl/man/ocsp.1
user/jmallett/octeon/secure/usr.bin/openssl/man/openssl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/passwd.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs12.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs7.1
user/jmallett/octeon/secure/usr.bin/openssl/man/pkcs8.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rand.1
user/jmallett/octeon/secure/usr.bin/openssl/man/req.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rsa.1
user/jmallett/octeon/secure/usr.bin/openssl/man/rsautl.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_client.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_server.1
user/jmallett/octeon/secure/usr.bin/openssl/man/s_time.1
user/jmallett/octeon/secure/usr.bin/openssl/man/sess_id.1
user/jmallett/octeon/secure/usr.bin/openssl/man/smime.1
user/jmallett/octeon/secure/usr.bin/openssl/man/speed.1
user/jmallett/octeon/secure/usr.bin/openssl/man/spkac.1
user/jmallett/octeon/secure/usr.bin/openssl/man/verify.1
user/jmallett/octeon/secure/usr.bin/openssl/man/version.1
user/jmallett/octeon/secure/usr.bin/openssl/man/x509.1
user/jmallett/octeon/secure/usr.bin/openssl/man/x509v3_config.1
user/jmallett/octeon/share/man/man5/nsswitch.conf.5
user/jmallett/octeon/share/man/man5/services.5
user/jmallett/octeon/share/man/man7/build.7
user/jmallett/octeon/share/man/man9/ieee80211.9
user/jmallett/octeon/share/man/man9/ieee80211_crypto.9
user/jmallett/octeon/share/man/man9/ieee80211_node.9
user/jmallett/octeon/share/man/man9/ieee80211_output.9
user/jmallett/octeon/share/man/man9/ieee80211_scan.9
user/jmallett/octeon/share/misc/committers-ports.dot
user/jmallett/octeon/share/mk/bsd.lib.mk
user/jmallett/octeon/share/mk/bsd.port.mk
user/jmallett/octeon/share/mk/bsd.prog.mk
user/jmallett/octeon/share/mk/sys.mk
user/jmallett/octeon/sys/amd64/amd64/apic_vector.S
user/jmallett/octeon/sys/amd64/amd64/local_apic.c
user/jmallett/octeon/sys/amd64/amd64/pmap.c
user/jmallett/octeon/sys/amd64/include/apicvar.h
user/jmallett/octeon/sys/amd64/include/pmc_mdep.h
user/jmallett/octeon/sys/amd64/include/reg.h
user/jmallett/octeon/sys/amd64/linux32/linux.h
user/jmallett/octeon/sys/arm/conf/KB920X
user/jmallett/octeon/sys/arm/mv/mv_sata.c
user/jmallett/octeon/sys/cam/cam_xpt.c
user/jmallett/octeon/sys/cam/scsi/scsi_all.h
user/jmallett/octeon/sys/cam/scsi/scsi_da.c
user/jmallett/octeon/sys/compat/freebsd32/freebsd32.h
user/jmallett/octeon/sys/compat/freebsd32/freebsd32_misc.c
user/jmallett/octeon/sys/compat/ia32/ia32_signal.h
user/jmallett/octeon/sys/compat/linprocfs/linprocfs.c
user/jmallett/octeon/sys/compat/linux/linux_stats.c
user/jmallett/octeon/sys/compat/svr4/svr4_stat.c
user/jmallett/octeon/sys/conf/NOTES
user/jmallett/octeon/sys/conf/files
user/jmallett/octeon/sys/conf/files.amd64
user/jmallett/octeon/sys/conf/files.i386
user/jmallett/octeon/sys/conf/files.pc98
user/jmallett/octeon/sys/conf/kern.mk
user/jmallett/octeon/sys/conf/kern.post.mk
user/jmallett/octeon/sys/conf/kern.pre.mk
user/jmallett/octeon/sys/conf/kmod.mk
user/jmallett/octeon/sys/contrib/dev/acpica/changes.txt
user/jmallett/octeon/sys/contrib/dev/acpica/common/dmextern.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslanalyze.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslcompiler.h
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslpredef.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/aslstubs.c
user/jmallett/octeon/sys/contrib/dev/acpica/compiler/asltypes.h
user/jmallett/octeon/sys/contrib/dev/acpica/debugger/dbdisply.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpe.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evgpeblk.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evxface.c
user/jmallett/octeon/sys/contrib/dev/acpica/events/evxfevnt.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exdebug.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exmutex.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exoparg2.c
user/jmallett/octeon/sys/contrib/dev/acpica/executer/exregion.c
user/jmallett/octeon/sys/contrib/dev/acpica/include/acevents.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acexcep.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acglobal.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/aclocal.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/acpixf.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/actables.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/actypes.h
user/jmallett/octeon/sys/contrib/dev/acpica/include/platform/acfreebsd.h
user/jmallett/octeon/sys/contrib/dev/acpica/parser/psxface.c
user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbutils.c
user/jmallett/octeon/sys/contrib/dev/acpica/tables/tbxface.c
user/jmallett/octeon/sys/contrib/dev/acpica/utilities/utglobal.c
user/jmallett/octeon/sys/dev/acpica/acpi.c
user/jmallett/octeon/sys/dev/acpica/acpi_button.c
user/jmallett/octeon/sys/dev/acpica/acpi_ec.c
user/jmallett/octeon/sys/dev/acpica/acpi_lid.c
user/jmallett/octeon/sys/dev/acpica/acpivar.h
user/jmallett/octeon/sys/dev/ata/ata-all.h
user/jmallett/octeon/sys/dev/bce/if_bce.c
user/jmallett/octeon/sys/dev/bce/if_bcereg.h
user/jmallett/octeon/sys/dev/bktr/ioctl_bt848.h
user/jmallett/octeon/sys/dev/bktr/ioctl_meteor.h
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_ael1002.c
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_common.h
user/jmallett/octeon/sys/dev/cxgb/common/cxgb_t3_hw.c
user/jmallett/octeon/sys/dev/cxgb/cxgb_adapter.h
user/jmallett/octeon/sys/dev/cxgb/cxgb_main.c
user/jmallett/octeon/sys/dev/cxgb/cxgb_sge.c
user/jmallett/octeon/sys/dev/e1000/e1000_80003es2lan.c
user/jmallett/octeon/sys/dev/e1000/e1000_82571.c
user/jmallett/octeon/sys/dev/e1000/e1000_82575.c
user/jmallett/octeon/sys/dev/e1000/e1000_82575.h
user/jmallett/octeon/sys/dev/e1000/e1000_defines.h
user/jmallett/octeon/sys/dev/e1000/e1000_hw.h
user/jmallett/octeon/sys/dev/e1000/e1000_ich8lan.c
user/jmallett/octeon/sys/dev/e1000/e1000_ich8lan.h
user/jmallett/octeon/sys/dev/e1000/e1000_mac.c
user/jmallett/octeon/sys/dev/e1000/e1000_manage.c
user/jmallett/octeon/sys/dev/e1000/e1000_phy.c
user/jmallett/octeon/sys/dev/e1000/e1000_regs.h
user/jmallett/octeon/sys/dev/e1000/if_em.c
user/jmallett/octeon/sys/dev/e1000/if_em.h
user/jmallett/octeon/sys/dev/e1000/if_igb.c
user/jmallett/octeon/sys/dev/e1000/if_igb.h
user/jmallett/octeon/sys/dev/firewire/sbp.c
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.c
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_core.h
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_intel.c
user/jmallett/octeon/sys/dev/hwpmc/hwpmc_mod.c
user/jmallett/octeon/sys/dev/hwpmc/pmc_events.h
user/jmallett/octeon/sys/dev/ixgbe/LICENSE
user/jmallett/octeon/sys/dev/ixgbe/ixgbe.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe.h
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_82598.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_82599.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_api.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_api.h
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_common.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_phy.c
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_phy.h
user/jmallett/octeon/sys/dev/ixgbe/ixgbe_type.h
user/jmallett/octeon/sys/dev/malo/if_malo.c
user/jmallett/octeon/sys/dev/mpt/mpt_cam.c
user/jmallett/octeon/sys/dev/ofw/ofw_standard.c
user/jmallett/octeon/sys/dev/sound/pci/envy24.c
user/jmallett/octeon/sys/dev/sound/pci/envy24.h
user/jmallett/octeon/sys/dev/sound/pci/envy24ht.c
user/jmallett/octeon/sys/dev/sound/pci/envy24ht.h
user/jmallett/octeon/sys/dev/sound/pci/es137x.c
user/jmallett/octeon/sys/dev/sound/pci/spicds.c
user/jmallett/octeon/sys/dev/sound/pci/spicds.h
user/jmallett/octeon/sys/dev/sound/pcm/dsp.c
user/jmallett/octeon/sys/dev/syscons/scvidctl.c
user/jmallett/octeon/sys/dev/syscons/syscons.c
user/jmallett/octeon/sys/dev/ubsec/ubsec.c
user/jmallett/octeon/sys/dev/usb/controller/ehci_pci.c
user/jmallett/octeon/sys/dev/usb/controller/ohci_pci.c
user/jmallett/octeon/sys/dev/usb/input/ukbd.c
user/jmallett/octeon/sys/dev/usb/quirk/usb_quirk.c
user/jmallett/octeon/sys/dev/usb/usb_compat_linux.c
user/jmallett/octeon/sys/dev/usb/usbdevs
user/jmallett/octeon/sys/fs/coda/cnode.h
user/jmallett/octeon/sys/fs/coda/coda.h
user/jmallett/octeon/sys/fs/coda/coda_subr.c
user/jmallett/octeon/sys/fs/coda/coda_subr.h
user/jmallett/octeon/sys/fs/coda/coda_venus.c
user/jmallett/octeon/sys/fs/coda/coda_venus.h
user/jmallett/octeon/sys/fs/coda/coda_vfsops.c
user/jmallett/octeon/sys/fs/coda/coda_vfsops.h
user/jmallett/octeon/sys/fs/coda/coda_vnops.c
user/jmallett/octeon/sys/fs/deadfs/dead_vnops.c
user/jmallett/octeon/sys/fs/msdosfs/msdosfs_vfsops.c
user/jmallett/octeon/sys/fs/nfs/nfs_commonport.c
user/jmallett/octeon/sys/fs/nfs/nfs_commonsubs.c
user/jmallett/octeon/sys/fs/nfs/nfs_var.h
user/jmallett/octeon/sys/fs/nfs/nfsport.h
user/jmallett/octeon/sys/fs/nfs/nfsrvstate.h
user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdport.c
user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdserv.c
user/jmallett/octeon/sys/fs/nfsserver/nfs_nfsdstate.c
user/jmallett/octeon/sys/geom/geom_vfs.c
user/jmallett/octeon/sys/geom/multipath/g_multipath.c
user/jmallett/octeon/sys/i386/i386/apic_vector.s
user/jmallett/octeon/sys/i386/i386/local_apic.c
user/jmallett/octeon/sys/i386/i386/pmap.c
user/jmallett/octeon/sys/i386/ibcs2/ibcs2_stat.c
user/jmallett/octeon/sys/i386/include/apicvar.h
user/jmallett/octeon/sys/i386/include/pmc_mdep.h
user/jmallett/octeon/sys/i386/linux/linux.h
user/jmallett/octeon/sys/ia64/conf/GENERIC
user/jmallett/octeon/sys/ia64/ia64/autoconf.c
user/jmallett/octeon/sys/ia64/ia64/interrupt.c
user/jmallett/octeon/sys/ia64/ia64/mp_machdep.c
user/jmallett/octeon/sys/ia64/ia64/nexus.c
user/jmallett/octeon/sys/ia64/ia64/sapic.c
user/jmallett/octeon/sys/ia64/include/intr.h
user/jmallett/octeon/sys/kern/init_main.c
user/jmallett/octeon/sys/kern/kern_alq.c
user/jmallett/octeon/sys/kern/kern_event.c
user/jmallett/octeon/sys/kern/kern_sig.c
user/jmallett/octeon/sys/kern/sys_pipe.c
user/jmallett/octeon/sys/kern/tty_pts.c
user/jmallett/octeon/sys/kern/uipc_mqueue.c
user/jmallett/octeon/sys/kern/uipc_sem.c
user/jmallett/octeon/sys/kern/uipc_shm.c
user/jmallett/octeon/sys/kern/vfs_bio.c
user/jmallett/octeon/sys/kern/vfs_default.c
user/jmallett/octeon/sys/kern/vfs_subr.c
user/jmallett/octeon/sys/kern/vfs_syscalls.c
user/jmallett/octeon/sys/kern/vfs_vnops.c
user/jmallett/octeon/sys/mips/conf/AR71XX
user/jmallett/octeon/sys/modules/Makefile
user/jmallett/octeon/sys/modules/em/Makefile
user/jmallett/octeon/sys/modules/hwpmc/Makefile
user/jmallett/octeon/sys/modules/ixgbe/Makefile
user/jmallett/octeon/sys/net/bpf.c
user/jmallett/octeon/sys/net80211/ieee80211_hostap.c
user/jmallett/octeon/sys/net80211/ieee80211_input.c
user/jmallett/octeon/sys/net80211/ieee80211_var.h
user/jmallett/octeon/sys/netgraph/ng_deflate.c
user/jmallett/octeon/sys/netgraph/ng_ksocket.c
user/jmallett/octeon/sys/netgraph/ng_l2tp.c
user/jmallett/octeon/sys/netgraph/ng_mppc.c
user/jmallett/octeon/sys/netgraph/ng_ppp.c
user/jmallett/octeon/sys/netgraph/ng_pptpgre.c
user/jmallett/octeon/sys/netgraph/ng_tcpmss.c
user/jmallett/octeon/sys/netinet/in.h
user/jmallett/octeon/sys/netinet/ipfw/ip_dn_io.c
user/jmallett/octeon/sys/netinet/ipfw/ip_fw_sockopt.c
user/jmallett/octeon/sys/netinet/sctp_asconf.c
user/jmallett/octeon/sys/netinet/sctp_constants.h
user/jmallett/octeon/sys/netinet/sctp_indata.c
user/jmallett/octeon/sys/netinet/sctp_indata.h
user/jmallett/octeon/sys/netinet/sctp_input.c
user/jmallett/octeon/sys/netinet/sctp_output.c
user/jmallett/octeon/sys/netinet/sctp_output.h
user/jmallett/octeon/sys/netinet/sctp_pcb.c
user/jmallett/octeon/sys/netinet/sctp_pcb.h
user/jmallett/octeon/sys/netinet/sctp_structs.h
user/jmallett/octeon/sys/netinet/sctp_usrreq.c
user/jmallett/octeon/sys/netinet/sctp_var.h
user/jmallett/octeon/sys/netinet/sctputil.c
user/jmallett/octeon/sys/netinet/sctputil.h
user/jmallett/octeon/sys/netinet6/sctp6_usrreq.c
user/jmallett/octeon/sys/netipsec/ipsec.c
user/jmallett/octeon/sys/netipsec/key.c
user/jmallett/octeon/sys/powerpc/ofw/ofw_real.c
user/jmallett/octeon/sys/powerpc/ofw/ofw_syscons.c
user/jmallett/octeon/sys/sparc64/fhc/fhc.c
user/jmallett/octeon/sys/sparc64/pci/apb.c
user/jmallett/octeon/sys/sparc64/pci/psycho.c
user/jmallett/octeon/sys/sparc64/pci/schizo.c
user/jmallett/octeon/sys/sparc64/sbus/sbus.c
user/jmallett/octeon/sys/sparc64/sparc64/trap.c
user/jmallett/octeon/sys/sys/_timespec.h
user/jmallett/octeon/sys/sys/ioccom.h
user/jmallett/octeon/sys/sys/pcpu.h
user/jmallett/octeon/sys/sys/pmc.h
user/jmallett/octeon/sys/sys/proc.h
user/jmallett/octeon/sys/sys/stat.h
user/jmallett/octeon/sys/sys/timespec.h
user/jmallett/octeon/sys/sys/vnode.h
user/jmallett/octeon/sys/sys/vtoc.h
user/jmallett/octeon/sys/teken/teken.c
user/jmallett/octeon/sys/ufs/ffs/ffs_vfsops.c
user/jmallett/octeon/sys/vm/vm_fault.c
user/jmallett/octeon/sys/vm/vm_map.c
user/jmallett/octeon/sys/vm/vm_map.h
user/jmallett/octeon/sys/vm/vm_page.c
user/jmallett/octeon/sys/vm/vm_pageout.c
user/jmallett/octeon/tools/tools/nanobsd/gateworks/common
user/jmallett/octeon/tools/tools/nanobsd/nanobsd.sh
user/jmallett/octeon/usr.bin/calendar/Makefile
user/jmallett/octeon/usr.bin/calendar/calendar.1
user/jmallett/octeon/usr.bin/calendar/calendar.c
user/jmallett/octeon/usr.bin/calendar/calendar.h
user/jmallett/octeon/usr.bin/calendar/calendars/calendar.australia
user/jmallett/octeon/usr.bin/calendar/calendars/calendar.dutch
user/jmallett/octeon/usr.bin/calendar/calendars/calendar.freebsd
user/jmallett/octeon/usr.bin/calendar/day.c
user/jmallett/octeon/usr.bin/calendar/io.c
user/jmallett/octeon/usr.bin/calendar/ostern.c
user/jmallett/octeon/usr.bin/calendar/paskha.c
user/jmallett/octeon/usr.bin/calendar/pathnames.h
user/jmallett/octeon/usr.bin/compress/compress.c
user/jmallett/octeon/usr.bin/getent/getent.c
user/jmallett/octeon/usr.bin/gzip/gzip.c
user/jmallett/octeon/usr.bin/indent/args.c
user/jmallett/octeon/usr.bin/indent/indent.1
user/jmallett/octeon/usr.bin/indent/indent.c
user/jmallett/octeon/usr.bin/indent/indent_globs.h
user/jmallett/octeon/usr.bin/indent/lexi.c
user/jmallett/octeon/usr.bin/kdump/kdump.c
user/jmallett/octeon/usr.bin/mail/util.c
user/jmallett/octeon/usr.bin/make/main.c
user/jmallett/octeon/usr.bin/sed/main.c
user/jmallett/octeon/usr.bin/sed/sed.1
user/jmallett/octeon/usr.bin/sockstat/sockstat.c
user/jmallett/octeon/usr.bin/touch/touch.c
user/jmallett/octeon/usr.sbin/Makefile
user/jmallett/octeon/usr.sbin/ac/ac.c
user/jmallett/octeon/usr.sbin/config/config.y
user/jmallett/octeon/usr.sbin/config/lang.l
user/jmallett/octeon/usr.sbin/config/main.c
user/jmallett/octeon/usr.sbin/config/mkmakefile.c
user/jmallett/octeon/usr.sbin/config/mkoptions.c
user/jmallett/octeon/usr.sbin/mailwrapper/mailwrapper.8
user/jmallett/octeon/usr.sbin/mailwrapper/mailwrapper.c
user/jmallett/octeon/usr.sbin/mtree/compare.c
user/jmallett/octeon/usr.sbin/mtree/create.c
user/jmallett/octeon/usr.sbin/mtree/mtree.8
user/jmallett/octeon/usr.sbin/pkg_install/add/futil.c
user/jmallett/octeon/usr.sbin/pkg_install/add/perform.c
user/jmallett/octeon/usr.sbin/pkg_install/delete/perform.c
user/jmallett/octeon/usr.sbin/pkg_install/lib/file.c
user/jmallett/octeon/usr.sbin/pkg_install/lib/lib.h
user/jmallett/octeon/usr.sbin/pkg_install/lib/match.c
user/jmallett/octeon/usr.sbin/pkg_install/lib/pen.c
user/jmallett/octeon/usr.sbin/pkg_install/lib/plist.c
user/jmallett/octeon/usr.sbin/pkg_install/lib/url.c
user/jmallett/octeon/usr.sbin/pkg_install/version/perform.c
user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_callgraph.c
user/jmallett/octeon/usr.sbin/pmcstat/pmcpl_calltree.c
user/jmallett/octeon/usr.sbin/pmcstat/pmcstat_log.c
user/jmallett/octeon/usr.sbin/pmcstat/pmcstat_log.h
user/jmallett/octeon/usr.sbin/vidcontrol/vidcontrol.c
Directory Properties:
user/jmallett/octeon/ (props changed)
user/jmallett/octeon/contrib/tzdata/ (props changed)
user/jmallett/octeon/crypto/openssl/ (props changed)
user/jmallett/octeon/lib/libz/ (props changed)
user/jmallett/octeon/sys/contrib/dev/acpica/ (props changed)
user/jmallett/octeon/sys/contrib/x86emu/ (props changed)
Modified: user/jmallett/octeon/ObsoleteFiles.inc
==============================================================================
--- user/jmallett/octeon/ObsoleteFiles.inc Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/ObsoleteFiles.inc Tue Apr 6 19:25:58 2010 (r206285)
@@ -14,11 +14,14 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20100326: [ia64] removed <machine/nexusvar.h>
+.if ${TARGET_ARCH} == "ia64"
+OLD_FILES+=usr/include/machine/nexusvar.h
+.endif
# 20100326: gcpio removal
OLD_FILES+=usr/bin/gcpio
OLD_FILES+=usr/share/info/cpio.info.gz
OLD_FILES+=usr/share/man/man1/gcpio.1.gz
-
# 20100322: libz update
OLD_LIBS+=lib/libz.so.5
.if ${TARGET_ARCH} == "amd64"
Modified: user/jmallett/octeon/UPDATING
==============================================================================
--- user/jmallett/octeon/UPDATING Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/UPDATING Tue Apr 6 19:25:58 2010 (r206285)
@@ -22,6 +22,16 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9.
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20100402:
+ WITH_CTF can now be specified in src.conf (not recommended, there
+ are some problems with static executables), make.conf (would also
+ affect ports which do not use GNU make and do not override the
+ compile targets) or in the kernel config (via "makeoptions
+ WITH_CTF=yes").
+ When WITH_CTF was specified there before this was silently ignored,
+ so make sure that WITH_CTF is not used in places which could lead
+ to unwanted behavior.
+
20100311:
The kernel option COMPAT_IA32 has been replaced with COMPAT_FREEBSD32
to allow 32-bit compatibility on non-x86 platforms. All kernel
Modified: user/jmallett/octeon/bin/cp/utils.c
==============================================================================
--- user/jmallett/octeon/bin/cp/utils.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/cp/utils.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/ls/cmp.c
==============================================================================
--- user/jmallett/octeon/bin/ls/cmp.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/ls/cmp.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/pax/Makefile
==============================================================================
--- user/jmallett/octeon/bin/pax/Makefile Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/pax/Makefile Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/pax/getoldopt.c
==============================================================================
--- user/jmallett/octeon/bin/pax/getoldopt.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/pax/getoldopt.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/rcp/rcp.c
==============================================================================
--- user/jmallett/octeon/bin/rcp/rcp.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/rcp/rcp.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/sh/expand.c
==============================================================================
--- user/jmallett/octeon/bin/sh/expand.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/sh/expand.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/sh/mksyntax.c
==============================================================================
--- user/jmallett/octeon/bin/sh/mksyntax.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/sh/mksyntax.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -232,8 +232,6 @@ main(int argc __unused, char **argv __un
add("\n", "CNL");
add("\\", "CBACK");
add("`", "CBQUOTE");
- add("'", "CSQUOTE");
- add("\"", "CDQUOTE");
add("$", "CVAR");
add("}", "CENDVAR");
add("(", "CLP");
Modified: user/jmallett/octeon/bin/sh/options.c
==============================================================================
--- user/jmallett/octeon/bin/sh/options.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/sh/options.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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/jmallett/octeon/bin/sh/parser.c
==============================================================================
--- user/jmallett/octeon/bin/sh/parser.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/sh/parser.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -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;
+ t->next = parser_temp;
+ parser_temp = t;
+ t->data = ckmalloc(len);
+ INTON;
+ return t->data;
+}
+
+
+STATIC void *
+parser_temp_realloc(void *ptr, size_t len)
+{
+ struct parser_temp *t;
+
+ INTOFF;
+ t = parser_temp;
+ if (ptr != t->data)
+ error("bug: parser_temp_realloc misused");
+ t->data = ckrealloc(t->data, len);
+ INTON;
+ return t->data;
+}
+
+
+STATIC void
+parser_temp_free_upto(void *ptr)
+{
+ struct parser_temp *t;
+ int done = 0;
+
+ INTOFF;
+ while (parser_temp != NULL && !done) {
+ t = parser_temp;
+ parser_temp = t->next;
+ done = t->data == ptr;
+ ckfree(t->data);
+ ckfree(t);
+ }
+ INTON;
+ if (!done)
+ error("bug: parser_temp_free_upto misused");
+}
+
+
+STATIC void
+parser_temp_free_all(void)
+{
+ struct parser_temp *t;
+
+ INTOFF;
+ while (parser_temp != NULL) {
+ t = parser_temp;
+ parser_temp = t->next;
+ ckfree(t->data);
+ ckfree(t);
+ }
+ INTON;
+}
+
+
/*
* Read and parse a command. Returns NEOF on end of file. (NULL is a
* valid parse tree indicating a blank line.)
@@ -127,6 +199,11 @@ parsecmd(int interact)
{
int t;
+ /* This assumes the parser is not re-entered,
+ * which could happen if we add command substitution on PS1/PS2.
+ */
+ parser_temp_free_all();
+
tokpushback = 0;
doprompt = interact;
if (doprompt)
@@ -863,6 +940,21 @@ breakloop:
}
+#define MAXNEST_STATIC 8
+struct tokenstate
+{
+ const char *syntax; /* *SYNTAX */
+ int parenlevel; /* levels of parentheses in arithmetic */
+ enum tokenstate_category
+ {
+ TSTATE_TOP,
+ TSTATE_VAR_OLD, /* ${var+-=?}, inherits dquotes */
+ TSTATE_VAR_NEW, /* other ${var...}, own dquote state */
+ TSTATE_ARITH
+ } category;
+};
+
+
/*
* Called to parse command substitutions.
*/
@@ -1040,7 +1132,7 @@ done:
#define PARSEARITH() {goto parsearith; parsearith_return:;}
STATIC int
-readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
+readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs)
{
int c = firstc;
char *out;
@@ -1048,22 +1140,21 @@ readtoken1(int firstc, char const *synta
char line[EOFMARKLEN + 1];
struct nodelist *bqlist;
int quotef;
- int dblquote;
- int varnest; /* levels of variables expansion */
- int arinest; /* levels of arithmetic expansion */
- int parenlevel; /* levels of parens in arithmetic */
- char const *prevsyntax; /* syntax before arithmetic */
+ int newvarnest;
+ int level;
int synentry;
+ struct tokenstate state_static[MAXNEST_STATIC];
+ int maxnest = MAXNEST_STATIC;
+ struct tokenstate *state = state_static;
startlinno = plinno;
- dblquote = 0;
- if (syntax == DQSYNTAX)
- dblquote = 1;
quotef = 0;
bqlist = NULL;
- varnest = 0;
- arinest = 0;
- parenlevel = 0;
+ newvarnest = 0;
+ level = 0;
+ state[level].syntax = initialsyntax;
+ state[level].parenlevel = 0;
+ state[level].category = TSTATE_TOP;
STARTSTACKSTR(out);
loop: { /* for each line, until end of word */
@@ -1071,11 +1162,11 @@ readtoken1(int firstc, char const *synta
for (;;) { /* until end of line or end of word */
CHECKSTRSPACE(3, out); /* permit 3 calls to USTPUTC */
- synentry = syntax[c];
+ synentry = state[level].syntax[c];
switch(synentry) {
case CNL: /* '\n' */
- if (syntax == BASESYNTAX)
+ if (state[level].syntax == BASESYNTAX)
goto endword; /* exit outer loop */
USTPUTC(c, out);
plinno++;
@@ -1089,7 +1180,7 @@ readtoken1(int firstc, char const *synta
USTPUTC(c, out);
break;
case CCTL:
- if (eofmark == NULL || dblquote)
+ if (eofmark == NULL || initialsyntax != SQSYNTAX)
USTPUTC(CTLESC, out);
USTPUTC(c, out);
break;
@@ -1105,41 +1196,34 @@ readtoken1(int firstc, char const *synta
else
setprompt(0);
} else {
- if (dblquote && c != '\\' &&
- c != '`' && c != '$' &&
- (c != '"' || eofmark != NULL))
+ if (state[level].syntax == DQSYNTAX &&
+ c != '\\' && c != '`' && c != '$' &&
+ (c != '"' || (eofmark != NULL &&
+ newvarnest == 0)) &&
+ (c != '}' || state[level].category != TSTATE_VAR_OLD))
USTPUTC('\\', out);
if (SQSYNTAX[c] == CCTL)
USTPUTC(CTLESC, out);
- else if (eofmark == NULL)
+ else if (eofmark == NULL ||
+ newvarnest > 0)
USTPUTC(CTLQUOTEMARK, out);
USTPUTC(c, out);
quotef++;
}
break;
case CSQUOTE:
- if (eofmark == NULL)
- USTPUTC(CTLQUOTEMARK, out);
- syntax = SQSYNTAX;
+ USTPUTC(CTLQUOTEMARK, out);
+ state[level].syntax = SQSYNTAX;
break;
case CDQUOTE:
- if (eofmark == NULL)
- USTPUTC(CTLQUOTEMARK, out);
- syntax = DQSYNTAX;
- dblquote = 1;
+ USTPUTC(CTLQUOTEMARK, out);
+ state[level].syntax = DQSYNTAX;
break;
case CENDQUOTE:
- if (eofmark != NULL && arinest == 0 &&
- varnest == 0) {
+ if (eofmark != NULL && newvarnest == 0)
USTPUTC(c, out);
- } else {
- if (arinest) {
- syntax = ARISYNTAX;
- dblquote = 0;
- } else if (eofmark == NULL) {
- syntax = BASESYNTAX;
- dblquote = 0;
- }
+ else {
+ state[level].syntax = BASESYNTAX;
quotef++;
}
break;
@@ -1147,30 +1231,33 @@ readtoken1(int firstc, char const *synta
PARSESUB(); /* parse substitution */
break;
case CENDVAR: /* '}' */
- if (varnest > 0) {
- varnest--;
+ if (level > 0 &&
+ (state[level].category == TSTATE_VAR_OLD ||
+ state[level].category == TSTATE_VAR_NEW)) {
+ if (state[level].category == TSTATE_VAR_OLD)
+ state[level - 1].syntax = state[level].syntax;
+ else
+ newvarnest--;
+ level--;
USTPUTC(CTLENDVAR, out);
} else {
USTPUTC(c, out);
}
break;
case CLP: /* '(' in arithmetic */
- parenlevel++;
+ state[level].parenlevel++;
USTPUTC(c, out);
break;
case CRP: /* ')' in arithmetic */
- if (parenlevel > 0) {
+ if (state[level].parenlevel > 0) {
USTPUTC(c, out);
- --parenlevel;
+ --state[level].parenlevel;
} else {
if (pgetc() == ')') {
- if (--arinest == 0) {
+ if (level > 0 &&
+ state[level].category == TSTATE_ARITH) {
+ level--;
USTPUTC(CTLENDARI, out);
- syntax = prevsyntax;
- if (syntax == DQSYNTAX)
- dblquote = 1;
- else
- dblquote = 0;
} else
USTPUTC(')', out);
} else {
@@ -1184,13 +1271,15 @@ readtoken1(int firstc, char const *synta
}
break;
case CBQUOTE: /* '`' */
- out = parsebackq(out, &bqlist, 1, dblquote,
- arinest || dblquote);
+ out = parsebackq(out, &bqlist, 1,
+ state[level].syntax == DQSYNTAX &&
+ (eofmark == NULL || newvarnest > 0),
+ state[level].syntax == DQSYNTAX || state[level].syntax == ARISYNTAX);
break;
case CEOF:
goto endword; /* exit outer loop */
default:
- if (varnest == 0)
+ if (level == 0)
goto endword; /* exit outer loop */
USTPUTC(c, out);
}
@@ -1198,14 +1287,17 @@ readtoken1(int firstc, char const *synta
}
}
endword:
- if (syntax == ARISYNTAX)
+ if (state[level].syntax == ARISYNTAX)
synerror("Missing '))'");
- if (syntax != BASESYNTAX && eofmark == NULL)
+ if (state[level].syntax != BASESYNTAX && eofmark == NULL)
synerror("Unterminated quoted string");
- if (varnest != 0) {
+ if (state[level].category == TSTATE_VAR_OLD ||
+ state[level].category == TSTATE_VAR_NEW) {
startlinno = plinno;
synerror("Missing '}'");
}
+ if (state != state_static)
+ parser_temp_free_upto(state);
USTPUTC('\0', out);
len = out - stackblock();
out = stackblock();
@@ -1228,7 +1320,6 @@ endword:
/* end of readtoken routine */
-
/*
* Check to see whether we are at the end of the here document. When this
* is called, c is set to the first character of the next input line. If
@@ -1345,8 +1436,11 @@ parsesub: {
PARSEARITH();
} else {
pungetc();
- out = parsebackq(out, &bqlist, 0, dblquote,
- arinest || dblquote);
+ out = parsebackq(out, &bqlist, 0,
+ state[level].syntax == DQSYNTAX &&
+ (eofmark == NULL || newvarnest > 0),
+ state[level].syntax == DQSYNTAX ||
+ state[level].syntax == ARISYNTAX);
}
} else {
USTPUTC(CTLVAR, out);
@@ -1401,6 +1495,8 @@ parsesub: {
subtype = VSERROR;
if (c == '}')
pungetc();
+ else if (c == '\n' || c == PEOF)
+ synerror("Unexpected end of line in substitution");
else
USTPUTC(c, out);
} else {
@@ -1417,6 +1513,8 @@ parsesub: {
default:
p = strchr(types, c);
if (p == NULL) {
+ if (c == '\n' || c == PEOF)
+ synerror("Unexpected end of line in substitution");
if (flags == VSNUL)
STPUTC(':', out);
STPUTC(c, out);
@@ -1442,11 +1540,44 @@ parsesub: {
pungetc();
}
STPUTC('=', out);
- if (subtype != VSLENGTH && (dblquote || arinest))
+ if (subtype != VSLENGTH && (state[level].syntax == DQSYNTAX ||
+ state[level].syntax == ARISYNTAX))
flags |= VSQUOTE;
*(stackblock() + typeloc) = subtype | flags;
- if (subtype != VSNORMAL)
- varnest++;
+ if (subtype != VSNORMAL) {
+ if (level + 1 >= maxnest) {
+ maxnest *= 2;
+ if (state == state_static) {
+ state = parser_temp_alloc(
+ maxnest * sizeof(*state));
+ memcpy(state, state_static,
+ MAXNEST_STATIC * sizeof(*state));
+ } else
+ state = parser_temp_realloc(state,
+ maxnest * sizeof(*state));
+ }
+ level++;
+ state[level].parenlevel = 0;
+ if (subtype == VSMINUS || subtype == VSPLUS ||
+ subtype == VSQUESTION || subtype == VSASSIGN) {
+ /*
+ * For operators that were in the Bourne shell,
+ * inherit the double-quote state.
+ */
+ state[level].syntax = state[level - 1].syntax;
+ state[level].category = TSTATE_VAR_OLD;
+ } else {
+ /*
+ * The other operators take a pattern,
+ * so go to BASESYNTAX.
+ * Also, ' and " are now special, even
+ * in here documents.
+ */
+ state[level].syntax = BASESYNTAX;
+ state[level].category = TSTATE_VAR_NEW;
+ newvarnest++;
+ }
+ }
}
goto parsesub_return;
}
@@ -1457,21 +1588,26 @@ parsesub: {
*/
parsearith: {
- if (++arinest == 1) {
- prevsyntax = syntax;
- syntax = ARISYNTAX;
- USTPUTC(CTLARI, out);
- if (dblquote)
- USTPUTC('"',out);
- else
- USTPUTC(' ',out);
- } else {
- /*
- * we collapse embedded arithmetic expansion to
- * parenthesis, which should be equivalent
- */
- USTPUTC('(', out);
+ if (level + 1 >= maxnest) {
+ maxnest *= 2;
+ if (state == state_static) {
+ state = parser_temp_alloc(
+ maxnest * sizeof(*state));
+ memcpy(state, state_static,
+ MAXNEST_STATIC * sizeof(*state));
+ } else
+ state = parser_temp_realloc(state,
+ maxnest * sizeof(*state));
}
+ level++;
+ state[level].syntax = ARISYNTAX;
+ state[level].parenlevel = 0;
+ state[level].category = TSTATE_ARITH;
+ USTPUTC(CTLARI, out);
+ if (state[level - 1].syntax == DQSYNTAX)
+ USTPUTC('"',out);
+ else
+ USTPUTC(' ',out);
goto parsearith_return;
}
Modified: user/jmallett/octeon/bin/sh/sh.1
==============================================================================
--- user/jmallett/octeon/bin/sh/sh.1 Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/sh/sh.1 Tue Apr 6 19:25:58 2010 (r206285)
@@ -32,7 +32,7 @@
.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\" $FreeBSD$
.\"
-.Dd March 6, 2010
+.Dd April 5, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -210,7 +210,8 @@ Enable the built-in
.Xr emacs 1
command line editor (disables the
.Fl V
-option if it has been set).
+option if it has been set;
+set automatically when interactive on terminals).
.It Fl e Li errexit
Exit immediately if any untested command fails in non-interactive mode.
The exit status of a command is considered to be
@@ -1178,10 +1179,20 @@ consists of all characters until the mat
.Ql } .
Any
.Ql }
-escaped by a backslash or within a quoted string, and characters in
+escaped by a backslash or within a single-quoted string, and characters in
embedded arithmetic expansions, command substitutions, and variable
expansions, are not examined in determining the matching
.Ql } .
+Except for the variants with
+.Ql + ,
+.Ql - ,
+.Ql =
+or
+.Ql ?\& ,
+any
+.Ql }
+within a double-quoted string is also not examined in determining the matching
+.Ql } .
.Pp
The simplest form for parameter expansion is:
.Pp
@@ -1265,6 +1276,14 @@ is substituted.
In the parameter expansions shown previously, use of the colon in the
format results in a test for a parameter that is unset or null; omission
of the colon results in a test for a parameter that is only unset.
+.Pp
+The
+.Ar word
+inherits the type of quoting
+(unquoted, double-quoted or here-document)
+from the surroundings,
+with the exception that a backslash that quotes a closing brace is removed
+during quote removal.
.Bl -tag -width indent
.It Li ${# Ns Ar parameter Ns Li }
String Length.
Modified: user/jmallett/octeon/bin/test/test.c
==============================================================================
--- user/jmallett/octeon/bin/test/test.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/bin/test/test.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -572,12 +572,12 @@ newerf (const char *f1, const char *f2)
if (stat(f1, &b1) != 0 || stat(f2, &b2) != 0)
return 0;
- if (b1.st_mtimespec.tv_sec > b2.st_mtimespec.tv_sec)
+ if (b1.st_mtim.tv_sec > b2.st_mtim.tv_sec)
return 1;
- if (b1.st_mtimespec.tv_sec < b2.st_mtimespec.tv_sec)
+ if (b1.st_mtim.tv_sec < b2.st_mtim.tv_sec)
return 0;
- return (b1.st_mtimespec.tv_nsec > b2.st_mtimespec.tv_nsec);
+ return (b1.st_mtim.tv_nsec > b2.st_mtim.tv_nsec);
}
static int
Modified: user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
==============================================================================
--- user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -4288,7 +4288,12 @@ zfs_prune_proplist(zfs_handle_t *zhp, ui
zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr));
nvpair_t *next = nvlist_next_nvpair(zhp->zfs_props, curr);
- if (props[zfs_prop] == B_FALSE)
+ /*
+ * We leave user:props in the nvlist, so there will be
+ * some ZPROP_INVAL. To be extra safe, don't prune
+ * those.
+ */
+ if (zfs_prop != ZPROP_INVAL && props[zfs_prop] == B_FALSE)
(void) nvlist_remove(zhp->zfs_props,
nvpair_name(curr), nvpair_type(curr));
curr = next;
Modified: user/jmallett/octeon/contrib/bsnmp/gensnmpdef/gensnmpdef.c
==============================================================================
--- user/jmallett/octeon/contrib/bsnmp/gensnmpdef/gensnmpdef.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/contrib/bsnmp/gensnmpdef/gensnmpdef.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -59,7 +59,7 @@ struct tdef {
SLIST_ENTRY(tdef) link;
};
-static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdef);
+static SLIST_HEAD(, tdef) tdefs = SLIST_HEAD_INITIALIZER(tdefs);
static int do_typedef = 0;
static void print_node(SmiNode *n, u_int level);
Modified: user/jmallett/octeon/contrib/bsnmp/snmpd/config.c
==============================================================================
--- user/jmallett/octeon/contrib/bsnmp/snmpd/config.c Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/contrib/bsnmp/snmpd/config.c Tue Apr 6 19:25:58 2010 (r206285)
@@ -134,7 +134,7 @@ struct macro {
LIST_ENTRY(macro) link;
int perm;
};
-static LIST_HEAD(, macro) macros = LIST_HEAD_INITIALIZER(¯os);
+static LIST_HEAD(, macro) macros = LIST_HEAD_INITIALIZER(macros);
enum {
TOK_EOF = 0200,
Modified: user/jmallett/octeon/contrib/top/utils.h
==============================================================================
--- user/jmallett/octeon/contrib/top/utils.h Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/contrib/top/utils.h Tue Apr 6 19:25:58 2010 (r206285)
@@ -21,4 +21,4 @@ long percentages();
char *errmsg();
char *format_time();
char *format_k();
-char *format_k2();
+char *format_k2(unsigned long long);
Modified: user/jmallett/octeon/contrib/tzdata/asia
==============================================================================
--- user/jmallett/octeon/contrib/tzdata/asia Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/contrib/tzdata/asia Tue Apr 6 19:25:58 2010 (r206285)
@@ -1,4 +1,4 @@
-# @(#)asia 8.56
+# @(#)asia 8.58
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
@@ -214,42 +214,20 @@ Zone Asia/Bahrain 3:22:20 - LMT 1920 #
# 2010 midnight. The decision came at a cabinet meeting at the Prime
# Minister's Office last night..."
-# From Danvin Ruangchan (2009-12-24):
-# ...the news mentions DST will be turned off again 7 months after March
-# 31st on Oct 31, 2010.
-
-# From Arthur David Olson (2009-12-26):
-# Indeed, "The government will advance again the Banglasdesh Standard
-# Time by one one hour on March 31 next year by enforcing the Daylight
-# Saving Time (DST) for seven months. It will continue till October 31
-# until further notice." I take that last sentence as the
-# establishment of a rule.
-
-# From Nobutomo Nakano (2010-02-19):
-# We received a report from Bangladesh saying that the start/end of
-# Bangladesh DST is incorrect. Currently we have only the Bengali version
-# of the official mail from BTRC which describes the following:
-#
-# "From 2010 each year when local standard time is about to reach
-# March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM)
-# and when local daylight time is about to October 31 at 11:59:00 PM
-# clocks are turned backward 1 hour (10:59:00 PM)."
-#
-# So, DST will start/end 1 minute earlier.
-
-# From Arthur David Olson (2010-03-03):
-# The file
-# <a href=http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf>
-# http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf
+# From Alexander Krivenyshev (2010-03-22):
+# According to Bangladesh newspaper "The Daily Star,"
+# Cabinet cancels Daylight Saving Time
+# <a href="http://www.thedailystar.net/newDesign/latest_news.php?nid=22817">
+# http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
+# </a>
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html">
+# http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
# </a>
-# is in Bengali; it does contain two "31"s as well as two "11.59"s and a "10.59"
-# which is consistent with the information provided by Nobutomo Nakano.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Dhaka 2009 only - Jun 19 23:00 1:00 S
Rule Dhaka 2009 only - Dec 31 23:59 0 -
-Rule Dhaka 2010 max - Mar 31 22:59 1:00 S
-Rule Dhaka 2010 max - Oct 31 23:59 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Dhaka 6:01:40 - LMT 1890
@@ -2129,6 +2107,32 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
# http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html
# </a>
+# From Alexander Krivenyshev (2010-03-19):
+# According to Voice of Palestine DST will last for 191 days, from March
+# 26, 2010 till "the last Sunday before the tenth day of Tishri
+# (October), each year" (October 03, 2010?)
+#
+# <a href="http://palvoice.org/forums/showthread.php?t=245697">
+# http://palvoice.org/forums/showthread.php?t=245697
+# </a>
+# (in Arabic)
+# or
+# <a href="http://www.worldtimezone.com/dst_news/dst_news_westbank03.html">
+# http://www.worldtimezone.com/dst_news/dst_news_westbank03.html
+# </a>
+
+# From Steffen Thorsen (2010-03-24):
+# ...Ma'an News Agency reports that Hamas cabinet has decided it will
+# start one day later, at 12:01am. Not sure if they really mean 12:01am or
+# noon though:
+#
+# <a href="http://www.maannews.net/eng/ViewDetails.aspx?ID=271178">
+# http://www.maannews.net/eng/ViewDetails.aspx?ID=271178
+# </a>
+# (Ma'an News Agency)
+# "At 12:01am Friday, clocks in Israel and the West Bank will change to
+# 1:01am, while Gaza clocks will change at 12:01am Saturday morning."
+
# The rules for Egypt are stolen from the `africa' file.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -2146,7 +2150,8 @@ Rule Palestine 2006 2008 - Apr 1 0:00 1
Rule Palestine 2006 only - Sep 22 0:00 0 -
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
Rule Palestine 2008 only - Aug lastFri 2:00 0 -
-Rule Palestine 2009 max - Mar lastFri 0:00 1:00 S
+Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S
+Rule Palestine 2010 max - Mar lastSat 0:01 1:00 S
Rule Palestine 2009 max - Sep Fri>=1 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Modified: user/jmallett/octeon/contrib/tzdata/europe
==============================================================================
--- user/jmallett/octeon/contrib/tzdata/europe Tue Apr 6 19:20:31 2010 (r206284)
+++ user/jmallett/octeon/contrib/tzdata/europe Tue Apr 6 19:25:58 2010 (r206285)
@@ -1,5 +1,5 @@
# <pre>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list