Date: Mon, 5 Apr 2004 18:20:40 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 50440 for review Message-ID: <200404060120.i361KexR066315@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=50440 Change 50440 by peter@peter_daintree on 2004/04/05 18:19:41 IFC @50439 Affected files ... .. //depot/projects/hammer/bin/ls/print.c#10 integrate .. //depot/projects/hammer/bin/ps/ps.c#10 integrate .. //depot/projects/hammer/contrib/com_err/ChangeLog#2 integrate .. //depot/projects/hammer/contrib/com_err/Makefile.am#2 integrate .. //depot/projects/hammer/contrib/com_err/Makefile.in#2 integrate .. //depot/projects/hammer/contrib/com_err/com_err.c#2 integrate .. //depot/projects/hammer/contrib/com_err/com_err.h#2 integrate .. //depot/projects/hammer/contrib/com_err/com_right.h#2 integrate .. //depot/projects/hammer/contrib/com_err/compile_et.c#2 integrate .. //depot/projects/hammer/contrib/com_err/compile_et.h#2 integrate .. //depot/projects/hammer/contrib/com_err/error.c#2 integrate .. //depot/projects/hammer/contrib/com_err/lex.h#1 branch .. //depot/projects/hammer/contrib/com_err/lex.l#2 integrate .. //depot/projects/hammer/contrib/com_err/parse.y#2 integrate .. //depot/projects/hammer/contrib/com_err/roken_rename.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/ChangeLog#6 integrate .. //depot/projects/hammer/crypto/heimdal/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/NEWS#5 integrate .. //depot/projects/hammer/crypto/heimdal/TODO#2 delete .. //depot/projects/hammer/crypto/heimdal/acinclude.m4#2 delete .. //depot/projects/hammer/crypto/heimdal/aclocal.m4#6 integrate .. //depot/projects/hammer/crypto/heimdal/admin/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/admin/ktutil.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/ChangeLog#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/afsutil/afslog.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ChangeLog#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/common/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.1#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/ftp.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/gssapi.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/main.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftp/security.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.8#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpd.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/ftp/ftpd/ftpusers.cat5#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/kf/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/kf/kf.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/kf/kfd.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/login/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/push/pfrom.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/push/push.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/rcp/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/rsh/rshd.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/su/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/ChangeLog#6 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/libtelnet/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/main.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnet/telnet.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/appl/test/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/cf/ChangeLog#5 integrate .. //depot/projects/hammer/crypto/heimdal/cf/Makefile.am.common#4 integrate .. //depot/projects/hammer/crypto/heimdal/cf/aix.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/auth-modules.m4#4 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-getaddrinfo.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-getnameinfo.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-glob.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-realloc.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/broken-snprintf.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/c-attribute.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/c-function.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/capabilities.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-compile-et.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-declaration.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-getpwnam_r-posix.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-man.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-netinet-ip-and-tcp.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-type-extra.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-x.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/check-xau.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/find-func-no-libs.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/find-func-no-libs2.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/find-func.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/find-if-not-broken.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/have-pragma-weak.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/have-struct-field.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/have-type.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/have-types.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-bigendian.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-func-getcwd-broken.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-func-getlogin.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-ipv6.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-prog-ln-s.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-prog-ranlib.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-prog-yacc.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-readline.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-struct-spwd.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-struct-winsize.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-sys-aix.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-sys-nextstep.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/krb-version.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/mips-abi.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/need-proto.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/osfc2.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/proto-compat.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/retsigtype.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/cf/roken-frag.m4#5 integrate .. //depot/projects/hammer/crypto/heimdal/cf/roken.m4#3 integrate .. //depot/projects/hammer/crypto/heimdal/cf/test-package.m4#4 integrate .. //depot/projects/hammer/crypto/heimdal/cf/wflags.m4#2 integrate .. //depot/projects/hammer/crypto/heimdal/config.guess#4 integrate .. //depot/projects/hammer/crypto/heimdal/config.sub#4 integrate .. //depot/projects/hammer/crypto/heimdal/configure#6 integrate .. //depot/projects/hammer/crypto/heimdal/configure.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/doc/Makefile.am#2 integrate .. //depot/projects/hammer/crypto/heimdal/doc/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/doc/ack.texi#4 integrate .. //depot/projects/hammer/crypto/heimdal/doc/setup.texi#3 integrate .. //depot/projects/hammer/crypto/heimdal/include/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/include/config.h.in#4 integrate .. //depot/projects/hammer/crypto/heimdal/include/kadm5/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/install-sh#4 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmin.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kadmin/kadmind.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kdc/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/config.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/connect.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/hprop.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kdc/hpropd.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kdc/kaserver.c#6 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kdc.8#4 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kdc.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kdc/kdc_locl.h#4 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos4.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kerberos5.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/kdc/kstash.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kdc/string2key.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kpasswd/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswd.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/kpasswd/kpasswdd.cat8#4 delete .. //depot/projects/hammer/crypto/heimdal/kuser/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kdestroy.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/kuser/kgetcred.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/kinit.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/kuser/klist.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/kuser/klist.cat1#4 delete .. //depot/projects/hammer/crypto/heimdal/lib/45/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.am#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/der_free.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/der_length.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/der_locl.h#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/gen_free.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/asn1/gen_length.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/afskauthlib/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/pam/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/auth/sia/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/com_err/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/8003.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/ChangeLog#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/Makefile.am#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/accept_sec_context.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/acquire_cred.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/add_cred.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/arcfour.c#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/arcfour.h#1 branch .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/context_time.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/decapsulate.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/encapsulate.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/get_mic.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/gssapi_locl.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/init_sec_context.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/release_cred.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/unwrap.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/verify_mic.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/gssapi/wrap.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/Makefile.am#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/db3.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb-ldap.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/hdb/hdb_locl.h#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/ChangeLog#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/chpass_s.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/init_c.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/ipropd_slave.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kadm5/truncate_log.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/kafs/kafs.cat3#4 delete .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.am#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/config_file.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/crypto.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/eai_to_heim_errno.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/fcache.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_cred.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_for_creds.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/get_in_tkt.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-private.h#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5-protos.h#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.conf.5#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/krb5.h#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mcache.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_req_ext.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/mk_safe.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/parse-name-test.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/principal.c#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/rd_req.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/store.c#3 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/ticket.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/transited.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/krb5/verify_krb5_conf.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/ChangeLog#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.am#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/config.h.in#2 delete .. //depot/projects/hammer/crypto/heimdal/lib/roken/gai_strerror.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/ndbm_wrap.c#2 integrate .. //depot/projects/hammer/crypto/heimdal/lib/roken/roken-common.h#4 integrate .. //depot/projects/hammer/crypto/heimdal/lib/sl/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/vers/Makefile.in#5 integrate .. //depot/projects/hammer/crypto/heimdal/lib/vers/print_version.c#4 integrate .. //depot/projects/hammer/crypto/heimdal/ltconfig#2 integrate .. //depot/projects/hammer/crypto/heimdal/ltmain.sh#3 integrate .. //depot/projects/hammer/crypto/heimdal/missing#4 integrate .. //depot/projects/hammer/crypto/heimdal/mkinstalldirs#4 integrate .. //depot/projects/hammer/crypto/heimdal/tools/Makefile.in#6 integrate .. //depot/projects/hammer/crypto/heimdal/tools/krb5-config.cat1#4 delete .. //depot/projects/hammer/crypto/openssl/crypto/pkcs7/pk7_doit.c#5 integrate .. //depot/projects/hammer/etc/defaults/rc.conf#25 integrate .. //depot/projects/hammer/etc/inetd.conf#6 integrate .. //depot/projects/hammer/etc/newsyslog.conf#9 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#22 integrate .. //depot/projects/hammer/etc/rc.d/ipfw#7 integrate .. //depot/projects/hammer/etc/rc.d/natd#1 branch .. //depot/projects/hammer/etc/rc.d/sendmail#6 integrate .. //depot/projects/hammer/gnu/usr.bin/send-pr/categories#3 integrate .. //depot/projects/hammer/kerberos5/lib/libgssapi/Makefile#5 integrate .. //depot/projects/hammer/lib/libarchive/Makefile#4 integrate .. //depot/projects/hammer/lib/libarchive/archive.h#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_entry.h#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_private.h#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.3#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_extract.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_compression_none.c#3 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#5 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.3#2 integrate .. //depot/projects/hammer/lib/libarchive/archive_write.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_open_fd.c#1 branch .. //depot/projects/hammer/lib/libarchive/archive_write_open_file.c#4 integrate .. //depot/projects/hammer/lib/libarchive/archive_write_set_format_pax.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/gb18030.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/mbrtowc.c#4 integrate .. //depot/projects/hammer/lib/libc/locale/setrunelocale.c#10 integrate .. //depot/projects/hammer/lib/libc/locale/table.c#5 integrate .. //depot/projects/hammer/lib/libc/locale/utf2.c#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcrtomb.c#5 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#9 integrate .. //depot/projects/hammer/lib/libc/sys/Makefile.inc#15 integrate .. //depot/projects/hammer/lib/libc/sys/getfh.2#3 integrate .. //depot/projects/hammer/libexec/rshd/rshd.c#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/installation/common/install.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#7 integrate .. //depot/projects/hammer/sbin/gconcat/gconcat.c#3 integrate .. //depot/projects/hammer/sbin/growfs/Makefile#4 integrate .. //depot/projects/hammer/sbin/growfs/debug.c#5 integrate .. //depot/projects/hammer/sbin/growfs/growfs.c#9 integrate .. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#6 integrate .. //depot/projects/hammer/share/colldef/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/polling.4#8 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#25 integrate .. //depot/projects/hammer/share/mk/bsd.cpu.mk#16 integrate .. //depot/projects/hammer/share/monetdef/Makefile#12 integrate .. //depot/projects/hammer/share/msgdef/Makefile#12 integrate .. //depot/projects/hammer/share/numericdef/Makefile#11 integrate .. //depot/projects/hammer/share/timedef/Makefile#12 integrate .. //depot/projects/hammer/sys/alpha/alpha/clock.c#6 integrate .. //depot/projects/hammer/sys/alpha/alpha/genassym.c#5 integrate .. //depot/projects/hammer/sys/alpha/alpha/mem.c#8 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#20 integrate .. //depot/projects/hammer/sys/alpha/alpha/sys_machdep.c#7 integrate .. //depot/projects/hammer/sys/alpha/alpha/uio_machdep.c#2 integrate .. //depot/projects/hammer/sys/alpha/alpha/vm_machdep.c#15 integrate .. //depot/projects/hammer/sys/alpha/include/_limits.h#6 integrate .. //depot/projects/hammer/sys/alpha/include/cpu.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/endian.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/float.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/ieee.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/in_cksum.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/param.h#6 integrate .. //depot/projects/hammer/sys/alpha/include/pmap.h#7 integrate .. //depot/projects/hammer/sys/alpha/include/ptrace.h#2 integrate .. //depot/projects/hammer/sys/alpha/include/sysarch.h#3 integrate .. //depot/projects/hammer/sys/alpha/include/vmparam.h#3 integrate .. //depot/projects/hammer/sys/alpha/isa/isa_dma.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/apic_vector.S#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/autoconf.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/cpu_switch.S#24 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#26 integrate .. //depot/projects/hammer/sys/amd64/amd64/fpu.c#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/genassym.c#32 integrate .. //depot/projects/hammer/sys/amd64/amd64/mem.c#17 integrate .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#61 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/sys_machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/uio_machdep.c#2 integrate .. //depot/projects/hammer/sys/amd64/amd64/vm_machdep.c#37 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_signal.c#13 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/asmacros.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/cpu.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/cpufunc.h#25 integrate .. //depot/projects/hammer/sys/amd64/include/endian.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/exec.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/float.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/fpu.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/frame.h#11 integrate .. //depot/projects/hammer/sys/amd64/include/in_cksum.h#8 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/pcb.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/pmap.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/proc.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/profile.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/psl.h#6 integrate .. //depot/projects/hammer/sys/amd64/include/ptrace.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/reg.h#10 integrate .. //depot/projects/hammer/sys/amd64/include/reloc.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/segments.h#17 integrate .. //depot/projects/hammer/sys/amd64/include/signal.h#9 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#13 integrate .. //depot/projects/hammer/sys/amd64/include/sysarch.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/trap.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/tss.h#8 integrate .. //depot/projects/hammer/sys/amd64/isa/atpic_vector.S#14 integrate .. //depot/projects/hammer/sys/amd64/isa/clock.c#19 integrate .. //depot/projects/hammer/sys/amd64/isa/icu.h#18 integrate .. //depot/projects/hammer/sys/amd64/isa/isa.h#7 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.c#10 integrate .. //depot/projects/hammer/sys/amd64/isa/isa_dma.h#5 integrate .. //depot/projects/hammer/sys/amd64/isa/nmi.c#9 integrate .. //depot/projects/hammer/sys/amd64/isa/timerreg.h#6 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#5 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#5 integrate .. //depot/projects/hammer/sys/arm/include/signal.h#3 integrate .. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#5 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#9 integrate .. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#7 integrate .. //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#6 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/dinode.h#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/fs.h#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/inode.h#2 integrate .. //depot/projects/hammer/sys/boot/pc98/boot2/quota.h#2 integrate .. //depot/projects/hammer/sys/boot/sparc64/loader/metadata.c#10 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#12 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#12 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#12 integrate .. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#12 integrate .. //depot/projects/hammer/sys/compat/ndis/kern_ndis.c#13 integrate .. //depot/projects/hammer/sys/compat/ndis/ndis_var.h#9 integrate .. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#11 integrate .. //depot/projects/hammer/sys/conf/files#54 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/acfreebsd.h#10 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#20 integrate .. //depot/projects/hammer/sys/dev/bfe/if_bfereg.h#2 integrate .. //depot/projects/hammer/sys/dev/fb/creator.c#4 integrate .. //depot/projects/hammer/sys/dev/fb/vga.c#15 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#13 integrate .. //depot/projects/hammer/sys/dev/md/md.c#29 integrate .. //depot/projects/hammer/sys/dev/puc/puc_sbus.c#2 integrate .. //depot/projects/hammer/sys/dev/uart/uart_bus_ebus.c#3 integrate .. //depot/projects/hammer/sys/dev/uart/uart_cpu_sparc64.c#8 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#21 integrate .. //depot/projects/hammer/sys/i386/conf/NOTES#38 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#12 integrate .. //depot/projects/hammer/sys/i386/i386/elan-mmcr.c#15 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/hammer/sys/i386/i386/pmap.c#31 integrate .. //depot/projects/hammer/sys/i386/i386/uio_machdep.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/vm_machdep.c#27 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#9 integrate .. //depot/projects/hammer/sys/i386/include/pmap.h#11 integrate .. //depot/projects/hammer/sys/i386/isa/cy.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#21 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#9 integrate .. //depot/projects/hammer/sys/isa/psm.c#15 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#16 integrate .. //depot/projects/hammer/sys/kern/init_sysent.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_clock.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_descrip.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#24 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#34 integrate .. //depot/projects/hammer/sys/kern/kern_ktrace.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_mib.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#27 integrate .. //depot/projects/hammer/sys/kern/kern_prot.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#37 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#29 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#15 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#46 integrate .. //depot/projects/hammer/sys/kern/kern_time.c#9 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/hammer/sys/kern/kern_xxx.c#5 integrate .. //depot/projects/hammer/sys/kern/sched_4bsd.c#16 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#28 integrate .. //depot/projects/hammer/sys/kern/subr_autoconf.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_clock.c#4 integrate .. //depot/projects/hammer/sys/kern/subr_log.c#9 integrate .. //depot/projects/hammer/sys/kern/subr_mchain.c#7 integrate .. //depot/projects/hammer/sys/kern/subr_param.c#10 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#15 integrate .. //depot/projects/hammer/sys/kern/subr_prof.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_scanf.c#8 integrate .. //depot/projects/hammer/sys/kern/sys_generic.c#14 integrate .. //depot/projects/hammer/sys/kern/sys_socket.c#9 integrate .. //depot/projects/hammer/sys/kern/syscalls.c#28 integrate .. //depot/projects/hammer/sys/kern/syscalls.master#29 integrate .. //depot/projects/hammer/sys/kern/tty_compat.c#3 integrate .. //depot/projects/hammer/sys/kern/tty_conf.c#3 integrate .. //depot/projects/hammer/sys/kern/tty_cons.c#12 integrate .. //depot/projects/hammer/sys/kern/tty_pty.c#10 integrate .. //depot/projects/hammer/sys/kern/uipc_cow.c#13 integrate .. //depot/projects/hammer/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_mbuf2.c#8 integrate .. //depot/projects/hammer/sys/kern/uipc_proto.c#3 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#20 integrate .. //depot/projects/hammer/sys/kern/uipc_socket2.c#14 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#20 integrate .. //depot/projects/hammer/sys/kern/uipc_usrreq.c#12 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/hammer/sys/kern/vfs_cluster.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#19 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_init.c#6 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_mount.c#25 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/hammer/sys/kern/vfs_syscalls.c#24 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/hammer/sys/kern/vnode_if.src#8 integrate .. //depot/projects/hammer/sys/net/if_arcsubr.c#9 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#23 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/hammer/sys/net/if_gif.c#11 integrate .. //depot/projects/hammer/sys/net/if_gif.h#5 integrate .. //depot/projects/hammer/sys/net/if_iso88025subr.c#10 integrate .. //depot/projects/hammer/sys/net/if_var.h#13 integrate .. //depot/projects/hammer/sys/net/route.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.c#13 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_node.h#8 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_radiotap.h#3 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#10 integrate .. //depot/projects/hammer/sys/netinet/if_ether.h#3 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#18 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#12 integrate .. //depot/projects/hammer/sys/netipsec/xform_tcp.c#1 branch .. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#13 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#17 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#7 integrate .. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#10 integrate .. //depot/projects/hammer/sys/pc98/conf/NOTES#23 integrate .. //depot/projects/hammer/sys/pci/agp_ali.c#8 integrate .. //depot/projects/hammer/sys/pci/agp_amd.c#9 integrate .. //depot/projects/hammer/sys/pci/agp_i810.c#13 integrate .. //depot/projects/hammer/sys/pci/agp_intel.c#11 integrate .. //depot/projects/hammer/sys/pci/agp_nvidia.c#2 integrate .. //depot/projects/hammer/sys/pci/agp_sis.c#8 integrate .. //depot/projects/hammer/sys/pci/agp_via.c#8 integrate .. //depot/projects/hammer/sys/pci/agpreg.h#6 integrate .. //depot/projects/hammer/sys/pci/cy_pci.c#5 integrate .. //depot/projects/hammer/sys/pci/if_ste.c#22 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#18 integrate .. //depot/projects/hammer/sys/pci/if_vrreg.h#5 integrate .. //depot/projects/hammer/sys/powerpc/include/pmap.h#5 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#20 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/vm_machdep.c#16 integrate .. //depot/projects/hammer/sys/sparc64/creator/creator_upa.c#4 integrate .. //depot/projects/hammer/sys/sparc64/include/pmap.h#12 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#22 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/uio_machdep.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/vm_machdep.c#15 integrate .. //depot/projects/hammer/sys/sys/mount.h#14 integrate .. //depot/projects/hammer/sys/sys/proc.h#47 integrate .. //depot/projects/hammer/sys/sys/sf_buf.h#4 integrate .. //depot/projects/hammer/sys/sys/syscall.h#28 integrate .. //depot/projects/hammer/sys/sys/syscall.mk#28 integrate .. //depot/projects/hammer/sys/sys/sysproto.h#28 integrate .. //depot/projects/hammer/sys/ufs/ffs/fs.h#5 integrate .. //depot/projects/hammer/sys/vm/pmap.h#16 integrate .. //depot/projects/hammer/sys/vm/vm_init.c#7 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#21 integrate .. //depot/projects/hammer/sys/vm/vm_page.c#23 integrate .. //depot/projects/hammer/sys/vm/vm_page.h#13 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.holiday#7 integrate .. //depot/projects/hammer/usr.bin/find/extern.h#3 integrate .. //depot/projects/hammer/usr.bin/find/function.c#4 integrate .. //depot/projects/hammer/usr.bin/find/option.c#5 integrate .. //depot/projects/hammer/usr.bin/make/main.c#13 integrate .. //depot/projects/hammer/usr.bin/su/su.c#12 integrate .. //depot/projects/hammer/usr.bin/tar/Makefile#1 branch .. //depot/projects/hammer/usr.bin/tar/bsdtar.1#1 branch .. //depot/projects/hammer/usr.bin/tar/bsdtar.c#1 branch .. //depot/projects/hammer/usr.bin/tar/bsdtar.h#1 branch .. //depot/projects/hammer/usr.bin/tar/bsdtar_platform.h#1 branch .. //depot/projects/hammer/usr.bin/tar/matching.c#1 branch .. //depot/projects/hammer/usr.bin/tar/read.c#1 branch .. //depot/projects/hammer/usr.bin/tar/util.c#1 branch .. //depot/projects/hammer/usr.bin/tar/write.c#1 branch .. //depot/projects/hammer/usr.bin/window/lcmd2.c#2 integrate .. //depot/projects/hammer/usr.bin/ypwhich/ypwhich.c#3 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/diskinfo/diskinfo.c#3 integrate .. //depot/projects/hammer/usr.sbin/inetd/inetd.c#9 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#11 integrate .. //depot/projects/hammer/usr.sbin/ppp/ppp.8.m4#8 integrate .. //depot/projects/hammer/usr.sbin/raycontrol/raycontrol.c#5 integrate .. //depot/projects/hammer/usr.sbin/rpc.statd/statd.c#3 integrate Differences ... ==== //depot/projects/hammer/bin/ls/print.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.68 2004/03/01 19:25:27 cperciva Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/print.c,v 1.69 2004/04/03 16:55:56 bmilekic Exp $"); #include <sys/param.h> #include <sys/stat.h> @@ -694,11 +694,17 @@ *haveacls = 1; if ((facl = acl_get_file(name, ACL_TYPE_ACCESS)) != NULL) { if (acl_get_entry(facl, ACL_FIRST_ENTRY, &ae) == 1) { - entries = 0; - do - entries++; - while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1); - if (entries != 3) + entries = 1; + while (acl_get_entry(facl, ACL_NEXT_ENTRY, &ae) == 1) + if (++entries > 3) + break; + /* + * POSIX.1e requires that ACLs of type ACL_TYPE_ACCESS + * must have at least three entries (owner, group, + * and other). So anything with more than 3 ACLs looks + * interesting to us. + */ + if (entries > 3) buf[10] = '+'; } acl_free(facl); ==== //depot/projects/hammer/bin/ps/ps.c#10 (text+ko) ==== @@ -51,7 +51,7 @@ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.84 2004/03/30 04:20:33 gad Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.87 2004/04/04 17:43:48 gad Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -70,7 +70,6 @@ #include <locale.h> #include <paths.h> #include <pwd.h> -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -124,7 +123,7 @@ dev_t *ttys; uid_t *uids; void *ptr; - }; + } l; }; static int addelem_gid(struct listinfo *, const char *); @@ -157,7 +156,7 @@ "%cpu,%mem,command"; static char Zfmt[] = "label"; -#define PS_ARGS "AaCc" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ" +#define PS_ARGS "AaCce" OPT_LAZY_f "G:gHhjLlM:mN:O:o:p:rSTt:U:uvwXxZ" int main(int argc, char *argv[]) @@ -443,12 +442,12 @@ parsefmt(dfmt, 0); if (nselectors == 0) { - uidlist.ptr = malloc(sizeof(uid_t)); - if (uidlist.ptr == NULL) + uidlist.l.ptr = malloc(sizeof(uid_t)); + if (uidlist.l.ptr == NULL) errx(1, "malloc failed"); nselectors = 1; uidlist.count = uidlist.maxcount = 1; - *uidlist.uids = getuid(); + *uidlist.l.uids = getuid(); } /* @@ -470,15 +469,15 @@ /* XXX - Apparently there's no KERN_PROC_GID flag. */ if (pgrplist.count == 1) { what = KERN_PROC_PGRP | showthreads; - flag = *pgrplist.pids; + flag = *pgrplist.l.pids; nselectors = 0; } else if (pidlist.count == 1) { what = KERN_PROC_PID | showthreads; - flag = *pidlist.pids; + flag = *pidlist.l.pids; nselectors = 0; } else if (ruidlist.count == 1) { what = KERN_PROC_RUID | showthreads; - flag = *ruidlist.uids; + flag = *ruidlist.l.uids; nselectors = 0; #if 0 /*- @@ -487,16 +486,16 @@ */ } else if (sesslist.count == 1) { what = KERN_PROC_SESSION | showthreads; - flag = *sesslist.pids; + flag = *sesslist.l.pids; nselectors = 0; #endif } else if (ttylist.count == 1) { what = KERN_PROC_TTY | showthreads; - flag = *ttylist.ttys; + flag = *ttylist.l.ttys; nselectors = 0; } else if (uidlist.count == 1) { what = KERN_PROC_UID | showthreads; - flag = *uidlist.uids; + flag = *uidlist.l.uids; nselectors = 0; } else if (all) { /* No need for this routine to select processes. */ @@ -523,7 +522,7 @@ */ if (pidlist.count > 0) { for (elem = 0; elem < pidlist.count; elem++) - if (kp->ki_pid == pidlist.pids[elem]) + if (kp->ki_pid == pidlist.l.pids[elem]) goto keepit; } /* @@ -540,32 +539,34 @@ goto keepit; if (gidlist.count > 0) { for (elem = 0; elem < gidlist.count; elem++) - if (kp->ki_rgid == gidlist.gids[elem]) + if (kp->ki_rgid == gidlist.l.gids[elem]) goto keepit; } if (pgrplist.count > 0) { for (elem = 0; elem < pgrplist.count; elem++) - if (kp->ki_pgid == pgrplist.pids[elem]) + if (kp->ki_pgid == + pgrplist.l.pids[elem]) goto keepit; } if (ruidlist.count > 0) { for (elem = 0; elem < ruidlist.count; elem++) - if (kp->ki_ruid == ruidlist.uids[elem]) + if (kp->ki_ruid == + ruidlist.l.uids[elem]) goto keepit; } if (sesslist.count > 0) { for (elem = 0; elem < sesslist.count; elem++) - if (kp->ki_sid == sesslist.pids[elem]) + if (kp->ki_sid == sesslist.l.pids[elem]) goto keepit; } if (ttylist.count > 0) { for (elem = 0; elem < ttylist.count; elem++) - if (kp->ki_tdev == ttylist.ttys[elem]) + if (kp->ki_tdev == ttylist.l.ttys[elem]) goto keepit; } if (uidlist.count > 0) { for (elem = 0; elem < uidlist.count; elem++) - if (kp->ki_uid == uidlist.uids[elem]) + if (kp->ki_uid == uidlist.l.uids[elem]) goto keepit; } /* @@ -667,7 +668,7 @@ if (inf->count >= inf->maxcount) expand_list(inf); - inf->gids[(inf->count)++] = grp->gr_gid; + inf->l.gids[(inf->count)++] = grp->gr_gid; return (1); } @@ -698,7 +699,7 @@ if (inf->count >= inf->maxcount) expand_list(inf); - inf->pids[(inf->count)++] = tempid; + inf->l.pids[(inf->count)++] = tempid; return (1); } #undef BSD_PID_MAX @@ -733,7 +734,7 @@ if (inf->count >= inf->maxcount) expand_list(inf); - inf->ttys[(inf->count)++] = sb.st_rdev; + inf->l.ttys[(inf->count)++] = sb.st_rdev; return (1); } @@ -779,7 +780,7 @@ if (inf->count >= inf->maxcount) expand_list(inf); - inf->uids[(inf->count)++] = pwd->pw_uid; + inf->l.uids[(inf->count)++] = pwd->pw_uid; return (1); } @@ -871,14 +872,14 @@ int newmax; newmax = (inf->maxcount + 1) << 1; - newlist = realloc(inf->ptr, newmax * inf->elemsize); + newlist = realloc(inf->l.ptr, newmax * inf->elemsize); if (newlist == NULL) { - free(inf->ptr); + free(inf->l.ptr); errx(1, "realloc to %d %ss failed", newmax, inf->lname); } inf->maxcount = newmax; - inf->ptr = newlist; + inf->l.ptr = newlist; return (newlist); } @@ -888,11 +889,11 @@ { inf->count = inf->elemsize = inf->maxcount = 0; - if (inf->ptr != NULL) - free(inf->ptr); + if (inf->l.ptr != NULL) + free(inf->l.ptr); inf->addelem = NULL; inf->lname = NULL; - inf->ptr = NULL; + inf->l.ptr = NULL; } static void @@ -904,7 +905,7 @@ inf->elemsize = elemsize; inf->addelem = artn; inf->lname = lname; - inf->ptr = NULL; + inf->l.ptr = NULL; } VARENT * ==== //depot/projects/hammer/contrib/com_err/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,63 @@ +2002-08-20 Johan Danielsson <joda@pdc.kth.se> + + * compile_et.c: don't add comma after last enum member + +2002-08-12 Johan Danielsson <joda@pdc.kth.se> + + * compile_et.c: just declare er_list directly instead of including + com_right in generated header files + +2002-03-11 Assar Westerlund <assar@sics.se> + + * Makefile.am (libcom_err_la_LDFLAGS): set version to 2:1:1 + +2002-03-10 Assar Westerlund <assar@sics.se> + + * com_err.c (error_message): do not call strerror with a negative error + +2001-05-17 Assar Westerlund <assar@sics.se> + + * Makefile.am: bump version to 2:0:1 + +2001-05-11 Assar Westerlund <assar@sics.se> + + * com_err.h (add_to_error_table): add prototype + * com_err.c (add_to_error_table): new function, from Derrick J + Brashear <shadow@dementia.org> + +2001-05-06 Assar Westerlund <assar@sics.se> + + * com_err.h: add printf formats for gcc + +2001-02-28 Johan Danielsson <joda@pdc.kth.se> + + * error.c (initialize_error_table_r): put table at end of the list + +2001-02-15 Assar Westerlund <assar@sics.se> + + * com_err.c (default_proc): add printf attributes + +2000-08-16 Assar Westerlund <assar@sics.se> + + * Makefile.am: bump version to 1:1:0 + +2000-07-31 Assar Westerlund <assar@sics.se> + + * com_right.h (initialize_error_table_r): fix prototype + +2000-04-05 Assar Westerlund <assar@sics.se> + + * com_err.c (_et_lit): explicitly initialize it to NULL to make + dyld on Darwin/MacOS X happy + +2000-01-16 Assar Westerlund <assar@sics.se> + + * com_err.h: remove __P definition (now in com_right.h). this + file always includes com_right.h so that's where it should reside. + * com_right.h: moved __P here and added it to the function + prototypes + * com_err.h (error_table_name): add __P + 1999-07-03 Assar Westerlund <assar@sics.se> * parse.y (statement): use asprintf ==== //depot/projects/hammer/contrib/com_err/Makefile.am#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $Id: Makefile.am,v 1.23 1999/04/09 18:26:55 assar Exp $ +# $Id: Makefile.am,v 1.27 2002/03/10 23:52:41 assar Exp $ include $(top_srcdir)/Makefile.am.common YFLAGS = -d lib_LTLIBRARIES = libcom_err.la -libcom_err_la_LDFLAGS = -version-info 1:0:0 +libcom_err_la_LDFLAGS = -version-info 2:1:1 bin_PROGRAMS = compile_et @@ -17,7 +17,7 @@ CLEANFILES = lex.c parse.c parse.h -$(compile_et_OBJECTS): parse.h +$(compile_et_OBJECTS): parse.h parse.c ## XXX broken automake 1.4s compile_et_LDADD = \ $(LIB_roken) \ ==== //depot/projects/hammer/contrib/com_err/Makefile.in#2 (text+ko) ==== @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated by automake 1.7.9 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,173 +12,294 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. -# $Id: Makefile.am,v 1.23 1999/04/09 18:26:55 assar Exp $ +@SET_MAKE@ +# $Id: Makefile.am,v 1.27 2002/03/10 23:52:41 assar Exp $ -# $Id: Makefile.am.common,v 1.3 1999/04/01 14:58:43 joda Exp $ +# $Id: Makefile.am.common,v 1.5 2002/05/19 18:35:37 joda Exp $ +# $Id: Makefile.am.common,v 1.37.2.2 2003/10/13 13:15:39 joda Exp $ -# $Id: Makefile.am.common,v 1.12 1999/07/28 00:54:29 assar Exp $ - - -SHELL = @SHELL@ - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ -AFS_EXTRA_LD = @AFS_EXTRA_LD@ +ACLOCAL = @ACLOCAL@ +AIX4_FALSE = @AIX4_FALSE@ +AIX4_TRUE = @AIX4_TRUE@ +AIX_DYNAMIC_AFS_FALSE = @AIX_DYNAMIC_AFS_FALSE@ +AIX_DYNAMIC_AFS_TRUE = @AIX_DYNAMIC_AFS_TRUE@ AIX_EXTRA_KAFS = @AIX_EXTRA_KAFS@ +AIX_FALSE = @AIX_FALSE@ +AIX_TRUE = @AIX_TRUE@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CANONICAL_HOST = @CANONICAL_HOST@ CATMAN = @CATMAN@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200404060120.i361KexR066315>