PERFORCE change 90737 for review
Peter Wemm
peter at FreeBSD.org
Mon Jan 30 14:52:10 PST 2006
http://perforce.freebsd.org/chv.cgi?CH=90737
Change 90737 by peter at peter_daintree on 2006/01/30 22:51:22
IFC @90735
Affected files ...
.. //depot/projects/hammer/etc/defaults/periodic.conf#15 integrate
.. //depot/projects/hammer/etc/defaults/rc.conf#68 integrate
.. //depot/projects/hammer/etc/pf.conf#3 integrate
.. //depot/projects/hammer/etc/rc.d/abi#7 integrate
.. //depot/projects/hammer/etc/services#12 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#58 integrate
.. //depot/projects/hammer/include/nl_types.h#5 integrate
.. //depot/projects/hammer/include/printf.h#2 integrate
.. //depot/projects/hammer/include/stdio.h#10 integrate
.. //depot/projects/hammer/lib/Makefile#54 integrate
.. //depot/projects/hammer/lib/libarchive/Makefile#31 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tp.c#2 integrate
.. //depot/projects/hammer/lib/libc/gen/getttyent.c#3 integrate
.. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#14 integrate
.. //depot/projects/hammer/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdio/xprintf_errno.c#1 branch
.. //depot/projects/hammer/lib/libc/stdio/xprintf_quote.c#1 branch
.. //depot/projects/hammer/lib/libc/stdio/xprintf_vis.c#2 integrate
.. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdlib/malloc.c#22 integrate
.. //depot/projects/hammer/lib/libc/sys/pipe.2#4 integrate
.. //depot/projects/hammer/lib/libdisk/Makefile#11 integrate
.. //depot/projects/hammer/lib/libdisk/disk.c#22 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.3#11 integrate
.. //depot/projects/hammer/lib/libdisk/libdisk.h#15 integrate
.. //depot/projects/hammer/lib/libdisk/write_arm_disk.c#1 branch
.. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_acquire_cred.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_add_cred.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_add_oid_set_member.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_canonicalize_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_compare_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_context_time.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_create_empty_oid_set.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_delete_sec_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_display_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_display_status.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_duplicate_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_export_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_export_sec_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_get_mic.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_import_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_import_sec_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_context.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_cred_by_mech.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_mechs_for_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_inquire_names_for_mech.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_process_context_token.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_buffer.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_cred.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_name.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_release_oid_set.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_test_oid_set_member.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_unwrap.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_verify_mic.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_wrap.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gss_wrap_size_limit.3#2 integrate
.. //depot/projects/hammer/lib/libgssapi/gssapi.3#2 integrate
.. //depot/projects/hammer/lib/libutil/pidfile.3#4 integrate
.. //depot/projects/hammer/lib/libutil/pty.c#4 integrate
.. //depot/projects/hammer/libexec/ftpd/ftpd.8#13 integrate
.. //depot/projects/hammer/libexec/rtld-elf/ia64/reloc.c#10 integrate
.. //depot/projects/hammer/libexec/rtld-elf/ia64/rtld_start.S#3 integrate
.. //depot/projects/hammer/release/Makefile#81 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#84 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#20 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#14 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#36 integrate
.. //depot/projects/hammer/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#6 integrate
.. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#21 integrate
.. //depot/projects/hammer/sbin/dhclient/dhclient-script#8 integrate
.. //depot/projects/hammer/sbin/geom/core/geom.8#12 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifconfig.c#28 integrate
.. //depot/projects/hammer/sbin/ifconfig/ifieee80211.c#23 integrate
.. //depot/projects/hammer/sbin/rcorder/Makefile#3 integrate
.. //depot/projects/hammer/sbin/sconfig/sconfig.c#3 integrate
.. //depot/projects/hammer/share/examples/cvsup/ports-supfile#10 integrate
.. //depot/projects/hammer/share/examples/kld/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/kld/firmware/Makefile#1 branch
.. //depot/projects/hammer/share/examples/kld/firmware/README#1 branch
.. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/Makefile#1 branch
.. //depot/projects/hammer/share/examples/kld/firmware/fwconsumer/fw_consumer.c#1 branch
.. //depot/projects/hammer/share/examples/kld/firmware/fwimage/Makefile#1 branch
.. //depot/projects/hammer/share/examples/kld/firmware/fwimage/firmware.img#1 branch
.. //depot/projects/hammer/share/man/man4/ata.4#23 integrate
.. //depot/projects/hammer/share/man/man4/ipw.4#7 integrate
.. //depot/projects/hammer/share/man/man4/iwi.4#9 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/acpi_asus.4#8 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ce.4#1 branch
.. //depot/projects/hammer/share/man/man4/ng_pppoe.4#10 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#17 integrate
.. //depot/projects/hammer/share/man/man4/pty.4#5 integrate
.. //depot/projects/hammer/share/man/man4/ral.4#6 integrate
.. //depot/projects/hammer/share/man/man4/ural.4#7 integrate
.. //depot/projects/hammer/share/man/man5/devfs.rules.5#3 integrate
.. //depot/projects/hammer/share/man/man5/rc.conf.5#70 integrate
.. //depot/projects/hammer/share/man/man9/Makefile#60 integrate
.. //depot/projects/hammer/share/man/man9/firmware.9#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/trap.c#86 integrate
.. //depot/projects/hammer/sys/arm/arm/vm_machdep.c#20 integrate
.. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#32 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#13 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.c#27 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_ioctl.h#10 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#23 integrate
.. //depot/projects/hammer/sys/conf/Makefile.i386#11 integrate
.. //depot/projects/hammer/sys/conf/Makefile.pc98#11 integrate
.. //depot/projects/hammer/sys/conf/NOTES#105 integrate
.. //depot/projects/hammer/sys/conf/files#136 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#83 integrate
.. //depot/projects/hammer/sys/conf/kmod.mk#55 integrate
.. //depot/projects/hammer/sys/conf/options#92 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_asus.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpi_support/acpi_fujitsu.c#4 integrate
.. //depot/projects/hammer/sys/dev/amr/amr.c#30 integrate
.. //depot/projects/hammer/sys/dev/amr/amr_linux.c#1 branch
.. //depot/projects/hammer/sys/dev/an/if_an.c#30 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#69 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.c#38 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-pci.h#40 integrate
.. //depot/projects/hammer/sys/dev/auxio/auxio.c#5 integrate
.. //depot/projects/hammer/sys/dev/bge/if_bge.c#64 integrate
.. //depot/projects/hammer/sys/dev/bktr/bktr_os.c#17 integrate
.. //depot/projects/hammer/sys/dev/ce/ceddk.c#1 branch
.. //depot/projects/hammer/sys/dev/ce/ceddk.h#1 branch
.. //depot/projects/hammer/sys/dev/ce/if_ce.c#1 branch
.. //depot/projects/hammer/sys/dev/ce/ng_ce.h#1 branch
.. //depot/projects/hammer/sys/dev/ce/tau32-ddk.c#1 branch
.. //depot/projects/hammer/sys/dev/ce/tau32-ddk.h#1 branch
.. //depot/projects/hammer/sys/dev/ed/if_ed.c#37 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_3c503.c#4 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_cbus.c#15 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_hpp.c#4 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_isa.c#15 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_novell.c#5 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_sic.c#5 integrate
.. //depot/projects/hammer/sys/dev/ed/if_ed_wd80x3.c#5 integrate
.. //depot/projects/hammer/sys/dev/ed/if_edvar.h#13 integrate
.. //depot/projects/hammer/sys/dev/em/if_em.c#59 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_freebsd.h#13 integrate
.. //depot/projects/hammer/sys/dev/isp/isp_pci.c#19 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#14 integrate
.. //depot/projects/hammer/sys/dev/iwi/if_iwireg.h#7 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#56 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ral.c#13 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ralreg.h#3 integrate
.. //depot/projects/hammer/sys/dev/ral/if_ralvar.h#3 integrate
.. //depot/projects/hammer/sys/dev/rp/rp_pci.c#10 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/solo.c#13 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/dsp.c#26 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder.c#8 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder_fmt.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/feeder_rate.c#10 integrate
.. //depot/projects/hammer/sys/dev/usb/umass.c#36 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#68 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#42 integrate
.. //depot/projects/hammer/sys/i386/i386/trap.c#46 integrate
.. //depot/projects/hammer/sys/i386/include/cserial.h#3 integrate
.. //depot/projects/hammer/sys/ia64/include/elf.h#5 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#11 integrate
.. //depot/projects/hammer/sys/kern/kern_ktr.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#24 integrate
.. //depot/projects/hammer/sys/kern/kern_mbuf.c#14 integrate
.. //depot/projects/hammer/sys/kern/kern_mutex.c#37 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#28 integrate
.. //depot/projects/hammer/sys/kern/kern_rwlock.c#1 branch
.. //depot/projects/hammer/sys/kern/kern_sysctl.c#24 integrate
.. //depot/projects/hammer/sys/kern/subr_firmware.c#1 branch
.. //depot/projects/hammer/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/hammer/sys/kern/subr_sleepqueue.c#19 integrate
.. //depot/projects/hammer/sys/kern/subr_turnstile.c#19 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#54 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#30 integrate
.. //depot/projects/hammer/sys/kern/tty_pts.c#1 branch
.. //depot/projects/hammer/sys/kern/tty_pty.c#31 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#39 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#42 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#46 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#67 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#99 integrate
.. //depot/projects/hammer/sys/modules/Makefile#95 integrate
.. //depot/projects/hammer/sys/modules/amr/Makefile#3 integrate
.. //depot/projects/hammer/sys/modules/amr/amr_linux/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/bktr/bktr/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/ce/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/firmware/Makefile#1 branch
.. //depot/projects/hammer/sys/modules/linux/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/nwfs/Makefile#5 integrate
.. //depot/projects/hammer/sys/modules/smbfs/Makefile#7 integrate
.. //depot/projects/hammer/sys/modules/svr4/Makefile#4 integrate
.. //depot/projects/hammer/sys/net/if.c#60 integrate
.. //depot/projects/hammer/sys/net/if.h#22 integrate
.. //depot/projects/hammer/sys/net/if_bridge.c#22 integrate
.. //depot/projects/hammer/sys/net/if_ethersubr.c#55 integrate
.. //depot/projects/hammer/sys/net/if_gif.c#25 integrate
.. //depot/projects/hammer/sys/net/if_gif.h#9 integrate
.. //depot/projects/hammer/sys/net/if_var.h#38 integrate
.. //depot/projects/hammer/sys/net/if_vlan.c#35 integrate
.. //depot/projects/hammer/sys/net/if_vlan_var.h#11 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pppoe.c#21 integrate
.. //depot/projects/hammer/sys/netgraph/ng_pppoe.h#9 integrate
.. //depot/projects/hammer/sys/netgraph/ng_sppp.c#10 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#31 integrate
.. //depot/projects/hammer/sys/netinet/in_gif.c#15 integrate
.. //depot/projects/hammer/sys/netinet6/in6_gif.c#11 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_input.c#25 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs.h#11 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#27 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsock.c#15 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_syscalls.c#17 integrate
.. //depot/projects/hammer/sys/sparc64/central/central.c#9 integrate
.. //depot/projects/hammer/sys/sparc64/ebus/ebus.c#18 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_central.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/fhc/fhc_nexus.c#8 integrate
.. //depot/projects/hammer/sys/sparc64/pci/psycho.c#26 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/dma_sbus.c#3 integrate
.. //depot/projects/hammer/sys/sparc64/sbus/sbus.c#20 integrate
.. //depot/projects/hammer/sys/sys/_rwlock.h#1 branch
.. //depot/projects/hammer/sys/sys/cdefs.h#22 integrate
.. //depot/projects/hammer/sys/sys/firmware.h#1 branch
.. //depot/projects/hammer/sys/sys/ktr.h#16 integrate
.. //depot/projects/hammer/sys/sys/lock.h#13 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#50 integrate
.. //depot/projects/hammer/sys/sys/param.h#74 integrate
.. //depot/projects/hammer/sys/sys/proc.h#94 integrate
.. //depot/projects/hammer/sys/sys/rwlock.h#1 branch
.. //depot/projects/hammer/sys/sys/ttycom.h#8 integrate
.. //depot/projects/hammer/sys/sys/turnstile.h#7 integrate
.. //depot/projects/hammer/sys/tools/fw_stub.awk#1 branch
.. //depot/projects/hammer/sys/vm/swap_pager.c#43 integrate
.. //depot/projects/hammer/sys/vm/uma_core.c#47 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#28 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#36 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#53 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#60 integrate
.. //depot/projects/hammer/sys/vm/vm_pageout.c#37 integrate
.. //depot/projects/hammer/sys/vm/vm_pageq.c#14 integrate
.. //depot/projects/hammer/tools/tools/genericize/genericize.pl#4 integrate
.. //depot/projects/hammer/tools/tools/mfc/mfc.pl#3 integrate
.. //depot/projects/hammer/tools/tools/netrate/juggle/juggle.c#2 integrate
.. //depot/projects/hammer/usr.bin/Makefile#46 integrate
.. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#44 integrate
.. //depot/projects/hammer/usr.bin/ee/ee.c#4 integrate
.. //depot/projects/hammer/usr.bin/elfdump/elfdump.c#6 integrate
.. //depot/projects/hammer/usr.bin/fetch/fetch.c#17 integrate
.. //depot/projects/hammer/usr.bin/fstat/fstat.c#18 integrate
.. //depot/projects/hammer/usr.bin/gprof/powerpc.h#1 branch
.. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#11 integrate
.. //depot/projects/hammer/usr.bin/mail/mail.1#7 integrate
.. //depot/projects/hammer/usr.bin/mktemp/mktemp.1#5 integrate
.. //depot/projects/hammer/usr.bin/netstat/Makefile#10 integrate
.. //depot/projects/hammer/usr.bin/netstat/ipsec.c#5 integrate
.. //depot/projects/hammer/usr.bin/netstat/main.c#20 integrate
.. //depot/projects/hammer/usr.bin/netstat/netstat.h#14 integrate
.. //depot/projects/hammer/usr.bin/netstat/pfkey.c#1 branch
.. //depot/projects/hammer/usr.bin/su/su.1#10 integrate
.. //depot/projects/hammer/usr.bin/su/su.c#16 integrate
.. //depot/projects/hammer/usr.bin/tar/bsdtar.1#21 integrate
.. //depot/projects/hammer/usr.bin/truss/alpha-fbsd.c#6 integrate
.. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#3 integrate
.. //depot/projects/hammer/usr.bin/truss/extern.h#8 integrate
.. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#8 integrate
.. //depot/projects/hammer/usr.bin/truss/i386-linux.c#6 integrate
.. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#8 integrate
.. //depot/projects/hammer/usr.bin/truss/main.c#10 integrate
.. //depot/projects/hammer/usr.bin/truss/powerpc-fbsd.c#1 branch
.. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#6 integrate
.. //depot/projects/hammer/usr.bin/truss/syscall.h#6 integrate
.. //depot/projects/hammer/usr.bin/truss/syscalls.c#20 integrate
.. //depot/projects/hammer/usr.bin/truss/truss.1#5 integrate
.. //depot/projects/hammer/usr.bin/truss/truss.h#2 integrate
.. //depot/projects/hammer/usr.bin/wall/ttymsg.c#3 integrate
.. //depot/projects/hammer/usr.bin/whois/whois.1#6 integrate
.. //depot/projects/hammer/usr.bin/whois/whois.c#12 integrate
.. //depot/projects/hammer/usr.bin/xargs/strnsubst.c#3 integrate
.. //depot/projects/hammer/usr.bin/xargs/xargs.1#10 integrate
.. //depot/projects/hammer/usr.bin/xargs/xargs.c#12 integrate
.. //depot/projects/hammer/usr.sbin/adduser/adduser.sh#10 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.8#6 integrate
.. //depot/projects/hammer/usr.sbin/arp/arp.c#13 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_begemot.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_diskstorage_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_fs_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_network_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_printer_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swinstalled_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_swrun_tbl.c#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_tree.def#1 branch
.. //depot/projects/hammer/usr.sbin/bsnmpd/modules/snmp_hostres/snmp_hostres.3#1 branch
.. //depot/projects/hammer/usr.sbin/btxld/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/btxld/btxld.c#6 integrate
.. //depot/projects/hammer/usr.sbin/config/config.h#10 integrate
.. //depot/projects/hammer/usr.sbin/config/config.y#12 integrate
.. //depot/projects/hammer/usr.sbin/config/main.c#13 integrate
.. //depot/projects/hammer/usr.sbin/config/mkmakefile.c#11 integrate
.. //depot/projects/hammer/usr.sbin/config/mkoptions.c#5 integrate
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#5 integrate
.. //depot/projects/hammer/usr.sbin/inetd/Makefile#5 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.8#8 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.c#16 integrate
.. //depot/projects/hammer/usr.sbin/inetd/inetd.h#3 integrate
.. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.1#7 integrate
.. //depot/projects/hammer/usr.sbin/kbdmap/kbdmap.c#4 integrate
.. //depot/projects/hammer/usr.sbin/kldxref/ef_obj.c#4 integrate
.. //depot/projects/hammer/usr.sbin/mixer/mixer.c#8 integrate
.. //depot/projects/hammer/usr.sbin/mountd/exports.5#8 integrate
.. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#23 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/add.h#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/extract.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/main.c#14 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/perform.c#7 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#13 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/perform.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/pkg_create.1#12 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/create/pl.c#4 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/info.h#6 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/main.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/perform.c#5 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/info/show.c#9 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/lib.h#10 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/plist.c#8 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/lib/url.c#5 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#4 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.8#3 integrate
.. //depot/projects/hammer/usr.sbin/portsnap/portsnap/portsnap.sh#3 integrate
.. //depot/projects/hammer/usr.sbin/powerd/Makefile#4 integrate
.. //depot/projects/hammer/usr.sbin/powerd/powerd.c#9 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/anonFTP.c#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/disks.c#17 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/dispatch.c#5 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/install.c#26 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/label.c#15 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/media.c#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#37 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#14 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#22 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/tcpip.c#7 integrate
.. //depot/projects/hammer/usr.sbin/traceroute6/traceroute6.8#8 integrate
Differences ...
==== //depot/projects/hammer/etc/defaults/periodic.conf#15 (text+ko) ====
@@ -13,7 +13,7 @@
# For a more detailed explanation of all the periodic.conf variables, please
# refer to the periodic.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.34 2006/01/13 18:07:52 wollman Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.36 2006/01/30 19:23:24 matteo Exp $
#
# What files override these defaults ?
@@ -86,7 +86,7 @@
# 400.status-disks
daily_status_disks_enable="YES" # Check disk status
-daily_status_disks_df_flags="-k -t nonfs" # df(1) flags for check
+daily_status_disks_df_flags="-l -h" # df(1) flags for check
# 405.status-ata_raid
daily_status_ata_raid_enable="NO" # Check ATA raid status
==== //depot/projects/hammer/etc/defaults/rc.conf#68 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.271 2006/01/21 18:08:15 yar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.272 2006/01/29 05:51:58 njl Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -528,9 +528,9 @@
devfs_system_ruleset="" # The name of a ruleset to apply to /dev
devfs_set_rulesets="" # A list of /mount/dev=ruleset_name settings to
# apply (must be mounted already, i.e. fstab(5))
-performance_cx_lowest="HIGH" # Online CPU idle state
+performance_cx_lowest="LOW" # Online CPU idle state
performance_cpu_freq="NONE" # Online CPU frequency
-economy_cx_lowest="HIGH" # Offline CPU idle state
+economy_cx_lowest="LOW" # Offline CPU idle state
economy_cpu_freq="NONE" # Offline CPU frequency
virecover_enable="YES" # Perform housekeeping for the vi(1) editor
ugidfw_enable="NO" # Load mac_bsdextended(4) rules on boot
==== //depot/projects/hammer/etc/pf.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/pf.conf,v 1.2 2004/09/14 01:07:18 mlaier Exp $
+# $FreeBSD: src/etc/pf.conf,v 1.3 2006/01/27 17:16:20 mlaier Exp $
# $OpenBSD: pf.conf,v 1.21 2003/09/02 20:38:44 david Exp $
#
# See pf.conf(5) and /usr/share/examples/pf for syntax and examples.
@@ -72,6 +72,10 @@
#pass in on $ext_if proto { tcp, udp } from any to <foo> port 80 keep state
# pass incoming ports for ftp-proxy
+#pass in on $ext_if inet proto tcp from any to $ext_if port > 49151 keep state
+
+# Alternate rule to pass incoming ports for ftp-proxy
+# NOTE: Please see pf.conf(5) BUGS section before using user/group rules.
#pass in on $ext_if inet proto tcp from any to $ext_if user proxy keep state
# assign packets to a queue.
==== //depot/projects/hammer/etc/rc.d/abi#7 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/abi,v 1.6 2006/01/11 21:30:41 brooks Exp $
+# $FreeBSD: src/etc/rc.d/abi,v 1.7 2006/01/24 18:58:48 netchild Exp $
#
# PROVIDE: abi
@@ -28,7 +28,7 @@
if ! kldstat -v | grep -E 'linux(aout|elf)' > /dev/null; then
kldload linux > /dev/null 2>&1
fi
- if [ -x /compat/linux/sbin/ldconfig ]; then
+ if [ -x /compat/linux/sbin/ldconfigDisabled ]; then
_tmpdir=`mktemp -d -t linux-ldconfig`
/compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache
if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then
==== //depot/projects/hammer/etc/services#12 (text+ko) ====
@@ -16,7 +16,7 @@
# Kerberos services are for Kerberos v4, and are unofficial. Sites running
# v5 should uncomment v5 entries and comment v4 entries.
#
-# $FreeBSD: src/etc/services,v 1.102 2004/08/16 11:52:22 cperciva Exp $
+# $FreeBSD: src/etc/services,v 1.103 2006/01/25 17:37:15 maxim Exp $
# From: @(#)services 5.8 (Berkeley) 5/9/91
#
# WELL KNOWN PORT NUMBERS
@@ -1917,6 +1917,8 @@
eppc 3031/udp #Remote AppleEvents/PPC Toolbox
NSWS 3049/tcp
NSWS 3049/udp
+gds_db 3050/tcp #InterBase Database Remote Protocol
+gds_db 3050/udp #InterBase Database Remote Protocol
sj3 3086/tcp #SJ3 (kanji input)
vmodem 3141/tcp
vmodem 3141/udp
==== //depot/projects/hammer/games/fortune/datfiles/fortunes#58 (text+ko) ====
@@ -1,5 +1,5 @@
This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.203 2006/01/21 14:16:01 matteo Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.205 2006/01/28 09:19:20 dds Exp $
%
=======================================================================
@@ -29939,6 +29939,11 @@
what is essential is invisible to the eye.
-- The Fox, 'The Little Prince"
%
+It is perfectly permissible for every system call to fail with [ENOTADUCK]
+unless the first five bytes of the caller's address space contain the
+word "quack".
+ -- Garrett Wollman
+%
It is possible by ingenuity and at the expense of clarity... {to do almost
anything in any language}. However, the fact that it is possible to push
a pea up a mountain with your nose does not mean that this is a sensible
@@ -35390,6 +35395,10 @@
%
Never delay the ending of a meeting or the beginning of a cocktail hour.
%
+Never do programs contain so few bugs as when no debugging tools
+are available.
+ -- Niklaus Wirth
+%
Never do today what you can put off until tomorrow.
%
Never drink Coca-Cola in a moving elevator. The elevator's motion coupled
==== //depot/projects/hammer/include/nl_types.h#5 (text+ko) ====
@@ -35,7 +35,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/include/nl_types.h,v 1.11 2005/02/27 16:20:53 phantom Exp $
+ * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $
*/
#ifndef _NL_TYPES_H_
@@ -97,8 +97,7 @@
__BEGIN_DECLS
nl_catd catopen(const char *, int);
-char *catgets(nl_catd, int, int, const char *)
- __attribute__((__format_arg__(4)));
+char *catgets(nl_catd, int, int, const char *) __format_arg(4);
int catclose(nl_catd);
__END_DECLS
==== //depot/projects/hammer/include/printf.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/printf.h,v 1.1 2005/12/16 18:56:38 phk Exp $
+ * $FreeBSD: src/include/printf.h,v 1.2 2006/01/25 12:45:24 phk Exp $
*/
#ifndef _PRINTF_H_
@@ -124,16 +124,28 @@
int register_printf_render(int spec, printf_render *render, printf_arginfo_function *arginfo);
int register_printf_render_std(const unsigned char *specs);
+/* vprintf_errno.c */
+printf_arginfo_function __printf_arginfo_errno;
+printf_render __printf_render_errno;
+
/* vprintf_float.c */
printf_arginfo_function __printf_arginfo_float;
printf_render __printf_render_float;
+/* vprintf_hexdump.c */
+printf_arginfo_function __printf_arginfo_hexdump;
+printf_render __printf_render_hexdump;
+
/* vprintf_int.c */
printf_arginfo_function __printf_arginfo_ptr;
printf_arginfo_function __printf_arginfo_int;
printf_render __printf_render_ptr;
printf_render __printf_render_int;
+/* vprintf_quoute.c */
+printf_arginfo_function __printf_arginfo_quote;
+printf_render __printf_render_quote;
+
/* vprintf_str.c */
printf_arginfo_function __printf_arginfo_chr;
printf_render __printf_render_chr;
@@ -144,10 +156,6 @@
printf_arginfo_function __printf_arginfo_time;
printf_render __printf_render_time;
-/* vprintf_hexdump.c */
-printf_arginfo_function __printf_arginfo_hexdump;
-printf_render __printf_render_hexdump;
-
/* vprintf_vis.c */
printf_arginfo_function __printf_arginfo_vis;
printf_render __printf_render_vis;
==== //depot/projects/hammer/include/stdio.h#10 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.56 2004/06/20 10:01:30 tjr Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.57 2006/01/26 20:53:40 stefanf Exp $
*/
#ifndef _STDIO_H_
@@ -328,12 +328,7 @@
int asprintf(char **, const char *, ...) __printflike(2, 3);
char *ctermid_r(char *);
char *fgetln(FILE *, size_t *);
-#if __GNUC__ == 2 && __GNUC_MINOR__ >= 7 || __GNUC__ >= 3
-#define __ATTR_FORMAT_ARG __attribute__((__format_arg__(2)))
-#else
-#define __ATTR_FORMAT_ARG
-#endif
-__const char *fmtcheck(const char *, const char *) __ATTR_FORMAT_ARG;
+__const char *fmtcheck(const char *, const char *) __format_arg(2);
int fpurge(FILE *);
void setbuffer(FILE *, char *, int);
int setlinebuf(FILE *);
==== //depot/projects/hammer/lib/Makefile#54 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $
+# $FreeBSD: src/lib/Makefile,v 1.210 2006/01/25 11:24:37 cognet Exp $
# To satisfy shared library or ELF linkage when only the libraries being
# built are visible:
@@ -26,7 +26,7 @@
libnetgraph libradius librpcsvc libsbuf libtacplus libutil \
${_libypclnt} libalias libarchive ${_libatm} \
libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \
- libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \
+ libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \
libgssapi ${_libio} libipsec \
libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \
@@ -68,10 +68,6 @@
_libc_r=
.endif
-.if ${MACHINE_ARCH} != "arm"
-_libdisk= libdisk
-.endif
-
.if ${MACHINE_ARCH} == "alpha"
_libio= libio
.endif
==== //depot/projects/hammer/lib/libarchive/Makefile#31 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libarchive/Makefile,v 1.44 2006/01/18 06:26:42 kientzle Exp $
+# $FreeBSD: src/lib/libarchive/Makefile,v 1.45 2006/01/26 05:28:56 kientzle Exp $
# This Makefile is for use with the FreeBSD buid system. For
# non-FreeBSD systems, you should first "make distfile" on FreeBSD,
@@ -68,6 +68,7 @@
archive_read_support_format_cpio.c \
archive_read_support_format_iso9660.c \
archive_read_support_format_tar.c \
+ archive_read_support_format_tp.c \
archive_read_support_format_zip.c \
archive_string.c \
archive_string_sprintf.c \
==== //depot/projects/hammer/lib/libarchive/archive_read_support_format_tp.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.1 2006/01/17 03:40:42 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tp.c,v 1.2 2006/01/26 05:28:56 kientzle Exp $");
#include <sys/stat.h>
@@ -274,6 +274,7 @@
struct stat st;
struct tp *tp;
struct file_info *file;
+ const void *v;
const char *p;
ssize_t bytes_read;
int r;
@@ -283,8 +284,7 @@
/* Read the entire TOC first. */
if (!tp->toc_read) {
/* Skip the initial block. */
- bytes_read = (a->compression_read_ahead)(a,
- (const void **)&p, 512);
+ bytes_read = (a->compression_read_ahead)(a, &v, 512);
if (bytes_read < 512)
return (ARCHIVE_FATAL);
bytes_read = 512;
@@ -294,12 +294,13 @@
/* Consume TOC entries. */
do {
bytes_read = (a->compression_read_ahead)(a,
- (const void **)&p, tp->toc_size);
+ &v, tp->toc_size);
if (bytes_read < tp->toc_size)
return (ARCHIVE_FATAL);
bytes_read = tp->toc_size;
tp->current_position += bytes_read;
(a->compression_read_consume)(a, bytes_read);
+ p = (const char *)v;
file = (*tp->parse_file_info)(a, p);
if (file != NULL)
add_entry(tp, file);
==== //depot/projects/hammer/lib/libc/gen/getttyent.c#3 (text+ko) ====
@@ -35,19 +35,25 @@
static char sccsid[] = "@(#)getttyent.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.13 2005/07/25 17:57:15 mdodd Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getttyent.c,v 1.15 2006/01/26 11:15:08 pjd Exp $");
#include <ttyent.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <string.h>
+#include <dirent.h>
+#include <paths.h>
static char zapchar;
static FILE *tf;
+static int maxpts = 0;
+static int curpts = 0;
+static int pts_valid = 0;
static size_t lbsize;
static char *line;
+#define PTS "pts/"
#define MALLOCCHUNK 100
static char *skip(char *);
@@ -73,6 +79,7 @@
getttyent()
{
static struct ttyent tty;
+ static char devpts_name[] = "pts/4294967295";
char *p;
int c;
size_t i;
@@ -80,8 +87,19 @@
if (!tf && !setttyent())
return (NULL);
for (;;) {
- if (!fgets(p = line, lbsize, tf))
+ if (!fgets(p = line, lbsize, tf)) {
+ if (pts_valid == 1 && curpts <= maxpts) {
+ sprintf(devpts_name, "pts/%d", curpts++);
+ tty.ty_name = devpts_name;
+ tty.ty_getty = tty.ty_type = NULL;
+ tty.ty_status = TTY_NETWORK;
+ tty.ty_window = NULL;
+ tty.ty_comment = NULL;
+ tty.ty_group = _TTYS_NOGROUP;
+ return (&tty);
+ }
return (NULL);
+ }
/* extend buffer if line was too big, and retry */
while (!index(p, '\n')) {
i = strlen(p);
@@ -209,12 +227,29 @@
int
setttyent()
{
+ DIR *devpts_dir;
if (line == NULL) {
if ((line = malloc(MALLOCCHUNK)) == NULL)
return (0);
lbsize = MALLOCCHUNK;
}
+ devpts_dir = opendir(_PATH_DEV PTS);
+ if (devpts_dir) {
+ struct dirent *dp;
+
+ while ((dp = readdir(devpts_dir))) {
+ if (strcmp(dp->d_name, ".") != 0 &&
+ strcmp(dp->d_name, "..") != 0) {
+ if (atoi(dp->d_name) > maxpts) {
+ maxpts = atoi(dp->d_name);
+ pts_valid = 1;
+ curpts = 0;
+ }
+ }
+ }
+ closedir(devpts_dir);
+ }
if (tf) {
rewind(tf);
return (1);
@@ -228,6 +263,7 @@
{
int rval;
+ pts_valid = 0;
/*
* NB: Don't free `line' because getttynam()
* may still be referencing it
==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#14 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 4/17/94
-# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.34 2005/12/16 18:56:38 phk Exp $
+# $FreeBSD: src/lib/libc/stdio/Makefile.inc,v 1.35 2006/01/25 12:45:24 phk Exp $
# stdio sources
.PATH: ${.CURDIR}/stdio
@@ -24,7 +24,8 @@
wsetup.c
SRCS+= xprintf.c xprintf_float.c xprintf_int.c xprintf_str.c
-SRCS+= xprintf_hexdump.c xprintf_time.c xprintf_vis.c
+SRCS+= xprintf_errno.c xprintf_hexdump.c xprintf_quote.c
+SRCS+= xprintf_time.c xprintf_vis.c
MAN+= fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fgetwln.3 fgetws.3 \
flockfile.3 \
==== //depot/projects/hammer/lib/libc/stdio/xprintf.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.1 2005/12/16 18:56:38 phk Exp $
+ * $FreeBSD: src/lib/libc/stdio/xprintf.c,v 1.2 2006/01/25 12:45:24 phk Exp $
*/
#include <namespace.h>
@@ -655,6 +655,16 @@
__printf_render_hexdump,
__printf_arginfo_hexdump);
break;
+ case 'M':
+ register_printf_render(*specs,
+ __printf_render_errno,
+ __printf_arginfo_errno);
+ break;
+ case 'Q':
+ register_printf_render(*specs,
+ __printf_render_quote,
+ __printf_arginfo_quote);
+ break;
case 'T':
register_printf_render(*specs,
__printf_render_time,
==== //depot/projects/hammer/lib/libc/stdio/xprintf_vis.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.1 2005/12/16 18:56:39 phk Exp $
+ * $FreeBSD: src/lib/libc/stdio/xprintf_vis.c,v 1.2 2006/01/25 12:45:24 phk Exp $
*/
#include <namespace.h>
@@ -54,6 +54,8 @@
ret = 0;
p = *((char **)arg[0]);
+ if (p == NULL)
+ return (__printf_out(io, pi, "(null)", 6));
if (pi->prec >= 0)
l = pi->prec;
else
==== //depot/projects/hammer/lib/libc/stdlib/grantpt.c#4 (text+ko) ====
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.4 2005/07/07 17:48:40 marcus Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/grantpt.c,v 1.6 2006/01/29 00:02:57 cognet Exp $");
#endif /* not lint */
#include "namespace.h"
@@ -41,6 +41,8 @@
#include <sys/wait.h>
#include <sys/time.h>
#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
@@ -56,6 +58,8 @@
#define PTM_PREFIX "pty" /* pseudo tty master naming convention */
#define PTS_PREFIX "tty" /* pseudo tty slave naming convention */
+#define NEWPTS_PREFIX "pts/"
+#define PTMX "ptmx"
/*
* The following are range values for pseudo TTY devices. Pseudo TTYs have a
@@ -78,6 +82,34 @@
minor((x).st_rdev) >= 0 && \
minor((x).st_rdev) < PT_MAX)
+
+static int
+is_pts(int fd)
+{
+ int nb;
+
+ return (_ioctl(fd, TIOCGPTN, &nb) == 0);
+}
+
+int
+__use_pts(void)
+{
+ int use_pts;
+ size_t len;
+ int error;
+
+ len = sizeof(use_pts);
+ error = sysctlbyname("kern.pts.enable", &use_pts, &len, NULL, 0);
+ if (error) {
+ struct stat sb;
+
+ if (stat("/dev/ptmx", &sb) != 0)
+ return (0);
+ use_pts = 1;
+ }
+ return (use_pts);
+}
+
/*
* grantpt(): grant ownership of a slave pseudo-terminal device to the
* current user.
@@ -180,6 +212,10 @@
if (oflag & ~(O_RDWR | O_NOCTTY))
errno = EINVAL;
else {
+ if (__use_pts()) {
+ fildes = _open(_PATH_DEV PTMX, oflag);
+ return (fildes);
+ }
mc1 = master + strlen(_PATH_DEV PTM_PREFIX);
mc2 = mc1 + 1;
@@ -214,6 +250,7 @@
ptsname(int fildes)
{
static char slave[] = _PATH_DEV PTS_PREFIX "XY";
+ static char new_slave[] = _PATH_DEV NEWPTS_PREFIX "4294967295";
char *retval;
struct stat sbuf;
@@ -223,11 +260,19 @@
if (!ISPTM(sbuf))
errno = EINVAL;
else {
- (void)snprintf(slave, sizeof(slave),
- _PATH_DEV PTS_PREFIX "%s",
- devname(sbuf.st_rdev, S_IFCHR) +
- strlen(PTM_PREFIX));
- retval = slave;
+ if (!is_pts(fildes)) {
+ (void)snprintf(slave, sizeof(slave),
+ _PATH_DEV PTS_PREFIX "%s",
+ devname(sbuf.st_rdev, S_IFCHR) +
+ strlen(PTM_PREFIX));
+ retval = slave;
+ } else {
+ (void)snprintf(new_slave, sizeof(new_slave),
+ _PATH_DEV NEWPTS_PREFIX "%s",
+ devname(sbuf.st_rdev, S_IFCHR) +
+ strlen(PTM_PREFIX));
+ retval = new_slave;
+ }
}
}
==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#22 (text+ko) ====
@@ -133,10 +133,19 @@
/******************************************************************************/
-#define MALLOC_DEBUG
+/*
+ * In order to disable various extra features that may have negative
+ * performance impacts, (assertions, expanded statistics, redzones), define
+ * NO_MALLOC_EXTRAS.
+ */
+/* #define NO_MALLOC_EXTRAS */
+
+#ifndef NO_MALLOC_EXTRAS
+# define MALLOC_DEBUG
+#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.103 2006/01/23 03:32:38 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.110 2006/01/27 07:46:22 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -176,13 +185,16 @@
* Calculate statistics that can be used to get an idea of how well caching is
* working.
*/
-#define MALLOC_STATS
-#define MALLOC_STATS_ARENAS
+#ifndef NO_MALLOC_EXTRAS
+# define MALLOC_STATS
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list