Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Nov 2009 10:25:46 GMT
From:      Rafal Jaworowski <raj@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 170797 for review
Message-ID:  <200911191025.nAJAPkv8073530@repoman.freebsd.org>

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

Change 170797 by raj@raj_fdt on 2009/11/19 10:24:52

	IFC@170794

Affected files ...

.. //depot/projects/fdt/ObsoleteFiles.inc#2 integrate
.. //depot/projects/fdt/UPDATING#3 integrate
.. //depot/projects/fdt/bin/Makefile#2 integrate
.. //depot/projects/fdt/bin/ps/keyword.c#3 integrate
.. //depot/projects/fdt/bin/pwait/Makefile#1 branch
.. //depot/projects/fdt/bin/pwait/pwait.1#1 branch
.. //depot/projects/fdt/bin/pwait/pwait.c#1 branch
.. //depot/projects/fdt/bin/sh/parser.c#2 integrate
.. //depot/projects/fdt/contrib/libpcap/inet.c#3 integrate
.. //depot/projects/fdt/etc/Makefile#2 integrate
.. //depot/projects/fdt/etc/etc.amd64/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.arm/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.i386/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.ia64/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.mips/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.pc98/ttys#1 branch
.. //depot/projects/fdt/etc/etc.powerpc/ttys#2 integrate
.. //depot/projects/fdt/etc/etc.sparc64/ttys#2 integrate
.. //depot/projects/fdt/etc/root/dot.profile#2 integrate
.. //depot/projects/fdt/lib/libc/gen/tzset.3#2 integrate
.. //depot/projects/fdt/lib/libc/locale/isgraph.3#2 integrate
.. //depot/projects/fdt/lib/libc/locale/isprint.3#2 integrate
.. //depot/projects/fdt/lib/libc/locale/nl_langinfo.3#2 integrate
.. //depot/projects/fdt/lib/libc/net/getnameinfo.c#2 integrate
.. //depot/projects/fdt/lib/libc/nls/hu_HU.ISO8859-2.msg#2 integrate
.. //depot/projects/fdt/lib/libc/nls/ko_KR.UTF-8.msg#2 integrate
.. //depot/projects/fdt/lib/libc/nls/ko_KR.eucKR.msg#2 integrate
.. //depot/projects/fdt/lib/libc/posix1e/acl_from_text.c#2 integrate
.. //depot/projects/fdt/lib/libc/stdlib/malloc.c#2 integrate
.. //depot/projects/fdt/lib/libc/sys/vfork.2#2 integrate
.. //depot/projects/fdt/lib/libdevinfo/devinfo.h#2 integrate
.. //depot/projects/fdt/lib/libpam/modules/pam_unix/pam_unix.8#2 integrate
.. //depot/projects/fdt/lib/librt/Makefile#2 integrate
.. //depot/projects/fdt/lib/librt/mq.c#2 integrate
.. //depot/projects/fdt/lib/librt/sigev_thread.c#2 integrate
.. //depot/projects/fdt/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/fdt/release/picobsd/floppy.tree/etc/ttys#2 integrate
.. //depot/projects/fdt/release/picobsd/tinyware/oinit/oinit.c#2 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/fdt/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/fdt/share/man/man3/queue.3#2 integrate
.. //depot/projects/fdt/share/man/man4/Makefile#2 integrate
.. //depot/projects/fdt/share/man/man4/atp.4#1 branch
.. //depot/projects/fdt/share/man/man4/netintro.4#3 integrate
.. //depot/projects/fdt/share/man/man4/snd_hda.4#2 integrate
.. //depot/projects/fdt/share/man/man4/wi.4#2 integrate
.. //depot/projects/fdt/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/fdt/share/man/man8/Makefile#2 integrate
.. //depot/projects/fdt/share/man/man8/rc.8#2 integrate
.. //depot/projects/fdt/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/fdt/share/skel/dot.profile#2 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.SJIS.src#3 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.UTF-8.src#3 integrate
.. //depot/projects/fdt/share/timedef/ja_JP.eucJP.src#3 integrate
.. //depot/projects/fdt/share/zoneinfo/antarctica#3 integrate
.. //depot/projects/fdt/share/zoneinfo/australasia#2 integrate
.. //depot/projects/fdt/share/zoneinfo/etcetera#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/bpf_jit_machdep.h#2 integrate
.. //depot/projects/fdt/sys/amd64/amd64/initcpu.c#3 integrate
.. //depot/projects/fdt/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/fdt/sys/amd64/include/md_var.h#2 integrate
.. //depot/projects/fdt/sys/amd64/include/param.h#2 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_pmp.c#3 integrate
.. //depot/projects/fdt/sys/cam/ata/ata_xpt.c#3 integrate
.. //depot/projects/fdt/sys/cam/cam_periph.c#3 integrate
.. //depot/projects/fdt/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/fdt/sys/cam/cam_queue.h#2 integrate
.. //depot/projects/fdt/sys/cam/cam_xpt.c#3 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_cd.c#2 integrate
.. //depot/projects/fdt/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/fdt/sys/cddl/boot/zfs/zfssubr.c#2 integrate
.. //depot/projects/fdt/sys/conf/NOTES#3 integrate
.. //depot/projects/fdt/sys/conf/files#3 integrate
.. //depot/projects/fdt/sys/conf/options#3 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/changes.txt#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslcompile.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/aslerror.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asllookup.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asloperands.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltransform.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/compiler/asltypes.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/debugger/dbstats.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsinit.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/events/evregion.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exconvrt.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exfield.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg1.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exoparg6.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/executer/exregion.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/include/acconfig.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/include/acmacros.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/include/acpixf.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/include/acutils.h#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdump.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsdumpdv.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsrepair2.c#1 branch
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nswalk.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psloop.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psparse.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/parser/psxface.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate
.. //depot/projects/fdt/sys/contrib/dev/acpica/utilities/utobject.c#2 integrate
.. //depot/projects/fdt/sys/contrib/rdma/krping/krping.c#2 integrate
.. //depot/projects/fdt/sys/ddb/db_command.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_dock.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.c#3 integrate
.. //depot/projects/fdt/sys/dev/ahci/ahci.h#3 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx.c#2 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx.h#2 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate
.. //depot/projects/fdt/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/fdt/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-ahci.c#3 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-jmicron.c#2 integrate
.. //depot/projects/fdt/sys/dev/ata/chipsets/ata-marvell.c#3 integrate
.. //depot/projects/fdt/sys/dev/ath/ath_hal/ah_regdomain.c#2 integrate
.. //depot/projects/fdt/sys/dev/ce/if_ce.c#2 integrate
.. //depot/projects/fdt/sys/dev/cp/if_cp.c#2 integrate
.. //depot/projects/fdt/sys/dev/ctau/if_ct.c#2 integrate
.. //depot/projects/fdt/sys/dev/cx/if_cx.c#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_aq100x.c#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/fdt/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/fdt/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/fdt/sys/dev/de/if_devar.h#2 integrate
.. //depot/projects/fdt/sys/dev/dpms/dpms.c#2 integrate
.. //depot/projects/fdt/sys/dev/ed/if_ed.c#2 integrate
.. //depot/projects/fdt/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/fdt/sys/dev/ed/if_edvar.h#2 integrate
.. //depot/projects/fdt/sys/dev/fb/vesa.c#3 integrate
.. //depot/projects/fdt/sys/dev/fb/vgareg.h#3 integrate
.. //depot/projects/fdt/sys/dev/msk/if_msk.c#3 integrate
.. //depot/projects/fdt/sys/dev/pci/vga_pci.c#3 integrate
.. //depot/projects/fdt/sys/dev/siis/siis.c#3 integrate
.. //depot/projects/fdt/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/fdt/sys/dev/sn/if_sn_pccard.c#2 integrate
.. //depot/projects/fdt/sys/dev/sn/if_snvar.h#2 integrate
.. //depot/projects/fdt/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/fdt/sys/dev/syscons/scterm-teken.c#3 integrate
.. //depot/projects/fdt/sys/dev/syscons/scvidctl.c#2 integrate
.. //depot/projects/fdt/sys/dev/tl/if_tl.c#2 integrate
.. //depot/projects/fdt/sys/dev/tl/if_tlreg.h#2 integrate
.. //depot/projects/fdt/sys/dev/usb/serial/u3g.c#2 integrate
.. //depot/projects/fdt/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/fdt/sys/dev/vge/if_vge.c#3 integrate
.. //depot/projects/fdt/sys/dev/vge/if_vgevar.h#3 integrate
.. //depot/projects/fdt/sys/dev/wb/if_wb.c#2 integrate
.. //depot/projects/fdt/sys/dev/wb/if_wbreg.h#2 integrate
.. //depot/projects/fdt/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/fdt/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.c#2 integrate
.. //depot/projects/fdt/sys/i386/i386/bpf_jit_machdep.h#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/db_machdep.c#2 integrate
.. //depot/projects/fdt/sys/ia64/ia64/exception.S#2 integrate
.. //depot/projects/fdt/sys/isa/vga_isa.c#3 integrate
.. //depot/projects/fdt/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/fdt/sys/kern/kern_linker.c#2 integrate
.. //depot/projects/fdt/sys/kern/kern_sig.c#3 integrate
.. //depot/projects/fdt/sys/kern/tty.c#2 integrate
.. //depot/projects/fdt/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/fdt/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/fdt/sys/net/bpf_jitter.c#2 integrate
.. //depot/projects/fdt/sys/net/bpf_jitter.h#2 integrate
.. //depot/projects/fdt/sys/net/if.c#3 integrate
.. //depot/projects/fdt/sys/net/if.h#3 integrate
.. //depot/projects/fdt/sys/net/if_var.h#3 integrate
.. //depot/projects/fdt/sys/net/route.c#2 integrate
.. //depot/projects/fdt/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_auth.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_os_bsd.h#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/fdt/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_structs.h#2 integrate
.. //depot/projects/fdt/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/fdt/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/fdt/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/fdt/sys/netipsec/key.c#2 integrate
.. //depot/projects/fdt/sys/nfsserver/nfs_fha.c#2 integrate
.. //depot/projects/fdt/sys/pc98/conf/NOTES#2 integrate
.. //depot/projects/fdt/sys/powerpc/aim/mmu_oea64.c#3 integrate
.. //depot/projects/fdt/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/fdt/sys/sys/param.h#3 integrate
.. //depot/projects/fdt/sys/sys/priv.h#3 integrate
.. //depot/projects/fdt/sys/sys/signal.h#2 integrate
.. //depot/projects/fdt/sys/sys/signalvar.h#3 integrate
.. //depot/projects/fdt/sys/sys/sockio.h#3 integrate
.. //depot/projects/fdt/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/fdt/sys/vm/vm_fault.c#3 integrate
.. //depot/projects/fdt/sys/vm/vm_map.c#3 integrate
.. //depot/projects/fdt/sys/vm/vm_map.h#2 integrate
.. //depot/projects/fdt/tools/regression/bin/sh/parser/for1.0#1 branch
.. //depot/projects/fdt/tools/regression/bpf/bpf_filter/Makefile#2 integrate
.. //depot/projects/fdt/tools/regression/bpf/bpf_filter/tests/test0084.h#1 branch
.. //depot/projects/fdt/tools/tools/nanobsd/gateworks/Files/root/.profile#2 integrate
.. //depot/projects/fdt/tools/tools/nanobsd/rescue/Files/etc/ttys#2 integrate
.. //depot/projects/fdt/tools/tools/ncpus/acpi.c#2 integrate
.. //depot/projects/fdt/tools/tools/tinybsd/conf/wrap/etc/ttys#2 integrate
.. //depot/projects/fdt/usr.bin/gencat/gencat.c#2 integrate
.. //depot/projects/fdt/usr.bin/gzip/unbzip2.c#3 integrate
.. //depot/projects/fdt/usr.bin/kdump/kdump.c#3 integrate
.. //depot/projects/fdt/usr.bin/make/arch.c#2 integrate
.. //depot/projects/fdt/usr.bin/make/dir.c#2 integrate
.. //depot/projects/fdt/usr.bin/make/job.c#2 integrate
.. //depot/projects/fdt/usr.bin/systat/Makefile#2 integrate
.. //depot/projects/fdt/usr.bin/systat/main.c#2 integrate
.. //depot/projects/fdt/usr.sbin/acpi/acpidb/Makefile#2 integrate
.. //depot/projects/fdt/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c#2 integrate
.. //depot/projects/fdt/usr.sbin/devinfo/devinfo.c#2 integrate
.. //depot/projects/fdt/usr.sbin/fifolog/fifolog_writer/fifolog_writer.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sade/termcap.c#2 integrate
.. //depot/projects/fdt/usr.sbin/sysinstall/termcap.c#2 integrate

Differences ...

==== //depot/projects/fdt/ObsoleteFiles.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.212 2009/10/28 11:14:32 kib Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.213 2009/11/18 00:56:05 delphij Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20091117: removal of rc.early(8) link
+OLD_FILES+=usr/share/man/man8/rc.early.8.gz
 # 20091027: pselect.3 implemented as syscall
 OLD_FILES+=usr/share/man/man3/pselect.3.gz
 # 20091005: fusword.9 and susword.9 removed

==== //depot/projects/fdt/UPDATING#3 (text+ko) ====

@@ -22,6 +22,21 @@
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20091113:
+	The default terminal emulation for syscons(4) has been changed
+	from cons25 to xterm on all platforms except pc98.  This means
+	that the /etc/ttys file needs to be updated to ensure correct
+	operation of applications on the console.
+
+	The terminal emulation style can be toggled per window by using
+	vidcontrol(1)'s -T flag.  The TEKEN_CONS25 kernel configuration
+	options can be used to change the compile-time default back to
+	cons25.
+
+	To prevent graphical artifacts, make sure the TERM environment
+	variable is set to match the terminal emulation that is being
+	performed by syscons(4).
+
 20091109:
 	The layout of the structure ieee80211req_scan_result has changed.
 	Applications that require wireless scan results (e.g. ifconfig(8))
@@ -1057,4 +1072,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.645 2009/11/09 16:05:32 rpaulo Exp $
+$FreeBSD: src/UPDATING,v 1.647 2009/11/13 11:28:54 ed Exp $

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

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/Makefile,v 1.28 2008/08/31 14:27:59 yar Exp $
+# $FreeBSD: src/bin/Makefile,v 1.29 2009/11/17 22:47:20 jilles Exp $
 
 .include <bsd.own.mk>
 
@@ -27,6 +27,7 @@
 	pax \
 	pkill \
 	ps \
+	pwait \
 	pwd \
 	${_rcp} \
 	realpath \

==== //depot/projects/fdt/bin/ps/keyword.c#3 (text+ko) ====

@@ -33,7 +33,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.81 2009/11/17 07:29:35 netchild Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -330,6 +330,7 @@
 				errx(1, "malloc failed");
 			snprintf(realfmt, rflen, "%s=%s", v->alias, hp);
 			parsefmt(realfmt, user);
+			free(realfmt);
 		}
 		return ((VAR *)NULL);
 	}

==== //depot/projects/fdt/bin/sh/parser.c#2 (text+ko) ====

@@ -36,7 +36,7 @@
 #endif
 #endif /* not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.65 2009/10/16 16:17:57 jilles Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.66 2009/11/14 22:08:32 jilles Exp $");
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -364,7 +364,9 @@
 		n1 = (union node *)stalloc(sizeof (struct nfor));
 		n1->type = NFOR;
 		n1->nfor.var = wordtext;
-		if (readtoken() == TWORD && ! quoteflag && equal(wordtext, "in")) {
+		while (readtoken() == TNL)
+			;
+		if (lasttoken == TWORD && ! quoteflag && equal(wordtext, "in")) {
 			app = &ap;
 			while (readtoken() == TWORD) {
 				n2 = (union node *)stalloc(sizeof (struct narg));

==== //depot/projects/fdt/contrib/libpcap/inet.c#3 (text+ko) ====

@@ -403,30 +403,22 @@
 	pcap_addr_t *curaddr, *prevaddr, *nextaddr;
 #ifdef SIOCGIFDESCR
 	struct ifreq ifrdesc;
-#ifdef __FreeBSD__
-#define _IFDESCRSIZE 64
-	char ifdescr[_IFDESCRSIZE];
-#else
 	char ifdescr[IFDESCRSIZE];
+	int s;
 #endif
-	int s;
 
+#ifdef SIOCGIFDESCR
 	/*
 	 * Get the description for the interface.
 	 */
 	memset(&ifrdesc, 0, sizeof ifrdesc);
 	strlcpy(ifrdesc.ifr_name, name, sizeof ifrdesc.ifr_name);
-#ifdef __FreeBSD__
-	ifrdesc.ifr_buffer.buffer = ifdescr;
-	ifrdesc.ifr_buffer.length = _IFDESCRSIZE;
-#else
 	ifrdesc.ifr_data = (caddr_t)&ifdescr;
-#endif
 	s = socket(AF_INET, SOCK_DGRAM, 0);
 	if (s >= 0) {
 		if (ioctl(s, SIOCGIFDESCR, &ifrdesc) == 0 &&
-		    strlen(ifdescr) != 0)
-			description = ifdescr;
+		    strlen(ifrdesc.ifr_data) != 0)
+			description = ifrdesc.ifr_data;
 		close(s);
 	}
 #endif

==== //depot/projects/fdt/etc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.376 2009/09/02 14:54:47 flz Exp $
+# $FreeBSD: src/etc/Makefile,v 1.377 2009/11/13 11:26:44 ed Exp $
 
 .include <bsd.own.mk>
 
@@ -18,8 +18,13 @@
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
 	rc.subr remote rpc services shells \
-	sysctl.conf syslog.conf \
-	etc.${MACHINE_ARCH}/ttys
+	sysctl.conf syslog.conf
+
+.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
+BIN1+=	etc.${MACHINE}/ttys
+.else
+BIN1+=	etc.${MACHINE_ARCH}/ttys
+.endif
 
 OPENBSMDIR=			${.CURDIR}/../contrib/openbsm
 BSM_ETC_OPEN_FILES=		${OPENBSMDIR}/etc/audit_class \

==== //depot/projects/fdt/etc/etc.amd64/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.amd64/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.amd64/ttys,v 1.19 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/fdt/etc/etc.arm/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.arm/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.arm/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	off  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/fdt/etc/etc.i386/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.i386/ttys,v 1.18 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.i386/ttys,v 1.19 2009/11/13 11:28:54 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/fdt/etc/etc.ia64/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.ia64/ttys,v 1.12 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.ia64/ttys,v 1.13 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	off secure
-# Virtual terminals.
-ttyv1	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	off secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	off secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	off secure
+# Virtual terminals
+ttyv1	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	off secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	off secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals. The 'dialup' keyword identifies dialin lines to login,
 # fingerd etc.

==== //depot/projects/fdt/etc/etc.mips/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.mips/ttys,v 1.6 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.mips/ttys,v 1.7 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.

==== //depot/projects/fdt/etc/etc.powerpc/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.11 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.powerpc/ttys,v 1.12 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -30,15 +30,15 @@
 # when going to single-user mode.
 console	none				unknown	off secure
 #
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 #ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/fdt/etc/etc.sparc64/ttys#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.20 2009/06/14 22:35:33 ed Exp $
+# $FreeBSD: src/etc/etc.sparc64/ttys,v 1.21 2009/11/13 05:54:55 ed Exp $
 #	@(#)ttys	5.1 (Berkeley) 4/17/89
 #
 # This file specifies various information about terminals on the system.
@@ -15,7 +15,7 @@
 #
 # type The initial terminal type for this port.  For hardwired
 #      terminal lines, this will contain the type of terminal used.
-#      For virtual consoles, the correct type is typically cons25.
+#      For virtual consoles, the correct type is typically xterm.
 #      Other common values include network for network connections on
 #      pseudo-terminals, dialup for incoming modem ports, and unknown
 #      when the terminal type cannot be predetermined.
@@ -34,15 +34,15 @@
 ttya	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 ttyb	"/usr/libexec/getty 3wire.9600"	vt100	off secure
 # syscons(4)
-ttyv0	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv0	"/usr/libexec/getty Pc"		xterm	on  secure
 # Virtual terminals
-ttyv1	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv2	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv3	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv4	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv5	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv6	"/usr/libexec/getty Pc"		cons25	on  secure
-ttyv7	"/usr/libexec/getty Pc"		cons25	on  secure
+ttyv1	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv2	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv3	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv4	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv5	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv6	"/usr/libexec/getty Pc"		xterm	on  secure
+ttyv7	"/usr/libexec/getty Pc"		xterm	on  secure
 ttyv8	"/usr/local/bin/xdm -nodaemon"	xterm	off secure
 # Serial terminals
 # The 'dialup' keyword identifies dialin lines to login, fingerd etc.

==== //depot/projects/fdt/etc/root/dot.profile#2 (text+ko) ====

@@ -1,10 +1,10 @@
-# $FreeBSD: src/etc/root/dot.profile,v 1.21 2007/05/29 06:33:10 dougb Exp $
+# $FreeBSD: src/etc/root/dot.profile,v 1.22 2009/11/13 05:54:55 ed Exp $
 #
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin
 export PATH
 HOME=/root
 export HOME
-TERM=${TERM:-cons25}
+TERM=${TERM:-xterm}
 export TERM
 PAGER=more
 export PAGER

==== //depot/projects/fdt/lib/libc/gen/tzset.3#2 (text+ko) ====

@@ -29,7 +29,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)tzset.3	8.2 (Berkeley) 11/17/93
-.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.16 2007/01/09 00:27:56 imp Exp $
+.\" $FreeBSD: src/lib/libc/gen/tzset.3,v 1.17 2009/11/17 16:29:39 obrien Exp $
 .\"
 .Dd November 17, 1993
 .Dt TZSET 3
@@ -310,14 +310,14 @@
 rules for
 .Tn POSIX Ns -style
 .Tn TZ Ns 's
-.It Pa /usr/share/zoneinfo/GMT
+.It Pa /usr/share/zoneinfo/Etc/GMT
 for
 .Tn UTC
 leap seconds
 .El
 .Pp
 If the file
-.Pa /usr/share/zoneinfo/GMT
+.Pa /usr/share/zoneinfo/UTC
 does not exist,
 .Tn UTC
 leap seconds are loaded from

==== //depot/projects/fdt/lib/libc/locale/isgraph.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isgraph.3	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.24 2009/09/04 07:44:58 des Exp $
+.\" $FreeBSD: src/lib/libc/locale/isgraph.3,v 1.25 2009/11/13 09:03:50 roam Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISGRAPH 3
@@ -50,7 +50,7 @@
 function tests for any printing character except space
 .Pq Ql "\ "
 and other
-locale specific space-like characters.
+locale-specific space-like characters.
 The value of the argument must be representable as an
 .Vt "unsigned char"
 or the value of

==== //depot/projects/fdt/lib/libc/locale/isprint.3#2 (text+ko) ====

@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)isprint.3	8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.25 2009/09/04 07:44:58 des Exp $
+.\" $FreeBSD: src/lib/libc/locale/isprint.3,v 1.26 2009/11/13 09:07:33 roam Exp $
 .\"
 .Dd July 17, 2005
 .Dt ISPRINT 3
@@ -47,7 +47,7 @@
 .Sh DESCRIPTION
 The
 .Fn isprint
-function tests for any printing character including space
+function tests for any printing character, including space
 .Pq Ql "\ " .
 The value of the argument must be representable as an
 .Vt "unsigned char"

==== //depot/projects/fdt/lib/libc/locale/nl_langinfo.3#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.6 2005/01/20 09:17:03 ru Exp $
+.\" $FreeBSD: src/lib/libc/locale/nl_langinfo.3,v 1.7 2009/11/16 14:33:31 brueffer Exp $
 .\"
 .Dd May 3, 2001
 .Dt NL_LANGINFO 3
@@ -53,7 +53,7 @@
 or to the
 category
 .Dv LC_ALL ,
-may overwrite buffer pointed by the return value.
+may overwrite the buffer pointed to by the return value.
 .Sh RETURN VALUES
 In a locale where langinfo data is not defined,
 .Fn nl_langinfo

==== //depot/projects/fdt/lib/libc/net/getnameinfo.c#2 (text+ko) ====

@@ -45,13 +45,14 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.20 2007/02/28 21:18:38 bms Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/getnameinfo.c,v 1.21 2009/11/12 11:54:12 ume Exp $");
 
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
+#include <net/firewire.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <arpa/nameser.h>
@@ -385,6 +386,7 @@
 {
 	const struct sockaddr_dl *sdl =
 	    (const struct sockaddr_dl *)(const void *)sa;
+	const struct fw_hwaddr *iha;
 	int n;
 
 	if (serv != NULL && servlen > 0)
@@ -400,6 +402,15 @@
 	}
 
 	switch (sdl->sdl_type) {
+	case IFT_IEEE1394:
+		if (sdl->sdl_alen < sizeof(iha->sender_unique_ID_hi) +
+		    sizeof(iha->sender_unique_ID_lo))
+			return EAI_FAMILY;
+		iha = (const struct fw_hwaddr *)(const void *)LLADDR(sdl);
+		return hexname((const u_int8_t *)&iha->sender_unique_ID_hi,
+		    sizeof(iha->sender_unique_ID_hi) +
+		    sizeof(iha->sender_unique_ID_lo),
+		    host, hostlen);
 	/*
 	 * The following have zero-length addresses.
 	 * IFT_ATM	(net/if_atmsubr.c)

==== //depot/projects/fdt/lib/libc/nls/hu_HU.ISO8859-2.msg#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/hu_HU.ISO8859-2.msg,v 1.1 2009/03/13 10:40:38 gabor Exp $
+$ $FreeBSD: src/lib/libc/nls/hu_HU.ISO8859-2.msg,v 1.2 2009/11/17 18:57:44 gabor Exp $
 $
 $ Message catalog for hu_HU.ISO8859-2 locale
 $
@@ -181,6 +181,16 @@
 87 Attribtum nem tallhat
 $ EDOOFUS
 88 Programozsi hiba
+$ EBADMSG
+89 Helytelen zenet
+$ EMULTIHOP
+90 Multihop ksrlet
+$ ENOLINK
+91 A kapcsolat szigortva lett
+$ EPROTO
+92 Protokol hiba
+$ ENOTCAPABLE
+93 Elgtelen kpessgek
 $
 $ strsignal() support catalog
 $
@@ -247,3 +257,39 @@
 30 Felhasznli szignl 1
 $ SIGUSR2
 31 Felhasznli szignl 2
+$
+$ gai_strerror() support catalog
+$
+$set 3
+$ 1 (elavult)
+1 A hosztnvhez tartoz cmcsald nem tmogatott
+$ EAI_AGAIN
+2 Ideiglenes hiba a nvfeloldskor
+$ EAI_BADFLAGS
+3 rvnytelen ai_flags rtk
+$ EAI_FAIL
+4 Nem helyrellthat hiba a nvfeloldsban
+$ EAI_FAMILY
+5 ai_family nem tmogatott
+$ EAI_MEMORY
+6 Memriafoglalsi hiba
+$ 7 (elavult)
+7 Nem tartozik cm  hosztnvhez
+$ EAI_NONAME
+8 Se hosztnv, se szolgltatsnv nem ll rendelkezsre
+$ EAI_SERVICE
+9 Nem tmogatott ai_socktype szolgltatsnv
+$ EAI_SOCKTYPE
+10 ai_socktype nem tmogatott
+$ EAI_SYSTEM
+11 Rendszerhiba jtt vissza az errno vltozban
+$ EAI_BADHINTS
+12 rvnytelen hint rtk
+$ EAI_PROTOCOL
+13 A feloldott protokol ismeretlen
+$ EAI_OVERFLOW
+14 Az argumentumok puffere tlcsordult
+$ 0
+32766 Siker
+$ NL_MSGMAX
+32767 Ismeretlen hiba

==== //depot/projects/fdt/lib/libc/nls/ko_KR.UTF-8.msg#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $
+$ $FreeBSD: src/lib/libc/nls/ko_KR.UTF-8.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $
 $
 $ Message catalog for ko_KR.UTF-8 locale
 $
@@ -181,6 +181,16 @@
 87 속성을 찾을 수 없습니다
 $ EDOOFUS
 88 프로그램상 오류입니다
+$ EBADMSG
+89 잘못된 메시지입니다
+$ EMULTIHOP
+90 멀티홉이 시도되었습니다
+$ ENOLINK
+91 연결이 끊겼습니다
+$ EPROTO
+92 프로토콜이 잘못되었습니다
+$ ENOTCAPABLE
+93 접근 능력이 충분치 않습니다
 $
 $ strsignal() support catalog
 $
@@ -230,7 +240,7 @@
 $ SIGTTOU
 22 정지 (터미널 출력)
 $ SIGIO
-23 I/O possible
+23 I/O 가능
 $ SIGXCPU
 24 CPU 사용 시간 초과
 $ SIGXFSZ
@@ -247,3 +257,39 @@
 30 사용자 정의 시그널 1
 $ SIGUSR2
 31 사용자 정의 시그널 2
+$
+$ gai_strerror() support catalog
+$
+$set 3
+$ 1 (obsolete)
+1 호스트 이름이 지원하지 않는 주소군입니다
+$ EAI_AGAIN
+2 주소 변환에 일시적으로 실패했습니다
+$ EAI_BADFLAGS
+3 잘못된 ai_flags입니다
+$ EAI_FAIL
+4 주소 변환에 완전히 실패했습니다
+$ EAI_FAMILY
+5 지원되지 않는 ai_family입니다
+$ EAI_MEMORY
+6 메모리 할당에 실패했습니다
+$ 7 (obsolete)
+7 호스트 이름과 일치하는 주소가 없습니다
+$ EAI_NONAME
+8 호스트 이름 또는 서비스 이름이 지정되지 않았거나 알 수 없습니다
+$ EAI_SERVICE
+9 서비스 이름은 ai_socktype에서 지원되지 않습니다
+$ EAI_SOCKTYPE
+10 지원되지 않는 ai_socktype입니다
+$ EAI_SYSTEM
+11 시스템 오류가 errno에 반환되었습니다
+$ EAI_BADHINTS
+12 잘못된 hints입니다
+$ EAI_PROTOCOL
+13 알 수 없는 프로토콜이 변환되었습니다
+$ EAI_OVERFLOW
+14 인자 버퍼 공간이 모자랍니다
+$ 0
+32766 성공
+$ NL_MSGMAX
+32767 알 수 없는 오류

==== //depot/projects/fdt/lib/libc/nls/ko_KR.eucKR.msg#2 (text+ko) ====

@@ -1,4 +1,4 @@
-$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.2 2005/07/16 05:40:14 jkim Exp $
+$ $FreeBSD: src/lib/libc/nls/ko_KR.eucKR.msg,v 1.3 2009/11/16 19:10:09 jkim Exp $
 $
 $ Message catalog for ko_KR.eucKR locale
 $
@@ -181,6 +181,16 @@
 87 Ӽ ã  ϴ
 $ EDOOFUS
 88 α׷ Դϴ
+$ EBADMSG

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



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