Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 16 Jun 2004 05:40:35 GMT
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 55062 for review
Message-ID:  <200406160540.i5G5eZf5002552@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=55062

Change 55062 by marcel@marcel_nfs on 2004/06/16 05:39:47

	IFC @55059

Affected files ...

.. //depot/projects/gdb/UPDATING#15 integrate
.. //depot/projects/gdb/bin/setfacl/Makefile#2 integrate
.. //depot/projects/gdb/contrib/groff/doc/meintro.me#2 integrate
.. //depot/projects/gdb/contrib/groff/doc/meref.me#2 integrate
.. //depot/projects/gdb/etc/mtree/BSD.include.dist#6 integrate
.. //depot/projects/gdb/include/Makefile#6 integrate
.. //depot/projects/gdb/lib/libarchive/archive_read_extract.c#15 integrate
.. //depot/projects/gdb/lib/libc/amd64/gen/signalcontext.c#3 integrate
.. //depot/projects/gdb/lib/libc/gmon/moncontrol.3#2 integrate
.. //depot/projects/gdb/lib/libc/net/inet.3#2 integrate
.. //depot/projects/gdb/lib/libc/stdtime/asctime.c#2 integrate
.. //depot/projects/gdb/lib/libc/stdtime/difftime.c#2 integrate
.. //depot/projects/gdb/lib/libc/stdtime/localtime.c#3 integrate
.. //depot/projects/gdb/lib/libc/stdtime/private.h#2 integrate
.. //depot/projects/gdb/lib/libc/stdtime/strftime.c#2 integrate
.. //depot/projects/gdb/lib/libc/sys/getrlimit.2#2 integrate
.. //depot/projects/gdb/lib/libc/sys/read.2#3 integrate
.. //depot/projects/gdb/lib/libkvm/kvm_proc.c#4 integrate
.. //depot/projects/gdb/lib/libpthread/thread/thr_create.c#2 integrate
.. //depot/projects/gdb/lib/libpthread/thread/thr_private.h#3 integrate
.. //depot/projects/gdb/lib/libpthread/thread/thr_sig.c#2 integrate
.. //depot/projects/gdb/lib/libpthread/thread/thr_sigsuspend.c#2 integrate
.. //depot/projects/gdb/lib/libradius/radlib.c#3 integrate
.. //depot/projects/gdb/lib/msun/man/ieee_test.3#2 integrate
.. //depot/projects/gdb/libexec/ftpd/ftpd.c#4 integrate
.. //depot/projects/gdb/libexec/talkd/talkd.c#2 integrate
.. //depot/projects/gdb/sbin/fdisk/fdisk.c#2 integrate
.. //depot/projects/gdb/sbin/geom/core/Makefile#3 integrate
.. //depot/projects/gdb/sbin/gvinum/Makefile#1 branch
.. //depot/projects/gdb/sbin/gvinum/gvinum.c#1 branch
.. //depot/projects/gdb/sbin/gvinum/gvinum.h#1 branch
.. //depot/projects/gdb/sbin/ifconfig/ifconfig.8#8 integrate
.. //depot/projects/gdb/sbin/routed/table.c#4 integrate
.. //depot/projects/gdb/share/man/man4/Makefile#11 integrate
.. //depot/projects/gdb/share/man/man4/bge.4#4 integrate
.. //depot/projects/gdb/share/man/man4/ciss.4#3 integrate
.. //depot/projects/gdb/share/man/man4/cue.4#3 integrate
.. //depot/projects/gdb/share/man/man4/dc.4#2 integrate
.. //depot/projects/gdb/share/man/man4/fwip.4#1 branch
.. //depot/projects/gdb/share/man/man4/gx.4#2 integrate
.. //depot/projects/gdb/share/man/man4/ip.4#3 integrate
.. //depot/projects/gdb/share/man/man4/kue.4#2 integrate
.. //depot/projects/gdb/share/man/man4/lge.4#2 integrate
.. //depot/projects/gdb/share/man/man4/ng_rfc1490.4#2 integrate
.. //depot/projects/gdb/share/man/man4/nge.4#2 integrate
.. //depot/projects/gdb/share/man/man4/uftdi.4#2 integrate
.. //depot/projects/gdb/share/man/man7/hier.7#5 integrate
.. //depot/projects/gdb/share/man/man7/security.7#4 integrate
.. //depot/projects/gdb/share/man/man9/rtentry.9#3 integrate
.. //depot/projects/gdb/share/man/man9/sema.9#2 integrate
.. //depot/projects/gdb/share/man/man9/style.9#2 integrate
.. //depot/projects/gdb/share/misc/iso3166#2 integrate
.. //depot/projects/gdb/share/misc/pci_vendors#2 integrate
.. //depot/projects/gdb/sys/alpha/alpha/pmap.c#9 integrate
.. //depot/projects/gdb/sys/amd64/amd64/pmap.c#12 integrate
.. //depot/projects/gdb/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/gdb/sys/amd64/include/pmap.h#8 integrate
.. //depot/projects/gdb/sys/compat/linux/linux_ioctl.c#3 integrate
.. //depot/projects/gdb/sys/compat/linux/linux_ioctl.h#3 integrate
.. //depot/projects/gdb/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/gdb/sys/conf/NOTES#24 integrate
.. //depot/projects/gdb/sys/conf/files#28 integrate
.. //depot/projects/gdb/sys/conf/kern.pre.mk#10 integrate
.. //depot/projects/gdb/sys/conf/kmod.mk#8 integrate
.. //depot/projects/gdb/sys/conf/options#22 integrate
.. //depot/projects/gdb/sys/contrib/altq/altq/altq.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_cbq.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_cbq.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_cdnr.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_cdnr.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_classq.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_hfsc.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_hfsc.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_priq.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_priq.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_red.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_red.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_rio.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_rio.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_rmclass.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_rmclass.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_subr.c#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altq_var.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/altqconf.h#1 branch
.. //depot/projects/gdb/sys/contrib/altq/altq/if_altq.h#1 branch
.. //depot/projects/gdb/sys/contrib/pf/net/if_pflog.c#6 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/if_pfsync.c#6 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf.c#6 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pf_ioctl.c#7 integrate
.. //depot/projects/gdb/sys/contrib/pf/net/pfvar.h#3 integrate
.. //depot/projects/gdb/sys/crypto/des/des_ecb.c#2 integrate
.. //depot/projects/gdb/sys/crypto/des/des_enc.c#2 integrate
.. //depot/projects/gdb/sys/crypto/des/des_setkey.c#2 integrate
.. //depot/projects/gdb/sys/dev/aac/aac_debug.c#3 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi.c#20 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_acad.c#8 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_button.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_cmbat.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_ec.c#9 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_isab.c#4 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_lid.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pci_link.c#5 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpi_resource.c#6 integrate
.. //depot/projects/gdb/sys/dev/acpica/acpivar.h#15 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-all.c#8 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-chipset.c#9 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/gdb/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/gdb/sys/dev/awi/awi.c#5 integrate
.. //depot/projects/gdb/sys/dev/ciss/ciss.c#11 integrate
.. //depot/projects/gdb/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/gdb/sys/dev/esp/ncr53c9x.c#3 integrate
.. //depot/projects/gdb/sys/dev/esp/ncr53c9xvar.h#3 integrate
.. //depot/projects/gdb/sys/dev/firewire/firewire.c#9 integrate
.. //depot/projects/gdb/sys/dev/firewire/if_fwip.c#1 branch
.. //depot/projects/gdb/sys/dev/firewire/if_fwipvar.h#1 branch
.. //depot/projects/gdb/sys/dev/firewire/sbp.c#4 integrate
.. //depot/projects/gdb/sys/dev/hme/if_hme.c#9 integrate
.. //depot/projects/gdb/sys/dev/ichwd/ichwd.c#4 integrate
.. //depot/projects/gdb/sys/dev/ips/ips_commands.c#4 integrate
.. //depot/projects/gdb/sys/dev/pdq/pdq_freebsd.h#2 integrate
.. //depot/projects/gdb/sys/dev/sound/isa/sb16.c#6 integrate
.. //depot/projects/gdb/sys/dev/sound/pci/emu10k1.c#6 integrate
.. //depot/projects/gdb/sys/dev/usb/if_udav.c#5 integrate
.. //depot/projects/gdb/sys/dev/wi/if_wi.c#5 integrate
.. //depot/projects/gdb/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/gdb/sys/fs/specfs/spec_vnops.c#8 integrate
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum.h#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_drive.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_init.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_list.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_plex.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_raid5.h#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_rm.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_share.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_share.h#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_state.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_subr.c#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_var.h#1 branch
.. //depot/projects/gdb/sys/geom/vinum/geom_vinum_volume.c#1 branch
.. //depot/projects/gdb/sys/i386/acpica/acpi_asus.c#4 integrate
.. //depot/projects/gdb/sys/i386/acpica/acpi_toshiba.c#6 integrate
.. //depot/projects/gdb/sys/i386/conf/NOTES#13 integrate
.. //depot/projects/gdb/sys/i386/i386/bios.c#5 integrate
.. //depot/projects/gdb/sys/i386/i386/pmap.c#7 integrate
.. //depot/projects/gdb/sys/i386/ibcs2/ibcs2_misc.c#4 integrate
.. //depot/projects/gdb/sys/i386/include/pmap.h#6 integrate
.. //depot/projects/gdb/sys/i4b/driver/i4b_ipr.c#2 integrate
.. //depot/projects/gdb/sys/kern/init_main.c#4 integrate
.. //depot/projects/gdb/sys/kern/kern_clock.c#9 integrate
.. //depot/projects/gdb/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/gdb/sys/kern/kern_proc.c#8 integrate
.. //depot/projects/gdb/sys/kern/kern_prot.c#5 integrate
.. //depot/projects/gdb/sys/kern/kern_resource.c#7 integrate
.. //depot/projects/gdb/sys/kern/kern_sema.c#2 integrate
.. //depot/projects/gdb/sys/kern/link_elf_obj.c#4 integrate
.. //depot/projects/gdb/sys/kern/sched_4bsd.c#5 integrate
.. //depot/projects/gdb/sys/kern/sched_ule.c#12 integrate
.. //depot/projects/gdb/sys/kern/subr_witness.c#10 integrate
.. //depot/projects/gdb/sys/kern/sys_socket.c#4 integrate
.. //depot/projects/gdb/sys/kern/tty_conf.c#4 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket.c#9 integrate
.. //depot/projects/gdb/sys/kern/uipc_socket2.c#9 integrate
.. //depot/projects/gdb/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/gdb/sys/kern/uipc_usrreq.c#8 integrate
.. //depot/projects/gdb/sys/kern/vfs_subr.c#9 integrate
.. //depot/projects/gdb/sys/modules/geom/geom_vinum/Makefile#1 branch
.. //depot/projects/gdb/sys/net/bridge.c#6 integrate
.. //depot/projects/gdb/sys/net/firewire.h#1 branch
.. //depot/projects/gdb/sys/net/if.c#9 integrate
.. //depot/projects/gdb/sys/net/if_arcsubr.c#6 integrate
.. //depot/projects/gdb/sys/net/if_arp.h#4 integrate
.. //depot/projects/gdb/sys/net/if_ef.c#3 integrate
.. //depot/projects/gdb/sys/net/if_ethersubr.c#13 integrate
.. //depot/projects/gdb/sys/net/if_fddisubr.c#8 integrate
.. //depot/projects/gdb/sys/net/if_fwsubr.c#1 branch
.. //depot/projects/gdb/sys/net/if_iso88025subr.c#7 integrate
.. //depot/projects/gdb/sys/net/if_ppp.c#5 integrate
.. //depot/projects/gdb/sys/net/if_sl.c#6 integrate
.. //depot/projects/gdb/sys/net/if_spppsubr.c#5 integrate
.. //depot/projects/gdb/sys/net/if_tun.c#5 integrate
.. //depot/projects/gdb/sys/net/if_var.h#12 integrate
.. //depot/projects/gdb/sys/net/if_vlan.c#6 integrate
.. //depot/projects/gdb/sys/net/raw_cb.c#4 integrate
.. //depot/projects/gdb/sys/net/raw_cb.h#3 integrate
.. //depot/projects/gdb/sys/net/raw_usrreq.c#4 integrate
.. //depot/projects/gdb/sys/net80211/ieee80211_input.c#4 integrate
.. //depot/projects/gdb/sys/netatalk/ddp_input.c#4 integrate
.. //depot/projects/gdb/sys/netatalk/ddp_output.c#4 integrate
.. //depot/projects/gdb/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/gdb/sys/netatm/atm_aal5.c#2 integrate
.. //depot/projects/gdb/sys/netatm/atm_socket.c#2 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#6 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#5 integrate
.. //depot/projects/gdb/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#6 integrate
.. //depot/projects/gdb/sys/netgraph/ng_ksocket.c#5 integrate
.. //depot/projects/gdb/sys/netgraph/ng_rfc1490.c#3 integrate
.. //depot/projects/gdb/sys/netgraph/ng_rfc1490.h#2 integrate
.. //depot/projects/gdb/sys/netinet/accf_http.c#3 integrate
.. //depot/projects/gdb/sys/netinet/if_ether.c#8 integrate
.. //depot/projects/gdb/sys/netinet/in_pcb.c#8 integrate
.. //depot/projects/gdb/sys/netinet/ip_divert.c#7 integrate
.. //depot/projects/gdb/sys/netinet/ip_fw2.c#8 integrate
.. //depot/projects/gdb/sys/netinet/ip_input.c#8 integrate
.. //depot/projects/gdb/sys/netinet/ip_output.c#9 integrate
.. //depot/projects/gdb/sys/netinet/tcp_input.c#8 integrate
.. //depot/projects/gdb/sys/netinet/tcp_subr.c#8 integrate
.. //depot/projects/gdb/sys/netinet/tcp_syncache.c#5 integrate
.. //depot/projects/gdb/sys/netinet/tcp_usrreq.c#7 integrate
.. //depot/projects/gdb/sys/netinet6/in6_pcb.c#5 integrate
.. //depot/projects/gdb/sys/netinet6/ip6_input.c#6 integrate
.. //depot/projects/gdb/sys/netipx/ipx_pcb.c#3 integrate
.. //depot/projects/gdb/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/gdb/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/gdb/sys/netnatm/natm.c#3 integrate
.. //depot/projects/gdb/sys/netsmb/smb_trantcp.c#3 integrate
.. //depot/projects/gdb/sys/nfsclient/bootp_subr.c#3 integrate
.. //depot/projects/gdb/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/gdb/sys/nfsclient/nfs_socket.c#7 integrate
.. //depot/projects/gdb/sys/pc98/pc98/pc98gdc.c#4 integrate
.. //depot/projects/gdb/sys/pci/if_mn.c#4 integrate
.. //depot/projects/gdb/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/gdb/sys/sparc64/sbus/lsi64854.c#1 branch
.. //depot/projects/gdb/sys/sparc64/sbus/lsi64854reg.h#1 branch
.. //depot/projects/gdb/sys/sparc64/sbus/lsi64854var.h#1 branch
.. //depot/projects/gdb/sys/sys/_types.h#2 integrate
.. //depot/projects/gdb/sys/sys/gmon.h#4 integrate
.. //depot/projects/gdb/sys/sys/param.h#13 integrate
.. //depot/projects/gdb/sys/sys/proc.h#16 integrate
.. //depot/projects/gdb/sys/sys/resource.h#4 integrate
.. //depot/projects/gdb/sys/sys/sched.h#4 integrate
.. //depot/projects/gdb/sys/sys/socketvar.h#6 integrate
.. //depot/projects/gdb/sys/sys/types.h#5 integrate
.. //depot/projects/gdb/sys/ufs/ffs/ffs_snapshot.c#4 integrate
.. //depot/projects/gdb/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/gdb/sys/vm/vm_glue.c#8 integrate
.. //depot/projects/gdb/sys/vm/vm_pageout.c#5 integrate
.. //depot/projects/gdb/tools/tools/kttcp/sys/kttcp.c#2 integrate
.. //depot/projects/gdb/tools/tools/tinderbox/etc/Makefile#3 integrate
.. //depot/projects/gdb/tools/tools/tinderbox/etc/update_current.rc#1 branch
.. //depot/projects/gdb/tools/tools/tinderbox/etc/update_stable.rc#1 branch
.. //depot/projects/gdb/tools/tools/tinderbox/tbmaster.1#4 integrate
.. //depot/projects/gdb/tools/tools/tinderbox/tbmaster.pl#5 integrate
.. //depot/projects/gdb/tools/tools/tinderbox/www/index.cgi#3 integrate
.. //depot/projects/gdb/usr.bin/Makefile#9 integrate
.. //depot/projects/gdb/usr.bin/fstat/fstat.c#2 integrate
.. //depot/projects/gdb/usr.bin/su/su.c#3 integrate
.. //depot/projects/gdb/usr.bin/talk/get_names.c#2 integrate
.. //depot/projects/gdb/usr.bin/talk/talk.1#2 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.c#17 integrate
.. //depot/projects/gdb/usr.bin/tar/bsdtar.h#9 integrate
.. //depot/projects/gdb/usr.bin/tar/matching.c#5 integrate
.. //depot/projects/gdb/usr.bin/truss/amd64-fbsd.c#1 branch
.. //depot/projects/gdb/usr.bin/truss/extern.h#2 integrate
.. //depot/projects/gdb/usr.bin/truss/main.c#2 integrate
.. //depot/projects/gdb/usr.bin/whois/whois.1#2 integrate
.. //depot/projects/gdb/usr.bin/whois/whois.c#2 integrate
.. //depot/projects/gdb/usr.sbin/acpi/iasl/iasl.8#2 integrate
.. //depot/projects/gdb/usr.sbin/adduser/adduser.conf.5#3 integrate
.. //depot/projects/gdb/usr.sbin/apm/apm.c#3 integrate
.. //depot/projects/gdb/usr.sbin/arlcontrol/arlcontrol.8#3 integrate
.. //depot/projects/gdb/usr.sbin/arp/arp.c#5 integrate
.. //depot/projects/gdb/usr.sbin/asf/asf.8#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/hcsecd/hcsecd.conf.5#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/sdpcontrol/sdpcontrol.8#2 integrate
.. //depot/projects/gdb/usr.sbin/bluetooth/sdpd/sdpd.8#2 integrate
.. //depot/projects/gdb/usr.sbin/dconschat/dconschat.8#4 integrate
.. //depot/projects/gdb/usr.sbin/ip6addrctl/ip6addrctl.8#2 integrate
.. //depot/projects/gdb/usr.sbin/moused/moused.8#2 integrate
.. //depot/projects/gdb/usr.sbin/mtree/specspec.c#2 integrate
.. //depot/projects/gdb/usr.sbin/ndiscvt/ndiscvt.8#2 integrate
.. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.c#6 integrate
.. //depot/projects/gdb/usr.sbin/newsyslog/newsyslog.conf.5#3 integrate
.. //depot/projects/gdb/usr.sbin/nologin/nologin.5#2 integrate
.. //depot/projects/gdb/usr.sbin/traceroute6/traceroute6.c#2 integrate
.. //depot/projects/gdb/usr.sbin/watchdogd/watchdog.8#3 integrate
.. //depot/projects/gdb/usr.sbin/watchdogd/watchdogd.8#4 integrate
.. //depot/projects/gdb/usr.sbin/zzz/zzz.8#2 integrate

Differences ...

==== //depot/projects/gdb/UPDATING#15 (text+ko) ====

@@ -17,7 +17,19 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
-20040607:
+20040614:
+	The return value of sema_timedwait(9) has been changed to
+	make it consistent with cv_timedwait(9).  Be sure to recompile
+	the ips module and any third-party modules which call
+	sema_timedwait.
+
+20040613:
+	ALTQ is now linked to the build. This breaks ABI for struct ifnet.
+	Make sure to recompile modules and any userland that makes use of
+	sizeof(struct ifnet). In order to get the altq headers in place
+	please recompile and reinstall world.
+
+20040607:
 	Splitting kern_thread.c into 2 files (adding kern_kse.c)
 	requires that you re-run config after updating your tree.
 
@@ -1611,4 +1623,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.309 2004/06/07 21:37:40 julian Exp $
+$FreeBSD: src/UPDATING,v 1.312 2004/06/14 18:19:04 jdp Exp $

==== //depot/projects/gdb/bin/setfacl/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/bin/setfacl/Makefile,v 1.7 2001/12/04 01:57:46 obrien Exp $
+# $FreeBSD: src/bin/setfacl/Makefile,v 1.8 2004/06/13 19:22:53 obrien Exp $
 
-PROG=		setfacl
-SRCS=		file.c mask.c merge.c remove.c setfacl.c util.c
+PROG=	setfacl
+SRCS=	file.c mask.c merge.c remove.c setfacl.c util.c
 
 .include <bsd.prog.mk>

==== //depot/projects/gdb/contrib/groff/doc/meintro.me#2 (text+ko) ====

@@ -2239,8 +2239,5 @@
 and the plethora of people who have contributed ideas
 and have given support for the project.
 .sp 1i
-This document was
-\*G'ed
-on \*(td
-and applies to the version of the \-me macros
+This document applies to the version of the \-me macros
 included with \*G version \*(MO.

==== //depot/projects/gdb/contrib/groff/doc/meref.me#2 (text+ko) ====

@@ -195,9 +195,7 @@
 (upper or lower case)
 or digit.
 .pp
-This documentation was \*G'ed
-on \*(td
-and applies to \*G version
+This documentation applies to \*G version
 \*(MO
 of the \-me macros.
 .sh 1 "Paragraphing"
@@ -1822,19 +1820,19 @@
 .DE
 Today's date,
 directly printable.
-The date is of the form \*(td.
+The date is of the form February 15, 2003.
 Other forms of the date can be used
 by using
 .NR (dy
 (the day of the month;
-for example, \n(dy),
+for example, 15),
 .ST (mo
 (as noted above)
 or
 .NR (mo
 (the same,
 but as an ordinal number;
-for example, \*(mo is \n(mo),
+for example, February is 2),
 .NR (y4
 (the current year),
 and

==== //depot/projects/gdb/etc/mtree/BSD.include.dist#6 (text+ko) ====

@@ -1,10 +1,12 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.82 2004/05/20 10:29:26 pjd Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.83 2004/06/13 17:29:05 mlaier Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
 
 /set type=dir uname=root gname=wheel mode=0755
 .
+    altq
+    ..
     arpa
     ..
     bsnmp

==== //depot/projects/gdb/include/Makefile#6 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.213 2004/05/20 10:29:26 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.214 2004/06/13 17:29:05 mlaier Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -111,6 +111,9 @@
 	cd ${.CURDIR}/../sys/dev/bktr; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ioctl_*.h \
 	    ${DESTDIR}${INCLUDEDIR}/dev/bktr
+	cd ${.CURDIR}/../sys/contrib/altq/altq; \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+	    ${DESTDIR}${INCLUDEDIR}/altq
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
 	    ${DESTDIR}${INCLUDEDIR}/netinet
@@ -149,6 +152,11 @@
 		ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \
 	done
 .endfor
+	cd ${.CURDIR}/../sys/contrib/altq/altq; \
+	for h in *.h; do \
+		ln -fs ../../../sys/contrib/altq/altq/$$h \
+		    ${DESTDIR}${INCLUDEDIR}/altq; \
+	done
 	cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \
 	for h in *.h; do \
 		ln -fs ../../../sys/contrib/ipfilter/netinet/$$h \

==== //depot/projects/gdb/lib/libarchive/archive_read_extract.c#15 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.17 2004/06/05 06:08:40 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_extract.c,v 1.18 2004/06/15 07:12:04 kientzle Exp $");
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -394,11 +394,10 @@
 	mode = st->st_mode;
 
 	/*
-	 * XXX TODO: Does this really work under all conditions?
-	 * E.g., root restores a dir owned by someone else? XXX
+	 * Use conservative permissions when creating directories
+	 * to close a few security races.
 	 */
-	/* Ensure we can write to this directory. */
-	writable_mode = mode | 0700;
+	writable_mode = 0700;
 
 	if (mode != writable_mode || flags & ARCHIVE_EXTRACT_TIME) {
 		/* Add this dir to the fixup list. */
@@ -694,21 +693,34 @@
 /*
  * Returns 0 if it successfully created necessary directories.
  * Otherwise, returns ARCHIVE_WARN.
+ *
+ * XXX TODO: Merge this with archive_extract_dir() above; that will
+ * allow us to deal with all directory-related security and
+ * permissions issues in one place. XXX
  */
 static int
 mkdirpath(struct archive *a, const char *path)
 {
 	char *p;
 	struct extract *extract;
+	size_t len;
 
 	extract = a->extract;
 
 	/* Copy path to mutable storage, then call mkdirpath_recursive. */
 	archive_strcpy(&(extract->mkdirpath), path);
+	p = extract->mkdirpath.s;
+	len = strlen(p);
+	/* Prune trailing "/." sequence. */
+	if (len > 2 && p[len - 1] == '.' && p[len - 2] == '/') {
+		p[len - 1] = 0;
+		len--;
+	}
 	/* Prune a trailing '/' character. */
-	p = extract->mkdirpath.s;
-	if (p[strlen(p)-1] == '/')
-		p[strlen(p)-1] = 0;
+	if (p[len - 1] == '/') {
+		p[len - 1] = 0;
+		len--;
+	}
 	/* Recursively try to build the path. */
 	return (mkdirpath_recursive(p));
 }
@@ -736,6 +748,10 @@
 static int
 mksubdir(char *path)
 {
+	/*
+	 * TODO: Change mode here to 0700 and add a fixup entry
+	 * to change the mode to 0755 after the extract is finished.
+	 */
 	int mode = 0755;
 
 	if (mkdir(path, mode) == 0) return (0);

==== //depot/projects/gdb/lib/libc/amd64/gen/signalcontext.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.3 2004/03/31 07:27:31 peter Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/signalcontext.c,v 1.4 2004/06/15 21:46:36 davidxu Exp $");
 
 #include <sys/types.h>
 #include <sys/ucontext.h>
@@ -58,7 +58,7 @@
 	 * This means that we need an 8-byte-odd alignment since the ABI expects
 	 * the return address to be pushed, thus breaking the 16 byte alignment.
 	 */
-	sp = (ucp->uc_mcontext.mc_rsp - sizeof(ucontext_t)) & ~15UL;
+	sp = (ucp->uc_mcontext.mc_rsp - 128 - sizeof(ucontext_t)) & ~15UL;
 	sig_uc = (ucontext_t *)sp;
 	bcopy(ucp, sig_uc, sizeof(*sig_uc));
 	sp = (sp - sizeof(siginfo_t)) & ~15UL;

==== //depot/projects/gdb/lib/libc/gmon/moncontrol.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)moncontrol.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.14 2002/12/19 09:40:22 ru Exp $
+.\" $FreeBSD: src/lib/libc/gmon/moncontrol.3,v 1.15 2004/06/14 18:41:24 bms Exp $
 .\"
-.Dd June 4, 1993
+.Dd June 14, 2004
 .Dt MONCONTROL 3
 .Os
 .Sh NAME
@@ -43,6 +43,7 @@
 .Lb libc
 .Sh SYNOPSIS
 .In sys/types.h
+.In sys/gmon.h
 .Ft int
 .Fn moncontrol "int mode"
 .Ft int

==== //depot/projects/gdb/lib/libc/net/inet.3#2 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     From: @(#)inet.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.25 2002/09/06 11:23:49 tjr Exp $
+.\" $FreeBSD: src/lib/libc/net/inet.3,v 1.27 2004/06/14 14:24:18 bms Exp $
 .\"
-.Dd June 17, 1996
+.Dd June 14, 2004
 .Dt INET 3
 .Os
 .Sh NAME
@@ -119,10 +119,17 @@
 .Pp
 The function
 .Fn inet_ntop
-converts an address from network format (usually a
+converts an address
+.Fa *src
+from network format
+(usually a
 .Ft struct in_addr
 or some other binary form, in network byte order) to presentation format
 (suitable for external display purposes).
+The
+.Fa size
+argument specifies the size, in bytes, of the buffer
+.Fa *dst .
 It returns NULL if a system error occurs (in which case,
 .Va errno
 will have been set), or it returns a pointer to the destination string.
@@ -226,6 +233,18 @@
 and
 .Fn inet_network
 for malformed requests.
+.Sh ERRORS
+The
+.Fn inet_ntop
+call fails if:
+.Bl -tag -width Er
+.It Bq Er ENOSPC
+.Fa size
+was not large enough to store the presentation form of the address.
+.It Bq Er EAFNOSUPPORT
+.Fa *src
+was not an AF_INET or AF_INET6 family address.
+.El
 .Sh SEE ALSO
 .Xr addr2ascii 3 ,
 .Xr byteorder 3 ,

==== //depot/projects/gdb/lib/libc/stdtime/asctime.c#2 (text+ko) ====

@@ -1,15 +1,15 @@
 /*
 ** This file is in the public domain, so clarified as of
-** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
+** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] __unused = "@(#)asctime.c	7.7";
+static char	elsieid[] __unused = "@(#)asctime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.11 2003/02/16 17:29:11 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/asctime.c,v 1.12 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
@@ -19,24 +19,14 @@
 #include "tzfile.h"
 
 /*
-** A la X3J11, with core dump avoidance.
+** A la ISO/IEC 9945-1, ANSI/IEEE Std 1003.1, Second Edition, 1996-07-12.
 */
 
-
 char *
-asctime(timeptr)
+asctime_r(timeptr, buf)
 const struct tm *	timeptr;
+char *			buf;
 {
-	static char		result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) +
-					3 + 2 + 1 + 1];
-	return(asctime_r(timeptr, result));
-}
-
-char *
-asctime_r(timeptr, result)
-const struct tm *	timeptr;
-char *result;
-{
 	static const char	wday_name[][3] = {
 		"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
 	};
@@ -44,13 +34,6 @@
 		"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 		"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
 	};
-	/*
-	** Big enough for something such as
-	** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
-	** (two three-character abbreviations, five strings denoting integers,
-	** three explicit spaces, two explicit colons, a newline,
-	** and a trailing ASCII nul).
-	*/
 	const char *	wn;
 	const char *	mn;
 
@@ -65,10 +48,31 @@
 	**	"%.3s %.3s%3d %02.2d:%02.2d:%02.2d %d\n"
 	** Since the .2 in 02.2d is ignored, we drop it.
 	*/
-	(void) sprintf(result, "%.3s %.3s%3d %02d:%02d:%02d %d\n",
+	(void) sprintf(buf, "%.3s %.3s%3d %02d:%02d:%02d %d\n",
 		wn, mn,
 		timeptr->tm_mday, timeptr->tm_hour,
 		timeptr->tm_min, timeptr->tm_sec,
 		TM_YEAR_BASE + timeptr->tm_year);
-	return result;
+	return buf;
+}
+
+/*
+** A la X3J11, with core dump avoidance.
+*/
+
+char *
+asctime(timeptr)
+const struct tm *	timeptr;
+{
+	/*
+	** Big enough for something such as
+	** ??? ???-2147483648 -2147483648:-2147483648:-2147483648 -2147483648\n
+	** (two three-character abbreviations, five strings denoting integers,
+	** three explicit spaces, two explicit colons, a newline,
+	** and a trailing ASCII nul).
+	*/
+	static char		result[3 * 2 + 5 * INT_STRLEN_MAXIMUM(int) +
+					3 + 2 + 1 + 1];
+
+	return asctime_r(timeptr, result);
 }

==== //depot/projects/gdb/lib/libc/stdtime/difftime.c#2 (text+ko) ====

@@ -6,10 +6,10 @@
 #include <sys/cdefs.h>
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] __unused = "@(#)difftime.c	7.7";
+static char	elsieid[] __unused = "@(#)difftime.c	7.9";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/difftime.c,v 1.7 2003/02/16 17:29:11 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/difftime.c,v 1.8 2004/06/14 10:31:52 stefanf Exp $");
 
 /*LINTLIBRARY*/
 
@@ -36,10 +36,16 @@
 	time_t	delta;
 	time_t	hibit;
 
-	if (sizeof(time_t) < sizeof(double))
-		return (double) time1 - (double) time0;
-	if (sizeof(time_t) < sizeof(long_double))
-		return (long_double) time1 - (long_double) time0;
+	{
+		time_t		tt;
+		double		d;
+		long_double	ld;
+
+		if (sizeof tt < sizeof d)
+			return (double) time1 - (double) time0;
+		if (sizeof tt < sizeof ld)
+			return (long_double) time1 - (long_double) time0;
+	}
 	if (time1 < time0)
 		return -difftime(time0, time1);
 	/*

==== //depot/projects/gdb/lib/libc/stdtime/localtime.c#3 (text+ko) ====

@@ -1,15 +1,15 @@
 /*
 ** This file is in the public domain, so clarified as of
-** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
+** 1996-06-05 by Arthur David Olson (arthur_david_olson@nih.gov).
 */
 
 #include <sys/cdefs.h>
 #ifndef lint
 #ifndef NOID
-static char	elsieid[] __unused = "@(#)localtime.c	7.57";
+static char	elsieid[] __unused = "@(#)localtime.c	7.78";
 #endif /* !defined NOID */
 #endif /* !defined lint */
-__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.38 2004/06/11 03:34:02 kensmith Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.39 2004/06/14 10:31:52 stefanf Exp $");
 
 /*
 ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
@@ -77,12 +77,23 @@
 
 static const char	gmt[] = "UTC";
 
+/*
+** The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
+** We default to US rules as of 1999-08-17.
+** POSIX 1003.1 section 8.1.1 says that the default DST rules are
+** implementation dependent; for historical reasons, US rules are a
+** common default.
+*/
+#ifndef TZDEFRULESTRING
+#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
+#endif /* !defined TZDEFDST */
+
 struct ttinfo {				/* time type information */
-	long		tt_gmtoff;	/* GMT offset in seconds */
+	long		tt_gmtoff;	/* UTC offset in seconds */
 	int		tt_isdst;	/* used to set tm_isdst */
 	int		tt_abbrind;	/* abbreviation list index */
 	int		tt_ttisstd;	/* TRUE if transition is std time */
-	int		tt_ttisgmt;	/* TRUE if transition is GMT */
+	int		tt_ttisgmt;	/* TRUE if transition is UTC */
 };
 
 struct lsinfo {				/* leap second information */
@@ -152,6 +163,10 @@
 				void(*funcp) (const time_t *,
 				long, struct tm*),
 				long offset, int * okayp);
+static time_t		time2sub(struct tm *tmp,
+				void(*funcp) (const time_t *,
+				long, struct tm*),
+				long offset, int * okayp, int do_norm_secs);
 static void		timesub(const time_t * timep, long offset,
 				const struct state * sp, struct tm * tmp);
 static int		tmcomp(const struct tm * atmp,
@@ -328,27 +343,23 @@
 	}
 	{
 		struct tzhead *	tzhp;
-		char		buf[sizeof *sp + sizeof *tzhp];
+		union {
+			struct tzhead	tzhead;
+			char		buf[sizeof *sp + sizeof *tzhp];
+		} u;
 		int		ttisstdcnt;
 		int		ttisgmtcnt;
 
-		i = _read(fid, buf, sizeof buf);
+		i = _read(fid, u.buf, sizeof u.buf);
 		if (_close(fid) != 0)
 			return -1;
-		p = buf;
-		p += (sizeof tzhp->tzh_magic) + (sizeof tzhp->tzh_reserved);
-		ttisstdcnt = (int) detzcode(p);
-		p += 4;
-		ttisgmtcnt = (int) detzcode(p);
-		p += 4;
-		sp->leapcnt = (int) detzcode(p);
-		p += 4;
-		sp->timecnt = (int) detzcode(p);
-		p += 4;
-		sp->typecnt = (int) detzcode(p);
-		p += 4;
-		sp->charcnt = (int) detzcode(p);
-		p += 4;
+		ttisstdcnt = (int) detzcode(u.tzhead.tzh_ttisstdcnt);
+		ttisgmtcnt = (int) detzcode(u.tzhead.tzh_ttisgmtcnt);
+		sp->leapcnt = (int) detzcode(u.tzhead.tzh_leapcnt);
+		sp->timecnt = (int) detzcode(u.tzhead.tzh_timecnt);
+		sp->typecnt = (int) detzcode(u.tzhead.tzh_typecnt);
+		sp->charcnt = (int) detzcode(u.tzhead.tzh_charcnt);
+		p = u.tzhead.tzh_charcnt + sizeof u.tzhead.tzh_charcnt;
 		if (sp->leapcnt < 0 || sp->leapcnt > TZ_MAX_LEAPS ||
 			sp->typecnt <= 0 || sp->typecnt > TZ_MAX_TYPES ||
 			sp->timecnt < 0 || sp->timecnt > TZ_MAX_TIMES ||
@@ -356,7 +367,7 @@
 			(ttisstdcnt != sp->typecnt && ttisstdcnt != 0) ||
 			(ttisgmtcnt != sp->typecnt && ttisgmtcnt != 0))
 				return -1;
-		if (i - (p - buf) < sp->timecnt * 4 +	/* ats */
+		if (i - (p - u.buf) < sp->timecnt * 4 +	/* ats */
 			sp->timecnt +			/* types */
 			sp->typecnt * (4 + 2) +		/* ttinfos */
 			sp->charcnt +			/* chars */
@@ -614,8 +625,8 @@
 }
 
 /*
-** Given the Epoch-relative time of January 1, 00:00:00 GMT, in a year, the
-** year, a rule, and the offset from GMT at the time that rule takes effect,
+** Given the Epoch-relative time of January 1, 00:00:00 UTC, in a year, the
+** year, a rule, and the offset from UTC at the time that rule takes effect,
 ** calculate the Epoch-relative time that rule takes effect.
 */
 
@@ -701,10 +712,10 @@
 	}
 
 	/*
-	** "value" is the Epoch-relative time of 00:00:00 GMT on the day in
+	** "value" is the Epoch-relative time of 00:00:00 UTC on the day in
 	** question.  To get the Epoch-relative time of the specified local
 	** time on that day, add the transition time and the current offset
-	** from GMT.
+	** from UTC.
 	*/
 	return value + rulep->r_time + offset;
 }
@@ -766,6 +777,8 @@
 			if (name == NULL)
 				return -1;
 		} else	dstoffset = stdoffset - SECSPERHOUR;
+		if (*name == '\0' && load_result != 0)
+			name = TZDEFRULESTRING;
 		if (*name == ',' || *name == ';') {
 			struct rule	start;
 			struct rule	end;
@@ -828,8 +841,6 @@
 
 			if (*name != '\0')
 				return -1;
-			if (load_result != 0)
-				return -1;
 			/*
 			** Initial values of theirstdoffset and theirdstoffset.
 			*/
@@ -903,6 +914,7 @@
 			sp->ttis[1].tt_gmtoff = -dstoffset;
 			sp->ttis[1].tt_isdst = TRUE;
 			sp->ttis[1].tt_abbrind = stdlen + 1;
+			sp->typecnt = 2;
 		}
 	} else {
 		dstlen = 0;
@@ -915,7 +927,7 @@
 	sp->charcnt = stdlen + 1;
 	if (dstlen != 0)
 		sp->charcnt += dstlen + 1;
-	if (sp->charcnt > sizeof sp->chars)
+	if ((size_t) sp->charcnt > sizeof sp->chars)
 		return -1;
 	cp = sp->chars;
 	(void) strncpy(cp, stdname, stdlen);
@@ -976,9 +988,9 @@
 		return;
 	}
 
-	if (lcl_is_set > 0  &&  strcmp(lcl_TZname, name) == 0)
+	if (lcl_is_set > 0 && strcmp(lcl_TZname, name) == 0)
 		return;
-	lcl_is_set = (strlen(name) < sizeof(lcl_TZname));
+	lcl_is_set = strlen(name) < sizeof lcl_TZname;
 	if (lcl_is_set)
 		(void) strcpy(lcl_TZname, name);
 
@@ -997,6 +1009,8 @@
 		*/
 		lclptr->leapcnt = 0;		/* so, we're off a little */
 		lclptr->timecnt = 0;
+		lclptr->typecnt = 0;
+		lclptr->ttis[0].tt_isdst = 0;
 		lclptr->ttis[0].tt_gmtoff = 0;
 		lclptr->ttis[0].tt_abbrind = 0;
 		(void) strcpy(lclptr->chars, gmt);
@@ -1071,18 +1085,6 @@
 }
 
 struct tm *
-localtime_r(timep, p_tm)
-const time_t * const	timep;
-struct tm *p_tm;
-{
-	_MUTEX_LOCK(&lcl_mutex);
-	tzset_basic();
-	localsub(timep, 0L, p_tm);
-	_MUTEX_UNLOCK(&lcl_mutex);
-	return(p_tm);
-}
-
-struct tm *
 localtime(timep)
 const time_t * const	timep;
 {
@@ -1119,6 +1121,22 @@
 }
 
 /*
+** Re-entrant version of localtime.
+*/
+
+struct tm *
+localtime_r(timep, tm)
+const time_t * const	timep;
+struct tm *		tm;
+{
+	_MUTEX_LOCK(&lcl_mutex);
+	tzset_basic();
+	localsub(timep, 0L, tm);
+	_MUTEX_UNLOCK(&lcl_mutex);
+	return tm;
+}
+
+/*
 ** gmtsub is to gmtime as localsub is to localtime.
 */
 
@@ -1142,7 +1160,7 @@
 #ifdef TM_ZONE
 	/*
 	** Could get fancy here and deliver something such as
-	** "GMT+xxxx" or "GMT-xxxx" if offset is non-zero,
+	** "UTC+xxxx" or "UTC-xxxx" if offset is non-zero,
 	** but this is no time for a treasure hunt.
 	*/
 	if (offset != 0)
@@ -1197,11 +1215,17 @@
 	}
 }
 
+/*
+* Re-entrant version of gmtime.
+*/
+
 struct tm *
-gmtime_r(const time_t * timep, struct tm * tm)
+gmtime_r(timep, tm)
+const time_t * const	timep;
+struct tm *		tm;
 {
 	gmtsub(timep, 0L, tm);
-	return(tm);
+	return tm;
 }
 
 #ifdef STD_INSPIRED

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406160540.i5G5eZf5002552>