Date: Sat, 16 Apr 2005 23:32:00 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 75349 for review Message-ID: <200504162332.j3GNW0Wd006576@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=75349 Change 75349 by marcel@marcel_nfs on 2005/04/16 23:31:40 IFC @75348 Affected files ... .. //depot/projects/ia64/bin/sh/sh.1#31 integrate .. //depot/projects/ia64/contrib/top/commands.c#5 integrate .. //depot/projects/ia64/contrib/top/top.c#6 integrate .. //depot/projects/ia64/etc/rc.d/cleanvar#8 integrate .. //depot/projects/ia64/games/fortune/datfiles/fortunes#47 integrate .. //depot/projects/ia64/lib/libc/i386/gen/_set_tp.c#3 integrate .. //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#8 integrate .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_fsbase.c#1 branch .. //depot/projects/ia64/lib/libc/i386/sys/i386_get_gsbase.c#1 branch .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_fsbase.c#1 branch .. //depot/projects/ia64/lib/libc/i386/sys/i386_set_gsbase.c#1 branch .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#22 integrate .. //depot/projects/ia64/lib/libc/net/gethostbydns.c#12 integrate .. //depot/projects/ia64/lib/libc/net/getservbyname.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getservbyport.c#3 integrate .. //depot/projects/ia64/lib/libc/net/getservent.c#7 integrate .. //depot/projects/ia64/lib/libc/net/netdb_private.h#1 branch .. //depot/projects/ia64/lib/libc/net/res_query.c#8 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#26 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/i386/pthread_md.c#4 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#10 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/pthread_md.c#2 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libthread_db/libthr_db.c#3 integrate .. //depot/projects/ia64/lib/libugidfw/libugidfw.3#5 integrate .. //depot/projects/ia64/lib/libugidfw/ugidfw.c#9 integrate .. //depot/projects/ia64/lib/msun/Makefile#16 integrate .. //depot/projects/ia64/lib/msun/amd64/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/msun/amd64/e_sqrtf.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_llrintf.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_lrintf.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_scalbn.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_scalbnf.S#1 branch .. //depot/projects/ia64/lib/msun/amd64/s_scalbnl.S#1 branch .. //depot/projects/ia64/lib/msun/i387/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/msun/i387/s_ceill.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_copysignl.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_floorl.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_llrintf.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_lrintf.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_trunc.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_truncf.S#1 branch .. //depot/projects/ia64/lib/msun/i387/s_truncl.S#1 branch .. //depot/projects/ia64/lib/msun/man/trunc.3#2 integrate .. //depot/projects/ia64/lib/msun/src/math.h#25 integrate .. //depot/projects/ia64/lib/msun/src/s_truncl.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/i386/reloc.c#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#149 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#4 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#3 integrate .. //depot/projects/ia64/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#9 integrate .. //depot/projects/ia64/sbin/geom/class/mirror/gmirror.8#6 integrate .. //depot/projects/ia64/sbin/idmapd/idmapd.c#5 integrate .. //depot/projects/ia64/sbin/sysctl/sysctl.c#21 integrate .. //depot/projects/ia64/share/Makefile#8 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#48 integrate .. //depot/projects/ia64/share/man/man4/Makefile#84 integrate .. //depot/projects/ia64/share/man/man4/amr.4#11 integrate .. //depot/projects/ia64/share/man/man4/ata.4#15 integrate .. //depot/projects/ia64/share/man/man4/ataraid.4#1 branch .. //depot/projects/ia64/share/man/man4/polling.4#16 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#53 integrate .. //depot/projects/ia64/share/man/man9/Makefile#53 integrate .. //depot/projects/ia64/share/man/man9/alq.9#5 integrate .. //depot/projects/ia64/share/man/man9/taskqueue.9#9 integrate .. //depot/projects/ia64/sys/amd64/acpica/madt.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#6 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#9 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable.c#8 integrate .. //depot/projects/ia64/sys/amd64/amd64/sys_machdep.c#8 integrate .. //depot/projects/ia64/sys/amd64/conf/GENERIC#26 integrate .. //depot/projects/ia64/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/bus.h#3 integrate .. //depot/projects/ia64/sys/amd64/include/bus_amd64.h#6 delete .. //depot/projects/ia64/sys/amd64/include/legacyvar.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/sysarch.h#6 integrate .. //depot/projects/ia64/sys/amd64/include/tss.h#5 integrate .. //depot/projects/ia64/sys/amd64/isa/clock.c#11 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#11 integrate .. //depot/projects/ia64/sys/arm/sa11x0/sa11x0_io.c#5 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/biosacpi.c#8 integrate .. //depot/projects/ia64/sys/boot/pc98/libpc98/vidconsole.c#4 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#20 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#61 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#22 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#20 integrate .. //depot/projects/ia64/sys/compat/linux/linux_file.c#23 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#15 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ioctl.c#33 integrate .. //depot/projects/ia64/sys/compat/ndis/winx64_wrap.S#2 integrate .. //depot/projects/ia64/sys/conf/Makefile.alpha#16 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#11 integrate .. //depot/projects/ia64/sys/conf/Makefile.arm#8 integrate .. //depot/projects/ia64/sys/conf/Makefile.i386#14 integrate .. //depot/projects/ia64/sys/conf/Makefile.ia64#23 integrate .. //depot/projects/ia64/sys/conf/Makefile.pc98#14 integrate .. //depot/projects/ia64/sys/conf/Makefile.powerpc#21 integrate .. //depot/projects/ia64/sys/conf/Makefile.sparc64#21 integrate .. //depot/projects/ia64/sys/conf/NOTES#90 integrate .. //depot/projects/ia64/sys/conf/files#129 integrate .. //depot/projects/ia64/sys/conf/kern.pre.mk#35 integrate .. //depot/projects/ia64/sys/conf/options.amd64#11 integrate .. //depot/projects/ia64/sys/conf/options.i386#32 integrate .. //depot/projects/ia64/sys/conf/options.pc98#31 integrate .. //depot/projects/ia64/sys/contrib/dev/ath/freebsd/ah_osdep.c#6 integrate .. //depot/projects/ia64/sys/contrib/pf/net/pf.c#13 integrate .. //depot/projects/ia64/sys/ddb/db_print.c#5 integrate .. //depot/projects/ia64/sys/ddb/db_run.c#8 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#61 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_ec.c#28 integrate .. //depot/projects/ia64/sys/dev/aic/aic_cbus.c#5 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#60 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/ia64/sys/dev/ata/ata-card.c#25 integrate .. //depot/projects/ia64/sys/dev/ata/ata-cbus.c#15 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#42 integrate .. //depot/projects/ia64/sys/dev/ata/ata-disk.c#40 integrate .. //depot/projects/ia64/sys/dev/ata/ata-isa.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-lowlevel.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cam.c#26 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-cd.c#45 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-fd.c#24 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#24 integrate .. //depot/projects/ia64/sys/dev/dpt/dpt_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/ati_pcigart.c#1 branch .. //depot/projects/ia64/sys/dev/drm/ati_pcigart.h#5 delete .. //depot/projects/ia64/sys/dev/drm/drm.h#7 integrate .. //depot/projects/ia64/sys/dev/drm/drmP.h#10 integrate .. //depot/projects/ia64/sys/dev/drm/drm_agpsupport.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_agpsupport.h#5 delete .. //depot/projects/ia64/sys/dev/drm/drm_atomic.h#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_auth.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_auth.h#6 delete .. //depot/projects/ia64/sys/dev/drm/drm_bufs.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_bufs.h#10 delete .. //depot/projects/ia64/sys/dev/drm/drm_context.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_context.h#8 delete .. //depot/projects/ia64/sys/dev/drm/drm_dma.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_dma.h#9 delete .. //depot/projects/ia64/sys/dev/drm/drm_drawable.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_drawable.h#5 delete .. //depot/projects/ia64/sys/dev/drm/drm_drv.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_drv.h#18 delete .. //depot/projects/ia64/sys/dev/drm/drm_fops.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_fops.h#10 delete .. //depot/projects/ia64/sys/dev/drm/drm_ioctl.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_ioctl.h#7 delete .. //depot/projects/ia64/sys/dev/drm/drm_irq.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_irq.h#4 delete .. //depot/projects/ia64/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/drm_lock.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_lock.h#6 delete .. //depot/projects/ia64/sys/dev/drm/drm_memory.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_memory.h#12 delete .. //depot/projects/ia64/sys/dev/drm/drm_memory_debug.h#4 delete .. //depot/projects/ia64/sys/dev/drm/drm_os_freebsd.h#18 delete .. //depot/projects/ia64/sys/dev/drm/drm_pci.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_pci.h#4 delete .. //depot/projects/ia64/sys/dev/drm/drm_pciids.h#2 integrate .. //depot/projects/ia64/sys/dev/drm/drm_sarea.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/drm_scatter.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_scatter.h#6 delete .. //depot/projects/ia64/sys/dev/drm/drm_sysctl.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_sysctl.h#9 delete .. //depot/projects/ia64/sys/dev/drm/drm_vm.c#1 branch .. //depot/projects/ia64/sys/dev/drm/drm_vm.h#11 delete .. //depot/projects/ia64/sys/dev/drm/i915_dma.c#1 branch .. //depot/projects/ia64/sys/dev/drm/i915_drm.h#1 branch .. //depot/projects/ia64/sys/dev/drm/i915_drv.c#1 branch .. //depot/projects/ia64/sys/dev/drm/i915_drv.h#1 branch .. //depot/projects/ia64/sys/dev/drm/i915_irq.c#1 branch .. //depot/projects/ia64/sys/dev/drm/i915_mem.c#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_dma.c#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_drm.h#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_drv.c#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_drv.h#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_irq.c#1 branch .. //depot/projects/ia64/sys/dev/drm/mach64_state.c#1 branch .. //depot/projects/ia64/sys/dev/drm/mga.h#7 delete .. //depot/projects/ia64/sys/dev/drm/mga_dma.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drm.h#5 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/mga_drv.h#8 integrate .. //depot/projects/ia64/sys/dev/drm/mga_irq.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/mga_state.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/mga_ucode.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/mga_warp.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/r128.h#8 delete .. //depot/projects/ia64/sys/dev/drm/r128_cce.c#9 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drm.h#6 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/r128_drv.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/r128_irq.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/r128_state.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/radeon.h#10 delete .. //depot/projects/ia64/sys/dev/drm/radeon_cp.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drm.h#9 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.c#10 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_drv.h#11 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_irq.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_mem.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/radeon_state.c#12 integrate .. //depot/projects/ia64/sys/dev/drm/savage_bci.c#1 branch .. //depot/projects/ia64/sys/dev/drm/savage_drm.h#1 branch .. //depot/projects/ia64/sys/dev/drm/savage_drv.c#1 branch .. //depot/projects/ia64/sys/dev/drm/savage_drv.h#1 branch .. //depot/projects/ia64/sys/dev/drm/savage_state.c#1 branch .. //depot/projects/ia64/sys/dev/drm/sis.h#5 delete .. //depot/projects/ia64/sys/dev/drm/sis_drm.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.c#5 integrate .. //depot/projects/ia64/sys/dev/drm/sis_drv.h#3 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.c#3 integrate .. //depot/projects/ia64/sys/dev/drm/sis_ds.h#4 integrate .. //depot/projects/ia64/sys/dev/drm/sis_mm.c#6 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx.h#6 delete .. //depot/projects/ia64/sys/dev/drm/tdfx_drv.c#7 integrate .. //depot/projects/ia64/sys/dev/drm/tdfx_drv.h#1 branch .. //depot/projects/ia64/sys/dev/ed/if_ed98.h#3 integrate .. //depot/projects/ia64/sys/dev/ep/if_ep.c#19 integrate .. //depot/projects/ia64/sys/dev/ida/ida.c#16 integrate .. //depot/projects/ia64/sys/dev/ida/ida_eisa.c#11 integrate .. //depot/projects/ia64/sys/dev/ida/ida_pci.c#14 integrate .. //depot/projects/ia64/sys/dev/ida/idareg.h#4 integrate .. //depot/projects/ia64/sys/dev/ida/idavar.h#6 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb_pci.c#6 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#49 integrate .. //depot/projects/ia64/sys/dev/pci/pci_user.c#15 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/ia64/sys/dev/ppbus/pps.c#15 integrate .. //depot/projects/ia64/sys/dev/sound/pci/es137x.c#15 integrate .. //depot/projects/ia64/sys/dev/sound/usb/uaudio_pcm.c#9 integrate .. //depot/projects/ia64/sys/dev/wi/if_wi.c#60 integrate .. //depot/projects/ia64/sys/fs/devfs/devfs_vnops.c#40 integrate .. //depot/projects/ia64/sys/fs/hpfs/hpfs_vnops.c#31 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_conv.c#11 integrate .. //depot/projects/ia64/sys/fs/msdosfs/msdosfs_lookup.c#9 integrate .. //depot/projects/ia64/sys/fs/nwfs/nwfs_vnops.c#15 integrate .. //depot/projects/ia64/sys/fs/pseudofs/pseudofs_vnops.c#29 integrate .. //depot/projects/ia64/sys/fs/smbfs/smbfs_vnops.c#30 integrate .. //depot/projects/ia64/sys/fs/udf/ecma167-udf.h#4 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#32 integrate .. //depot/projects/ia64/sys/fs/unionfs/union_vnops.c#25 integrate .. //depot/projects/ia64/sys/gnu/ext2fs/ext2_lookup.c#18 integrate .. //depot/projects/ia64/sys/i386/acpica/madt.c#9 integrate .. //depot/projects/ia64/sys/i386/conf/NOTES#64 integrate .. //depot/projects/ia64/sys/i386/i386/genassym.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#6 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#62 integrate .. //depot/projects/ia64/sys/i386/i386/mp_machdep.c#44 integrate .. //depot/projects/ia64/sys/i386/i386/mptable.c#10 integrate .. //depot/projects/ia64/sys/i386/i386/swtch.s#16 integrate .. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#29 integrate .. //depot/projects/ia64/sys/i386/i386/vm86bios.s#5 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#7 integrate .. //depot/projects/ia64/sys/i386/include/clock.h#11 integrate .. //depot/projects/ia64/sys/i386/include/pc/display.h#3 integrate .. //depot/projects/ia64/sys/i386/include/pcb.h#12 integrate .. //depot/projects/ia64/sys/i386/include/pcpu.h#12 integrate .. //depot/projects/ia64/sys/i386/include/segments.h#10 integrate .. //depot/projects/ia64/sys/i386/include/sysarch.h#10 integrate .. //depot/projects/ia64/sys/i386/linux/linux.h#7 integrate .. //depot/projects/ia64/sys/i386/pci/pci_pir.c#7 integrate .. //depot/projects/ia64/sys/ia64/ia64/db_trace.c#17 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#40 integrate .. //depot/projects/ia64/sys/ia64/ia64/unwind.c#13 integrate .. //depot/projects/ia64/sys/isa/isahint.c#5 integrate .. //depot/projects/ia64/sys/isa/isavar.h#8 integrate .. //depot/projects/ia64/sys/isofs/cd9660/cd9660_lookup.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_alq.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_ktr.c#20 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#38 integrate .. //depot/projects/ia64/sys/kern/kern_prot.c#40 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#29 integrate .. //depot/projects/ia64/sys/kern/subr_param.c#17 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#10 integrate .. //depot/projects/ia64/sys/kern/sys_socket.c#23 integrate .. //depot/projects/ia64/sys/kern/tty.c#44 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#55 integrate .. //depot/projects/ia64/sys/kern/vfs_cache.c#22 integrate .. //depot/projects/ia64/sys/kern/vfs_lookup.c#20 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#78 integrate .. //depot/projects/ia64/sys/modules/Makefile#84 integrate .. //depot/projects/ia64/sys/modules/drm/Makefile#4 integrate .. //depot/projects/ia64/sys/modules/drm/drm/Makefile#1 branch .. //depot/projects/ia64/sys/modules/drm/mach64/Makefile#1 branch .. //depot/projects/ia64/sys/net/if.c#43 integrate .. //depot/projects/ia64/sys/net/iso88025.h#7 integrate .. //depot/projects/ia64/sys/netgraph/ng_cisco.c#12 integrate .. //depot/projects/ia64/sys/netgraph/ng_echo.c#4 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#45 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#60 integrate .. //depot/projects/ia64/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#26 integrate .. //depot/projects/ia64/sys/netinet6/icmp6.c#27 integrate .. //depot/projects/ia64/sys/nfs4client/nfs4_vnops.c#15 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#44 integrate .. //depot/projects/ia64/sys/pc98/conf/NOTES#26 integrate .. //depot/projects/ia64/sys/pc98/i386/machdep.c#51 integrate .. //depot/projects/ia64/sys/pc98/include/bus_memio.h#2 integrate .. //depot/projects/ia64/sys/pc98/include/bus_pio.h#2 integrate .. //depot/projects/ia64/sys/pc98/include/clock.h#2 integrate .. //depot/projects/ia64/sys/pc98/include/pc/display.h#2 integrate .. //depot/projects/ia64/sys/pc98/pc98/isa_dma.c#8 integrate .. //depot/projects/ia64/sys/pc98/pc98/olpt.c#10 integrate .. //depot/projects/ia64/sys/pc98/pc98/scterm-sck.c#4 integrate .. //depot/projects/ia64/sys/pci/if_pcn.c#28 integrate .. //depot/projects/ia64/sys/security/mac/mac_process.c#4 integrate .. //depot/projects/ia64/sys/security/mac/mac_socket.c#3 integrate .. //depot/projects/ia64/sys/security/mac/mac_vfs.c#5 integrate .. //depot/projects/ia64/sys/security/mac_biba/mac_biba.c#30 integrate .. //depot/projects/ia64/sys/security/mac_lomac/mac_lomac.c#22 integrate .. //depot/projects/ia64/sys/security/mac_mls/mac_mls.c#29 integrate .. //depot/projects/ia64/sys/security/mac_stub/mac_stub.c#9 integrate .. //depot/projects/ia64/sys/security/mac_test/mac_test.c#25 integrate .. //depot/projects/ia64/sys/sparc64/include/cpufunc.h#11 integrate .. //depot/projects/ia64/sys/sparc64/include/pcpu.h#8 integrate .. //depot/projects/ia64/sys/sparc64/include/tick.h#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/exception.S#18 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/genassym.c#26 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/interrupt.S#7 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/intr_machdep.c#15 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#59 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mp_machdep.c#24 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/tick.c#13 integrate .. //depot/projects/ia64/sys/sys/alq.h#5 integrate .. //depot/projects/ia64/sys/sys/ata.h#15 integrate .. //depot/projects/ia64/sys/sys/kernel.h#24 integrate .. //depot/projects/ia64/sys/sys/mac.h#29 integrate .. //depot/projects/ia64/sys/sys/mac_policy.h#26 integrate .. //depot/projects/ia64/sys/sys/mouse.h#5 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#18 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_vnops.c#47 integrate .. //depot/projects/ia64/sys/vm/vm_mmap.c#42 integrate .. //depot/projects/ia64/sys/vm/vm_pageq.c#14 integrate .. //depot/projects/ia64/tools/regression/mac/mac_bsdextended/Makefile#1 branch .. //depot/projects/ia64/tools/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/Makefile#4 integrate .. //depot/projects/ia64/tools/regression/usr.bin/printf/Makefile#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.b.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.d.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.f.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.m1.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.m2.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.m3.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.m4.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.s.out#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.sh#1 branch .. //depot/projects/ia64/tools/regression/usr.bin/printf/regress.t#1 branch .. //depot/projects/ia64/tools/tools/ath/80211stats.c#5 integrate .. //depot/projects/ia64/tools/tools/ministat/ministat.c#4 integrate .. //depot/projects/ia64/tools/tools/nanobsd/Makefile#7 integrate .. //depot/projects/ia64/tools/tools/nanobsd/i386.diskimage#9 integrate .. //depot/projects/ia64/tools/tools/nanobsd/make.conf#8 integrate .. //depot/projects/ia64/usr.bin/make/var.c#23 integrate .. //depot/projects/ia64/usr.bin/printf/Makefile#5 integrate .. //depot/projects/ia64/usr.bin/printf/printf.1#10 integrate .. //depot/projects/ia64/usr.bin/printf/printf.c#11 integrate .. //depot/projects/ia64/usr.bin/top/machine.c#9 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.8#7 integrate .. //depot/projects/ia64/usr.sbin/mixer/mixer.c#7 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.8#10 integrate .. //depot/projects/ia64/usr.sbin/moused/moused.c#12 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.8#14 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#25 integrate Differences ... ==== //depot/projects/ia64/bin/sh/sh.1#31 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.99 2005/03/04 13:16:50 keramida Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.100 2005/04/15 14:53:29 keramida Exp $ .\" .Dd July 3, 2004 .Dt SH 1 @@ -196,6 +196,12 @@ Enable asynchronous notification of background job completion. (UNIMPLEMENTED) +.It Fl c Li string +Read commands from the +.Ar string +operand instead of from the standard input. +Keep in mind that this option only accepts a single string as its +argument, hence multi-word strings must be quoted. .It Fl C Li noclobber Do not overwrite existing files with .Dq Li > . @@ -303,13 +309,6 @@ .El .Pp The -.Fl c -option may be used to pass its string argument to the shell -to be interpreted as input. -Keep in mind that this option only accepts a single string as its -argument, hence multi-word strings must be quoted. -.Pp -The .Fl /+o option takes as its only argument the long name of an option to be enabled or disabled. @@ -1643,9 +1642,9 @@ .Pp The following environment variables affect the execution of .Ic fc : -.Bl -tag -width indent +.Bl -tag -width ".Ev HISTSIZE" .It Ev FCEDIT -Name of the editor to use. +Name of the editor to use for history editing. .It Ev HISTSIZE The number of previous commands that are accessible. .El @@ -2051,12 +2050,86 @@ Otherwise the shell will return the exit status of the last command executed, or if the exit builtin is used with a numeric argument, it will return the argument. +.Sh ENVIRONMENT +The following environment variables affect the execution of +.Nm : +.Bl -tag -width ".Ev HISTSIZE" +.It Ev CDPATH +The search path used with the +.Ic cd +built-in. +.It Ev EDITOR +The fallback editor used with the +.Ic fc +built-in. +If not set, the default editor is +.Xr ed 1 . +.It Ev FCEDIT +The default editor used with the +.Ic fc +built-in. +.It Ev HISTSIZE +The number of previous commands that are accessible. +.It Ev HOME +The starting directory of +.Nm . +.It Ev IFS +Input Field Separators. +This is normally set to +.Aq space , +.Aq tab , +and +.Aq newline . +See the +.Sx White Space Splitting +section for more details. +.It Ev MAIL +The name of a mail file, that will be checked for the arrival of new +mail. +Overridden by +.Ev MAILPATH . +.It Ev MAILPATH +A colon +.Pq Ql \&: +separated list of file names, for the shell to check for incoming +mail. +This environment setting overrides the +.Ev MAIL +setting. +There is a maximum of 10 mailboxes that can be monitored at once. +.It Ev PATH +The default search path for executables. +See the +.Sx Path Search +section for details. +.It Ev PS1 +The primary prompt string, which defaults to +.Dq $ \ , +unless you are the superuser, in which case it defaults to +.Dq # \ . +.It Ev PS2 +The secondary prompt string, which defaults to +.Dq \*[Gt] \ . +.It Ev TERM +The default terminal setting for the shell. +This is inherited by children of the shell, and is used in the history +editing modes. +.El .Sh SEE ALSO .Xr builtin 1 , +.Xr chsh 1 , .Xr echo 1 , +.Xr ed 1 , +.Xr emacs 1 , .Xr expr 1 , +.Xr getopt 1 , .Xr pwd 1 , -.Xr test 1 +.Xr test 1 , +.Xr umask 2 , +.Xr vi 1 , +.Xr execve 2 , +.Xr getrlimit 2 , +.Xr editrc 5 .Sh HISTORY A .Nm ==== //depot/projects/ia64/contrib/top/commands.c#5 (text+ko) ==== @@ -8,7 +8,7 @@ * Copyright (c) 1984, 1989, William LeFebvre, Rice University * Copyright (c) 1989, 1990, 1992, William LeFebvre, Northwestern University * - * $FreeBSD: src/contrib/top/commands.c,v 1.10 2004/08/16 07:51:21 alfred Exp $ + * $FreeBSD: src/contrib/top/commands.c,v 1.11 2005/04/14 15:02:03 keramida Exp $ */ /* @@ -78,7 +78,7 @@ #ifdef ORDER if (displaymode == DISP_CPU) fputs("\ -o - specify sort order (pri, size, res, cpu, time)\n", stdout); +o - specify sort order (pri, size, res, cpu, time, threads)\n", stdout); else fputs("\ o - specify sort order (vcsw, ivcsw, read, write, fault, total)\n", stdout); ==== //depot/projects/ia64/contrib/top/top.c#6 (text+ko) ==== @@ -13,7 +13,7 @@ * Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory * Copyright (c) 1996, William LeFebvre, Group sys Consulting * - * $FreeBSD: src/contrib/top/top.c,v 1.15 2004/08/16 07:51:21 alfred Exp $ + * $FreeBSD: src/contrib/top/top.c,v 1.16 2005/04/14 15:02:03 keramida Exp $ */ /* @@ -84,6 +84,7 @@ static int max_topn; /* maximum displayable processes */ /* miscellaneous things */ +struct process_select ps; char *myname = "top"; jmp_buf jmp_int; @@ -179,7 +180,6 @@ char *iptr; char no_command = 1; struct timeval timeout; - struct process_select ps; #ifdef ORDER char *order_name = NULL; int order_index = 0; @@ -987,8 +987,10 @@ case CMD_thrtog: ps.thread = !ps.thread; new_message(MT_standout | MT_delayed, - " %sisplaying threads.", - ps.thread ? "D" : "Not d"); + "Displaying threads %s", + ps.thread ? "separately" : "as a count"); + header_text = format_header(uname_field); + reset_display(); putchar('\r'); break; case CMD_viewtog: ==== //depot/projects/ia64/etc/rc.d/cleanvar#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/cleanvar,v 1.7 2004/10/07 13:55:25 mtm Exp $ +# $FreeBSD: src/etc/rc.d/cleanvar,v 1.8 2005/04/14 03:56:06 csjp Exp $ # # PROVIDE: cleanvar @@ -18,6 +18,8 @@ ( cd "$dir" && for file in .* * do + # Skip over logging sockets + [ -S "$file" -a "$file" = "log" ] && continue [ ."$file" = .. -o ."$file" = ... ] && continue if [ -d "$file" -a ! -L "$file" ] then ==== //depot/projects/ia64/games/fortune/datfiles/fortunes#47 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.174 2005/04/10 10:53:26 schweikh Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.175 2005/04/13 06:11:49 phk Exp $ % ======================================================================= @@ -15198,6 +15198,11 @@ Computerspeak for "information". Properly pronounced the way Bostonians pronounce the word for a female child. % +Data is not information; +Information is not knowledge; +Knowledge is not wisdom; + -- Gary Flake +% Dave Mack: "Your stupidity, Allen, is simply not up to par." Allen Gwinn: "Yours is." % ==== //depot/projects/ia64/lib/libc/i386/gen/_set_tp.c#3 (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/i386/gen/_set_tp.c,v 1.2 2004/11/06 03:28:26 peter Exp $ + * $FreeBSD: src/lib/libc/i386/gen/_set_tp.c,v 1.3 2005/04/14 00:02:37 peter Exp $ */ #include <string.h> @@ -36,8 +36,11 @@ { #ifndef COMPAT_32BIT union descriptor ldt; - int sel; + int error, sel; + error = i386_set_gsbase(tp); + if (error == 0) + return; memset(&ldt, 0, sizeof(ldt)); ldt.sd.sd_lolimit = 0xffff; /* 4G limit */ ldt.sd.sd_lobase = ((uintptr_t)tp) & 0xffffff; ==== //depot/projects/ia64/lib/libc/i386/sys/Makefile.inc#8 (text+ko) ==== @@ -1,9 +1,10 @@ # from: Makefile.inc,v 1.1 1993/09/03 19:04:23 jtc Exp -# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.28 2004/11/06 03:28:26 peter Exp $ +# $FreeBSD: src/lib/libc/i386/sys/Makefile.inc,v 1.29 2005/04/14 00:01:35 peter Exp $ .if !defined(COMPAT_32BIT) SRCS+= i386_clr_watch.c i386_get_ioperm.c i386_get_ldt.c i386_set_ioperm.c \ i386_set_ldt.c i386_set_watch.c i386_vm86.c +SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_set_fsbase.c i386_set_gsbase.c .else SRCS+= _amd64_get_fsbase.c _amd64_get_gsbase.c _amd64_set_fsbase.c _amd64_set_gsbase.c .endif ==== //depot/projects/ia64/lib/libc/net/getaddrinfo.c#22 (text+ko) ==== @@ -63,10 +63,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.62 2005/04/06 15:36:34 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.65 2005/04/15 18:15:12 ume Exp $"); #include "namespace.h" -#include "reentrant.h" #include <sys/types.h> #include <sys/param.h> #include <sys/socket.h> @@ -286,14 +285,6 @@ static int res_querydomainN(const char *, const char *, struct res_target *); -/* - * XXX: Many dependencies are not thread-safe. Still, we cannot use - * getaddrinfo() in conjunction with other functions which call them. - */ -static mutex_t _getaddrinfo_thread_lock = MUTEX_INITIALIZER; -#define THREAD_LOCK() mutex_lock(&_getaddrinfo_thread_lock); -#define THREAD_UNLOCK() mutex_unlock(&_getaddrinfo_thread_lock); - /* XXX macros that make external reference is BAD. */ #define GET_AI(ai, afd, addr) \ @@ -1441,13 +1432,9 @@ break; } - THREAD_LOCK(); - if ((sp = getservbyname(servname, proto)) == NULL) { - THREAD_UNLOCK(); + if ((sp = getservbyname(servname, proto)) == NULL) return EAI_SERVICE; - } port = sp->s_port; - THREAD_UNLOCK(); } if (!matchonly) { @@ -2283,7 +2270,7 @@ /* resolver logic */ -extern const char *__hostalias(const char *); +extern const char *_res_hostalias(const char *, char *, size_t); /* * Formulate a normal query, send, and await answer. @@ -2310,11 +2297,6 @@ rcode = NOERROR; ancount = 0; - if ((_res.options & RES_INIT) == 0 && res_init() == -1) { - h_errno = NETDB_INTERNAL; - return (-1); - } - buf = malloc(MAXPACKET); if (!buf) { h_errno = NETDB_INTERNAL; @@ -2423,6 +2405,7 @@ u_int dots; int trailing_dot, ret, saved_herrno; int got_nodata = 0, got_servfail = 0, tried_as_is = 0; + char abuf[MAXDNAME]; if ((_res.options & RES_INIT) == 0 && res_init() == -1) { h_errno = NETDB_INTERNAL; @@ -2441,7 +2424,7 @@ /* * if there aren't any dots, it could be a user-level alias */ - if (!dots && (cp = __hostalias(name)) != NULL) + if (!dots && (cp = _res_hostalias(name, abuf, sizeof(abuf))) != NULL) return (res_queryN(cp, target)); /* @@ -2561,10 +2544,6 @@ const char *longname = nbuf; size_t n, d; - if ((_res.options & RES_INIT) == 0 && res_init() == -1) { - h_errno = NETDB_INTERNAL; - return (-1); - } #ifdef DEBUG if (_res.options & RES_DEBUG) printf(";; res_querydomain(%s, %s)\n", ==== //depot/projects/ia64/lib/libc/net/gethostbydns.c#12 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.46 2004/07/21 17:26:40 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.47 2005/04/15 14:42:29 ume Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -96,6 +96,8 @@ static char hostbuf[8*1024]; static u_char host_addr[16]; /* IPv4 or IPv6 */ +extern const char *_res_hostalias(const char *, char *, size_t); + #ifdef RESOLVSORT static void addrsort(char **, int); #endif @@ -477,6 +479,7 @@ const char *cp; char *bp, *ep; int n, size, type, len; + char abuf[MAXDNAME]; name = va_arg(ap, const char *); af = va_arg(ap, int); @@ -510,7 +513,8 @@ * this is also done in res_query() since we are not the only * function that looks up host names. */ - if (!strchr(name, '.') && (cp = __hostalias(name))) + if (!strchr(name, '.') && + (cp = _res_hostalias(name, abuf, sizeof abuf))) name = cp; /* ==== //depot/projects/ia64/lib/libc/net/getservbyname.c#3 (text+ko) ==== @@ -35,47 +35,55 @@ static char sccsid[] = "@(#)getservbyname.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.4 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyname.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); #include <netdb.h> #include <string.h> +#include "netdb_private.h" -extern int _serv_stayopen; - -struct servent * -getservbyname(name, proto) - const char *name, *proto; +int +getservbyname_r(const char *name, const char *proto, struct servent *se, + struct servent_data *sed) { - struct servent *p; char **cp; + int error; #ifdef YP - extern char *___getservbyname_yp; - extern char *___getservbyproto_yp; - - ___getservbyname_yp = (char *)name; - ___getservbyproto_yp = (char *)proto; + sed->getservbyname_yp = (char *)name; + sed->getservbyproto_yp = (char *)proto; #endif - setservent(_serv_stayopen); - while ( (p = getservent()) ) { - if (strcmp(name, p->s_name) == 0) + setservent_r(sed->stayopen, sed); + while ((error = getservent_r(se, sed)) == 0) { + if (strcmp(name, se->s_name) == 0) goto gotname; - for (cp = p->s_aliases; *cp; cp++) + for (cp = se->s_aliases; *cp; cp++) if (strcmp(name, *cp) == 0) goto gotname; continue; gotname: - if (proto == 0 || strcmp(p->s_proto, proto) == 0) + if (proto == 0 || strcmp(se->s_proto, proto) == 0) break; } - if (!_serv_stayopen) - endservent(); + if (!sed->stayopen) + endservent_r(sed); #ifdef YP - ___getservbyname_yp = NULL; - ___getservbyproto_yp = NULL; + sed->getservbyname_yp = NULL; + sed->getservbyproto_yp = NULL; #endif - return (p); + return (error); +} + +struct servent * +getservbyname(const char *name, const char *proto) +{ + struct servdata *sd; + + if ((sd = _servdata_init()) == NULL) + return (NULL); + if (getservbyname_r(name, proto, &sd->serv, &sd->data) != 0) + return (NULL); + return (&sd->serv); } ==== //depot/projects/ia64/lib/libc/net/getservbyport.c#3 (text+ko) ==== @@ -35,42 +35,49 @@ static char sccsid[] = "@(#)getservbyport.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.4 2002/03/21 18:49:23 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservbyport.c,v 1.5 2005/04/15 18:09:39 ume Exp $"); #include <netdb.h> #include <string.h> +#include "netdb_private.h" -extern int _serv_stayopen; - -struct servent * -getservbyport(port, proto) - int port; - const char *proto; +int +getservbyport_r(int port, const char *proto, struct servent *se, + struct servent_data *sed) { - struct servent *p; + int error; #ifdef YP - extern int ___getservbyport_yp; - extern char *___getservbyproto_yp; - - ___getservbyport_yp = port; - ___getservbyproto_yp = (char *)proto; + sed->getservbyport_yp = port; + sed->getservbyproto_yp = (char *)proto; #endif - setservent(_serv_stayopen); - while ( (p = getservent()) ) { - if (p->s_port != port) + setservent_r(sed->stayopen, sed); + while ((error = getservent_r(se, sed)) == 0) { + if (se->s_port != port) continue; - if (proto == 0 || strcmp(p->s_proto, proto) == 0) + if (proto == 0 || strcmp(se->s_proto, proto) == 0) break; } - if (!_serv_stayopen) - endservent(); + if (!sed->stayopen) + endservent_r(sed); #ifdef YP - ___getservbyport_yp = 0; - ___getservbyproto_yp = NULL; + sed->getservbyport_yp = 0; + sed->getservbyproto_yp = NULL; #endif - return (p); + return (error); +} + +struct servent * +getservbyport(int port, const char *proto) +{ + struct servdata *sd; + + if ((sd = _servdata_init()) == NULL) + return (NULL); + if (getservbyport_r(port, proto, &sd->serv, &sd->data) != 0) + return (NULL); + return (&sd->serv); } ==== //depot/projects/ia64/lib/libc/net/getservent.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)getservent.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.13 2005/01/03 11:07:45 sobomax Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getservent.c,v 1.14 2005/04/15 18:09:39 ume Exp $"); #include <sys/types.h> #include <sys/socket.h> @@ -48,41 +48,85 @@ #include <rpc/rpc.h> #include <rpcsvc/yp_prot.h> #include <rpcsvc/ypclnt.h> -static int serv_stepping_yp = 0; #endif -#include "libc_private.h" +#include "namespace.h" +#include "reentrant.h" +#include "un-namespace.h" +#include "netdb_private.h" + +static struct servdata servdata; +static thread_key_t servdata_key; +static once_t servdata_init_once = ONCE_INITIALIZER; +static int servdata_thr_keycreated = 0; + +static void +servent_data_clear(struct servent_data *sed) +{ + if (sed->fp) { + fclose(sed->fp); + sed->fp = NULL; + } + if (sed->key) { + free(sed->key); + sed->key = NULL; + } +} + +static void +servdata_free(void *ptr) +{ + struct servdata *sd = ptr; + + if (sd == NULL) + return; + servent_data_clear(&sd->data); + free(sd); +} + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200504162332.j3GNW0Wd006576>