PERFORCE change 171632 for review
Alexander Motin
mav at FreeBSD.org
Fri Dec 11 02:59:46 UTC 2009
http://p4web.freebsd.org/chv.cgi?CH=171632
Change 171632 by mav at mav_mavbook on 2009/12/11 02:59:31
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/contrib/expat/lib/xmlparse.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/expat/lib/xmltok_impl.c#3 integrate
.. //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#3 integrate
.. //depot/projects/scottl-camlock/src/etc/namedb/named.root#3 integrate
.. //depot/projects/scottl-camlock/src/etc/termcap.small#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#2 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#7 integrate
.. //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#6 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#4 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#4 integrate
.. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/geom_mirror.c#4 integrate
.. //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#4 integrate
.. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#8 integrate
.. //depot/projects/scottl-camlock/src/share/termcap/termcap.src#4 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_switch.S#3 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/mv/mv_sata.c#5 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/gptboot/gptboot.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosacpi.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/i386/zfsboot/zfsboot.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/btx/btx/btx.S#7 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosmem.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/pc98/loader/main.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfsimpl.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#34 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#44 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#32 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bgereg.h#21 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#29 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/pci/pci_pci.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/sound/pci/hda/hdac.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_pci.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/uhci_pci.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/input/uhid.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_axe.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/net/if_cdce.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#11 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#33 integrate
.. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/dump_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/machdep.c#31 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/i386/minidump_machdep.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#13 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#38 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_syscalls.c#30 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/vfs_vnops.c#24 integrate
.. //depot/projects/scottl-camlock/src/sys/net/radix.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/stack_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sun4v/sun4v/stack_machdep.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/bus.h#19 integrate
.. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.freebsd#7 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/Makefile#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/lastlogin/lastlogin.c#2 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/sysinstall/user.c#4 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/contrib/expat/lib/xmlparse.c#3 (text+ko) ====
@@ -3725,7 +3725,6 @@
return XML_ERROR_NO_ELEMENTS;
default:
tok = -tok;
- next = end;
break;
}
}
==== //depot/projects/scottl-camlock/src/contrib/expat/lib/xmltok_impl.c#3 (text+ko) ====
@@ -1744,7 +1744,7 @@
const char *end,
POSITION *pos)
{
- while (ptr != end) {
+ while (ptr < end) {
switch (BYTE_TYPE(enc, ptr)) {
#define LEAD_CASE(n) \
case BT_LEAD ## n: \
==== //depot/projects/scottl-camlock/src/contrib/netcat/FREEBSD-vendor#3 (text+ko) ====
@@ -1,5 +1,5 @@
-# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.3 2009/08/13 06:07:38 des Exp $
+# $FreeBSD: src/contrib/netcat/FREEBSD-vendor,v 1.4 2009/12/08 19:12:38 delphij Exp $
Project: netcat (aka src/usr.bin/nc in OpenBSD)
ProjectURL: http://www.openbsd.org/
-Version: 4.4
+Version: 4.5
License: BSD
==== //depot/projects/scottl-camlock/src/etc/namedb/named.root#3 (text+ko) ====
@@ -1,5 +1,5 @@
;
-; $FreeBSD: src/etc/namedb/named.root,v 1.14 2008/02/07 06:28:02 dougb Exp $
+; $FreeBSD: src/etc/namedb/named.root,v 1.15 2009/12/11 01:06:04 dougb Exp $
;
; This file holds the information on root name servers needed to
@@ -13,8 +13,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: Feb 04, 2008
-; related version of root zone: 2008020400
+; last update: Dec 12, 2008
+; related version of root zone: 2008121200
;
; formerly NS.INTERNIC.NET
;
@@ -22,68 +22,69 @@
A.ROOT-SERVERS.NET. 3600000 A 198.41.0.4
A.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:BA3E::2:30
;
-; formerly NS1.ISI.EDU
+; FORMERLY NS1.ISI.EDU
;
. 3600000 NS B.ROOT-SERVERS.NET.
B.ROOT-SERVERS.NET. 3600000 A 192.228.79.201
;
-; formerly C.PSI.NET
+; FORMERLY C.PSI.NET
;
. 3600000 NS C.ROOT-SERVERS.NET.
C.ROOT-SERVERS.NET. 3600000 A 192.33.4.12
;
-; formerly TERP.UMD.EDU
+; FORMERLY TERP.UMD.EDU
;
. 3600000 NS D.ROOT-SERVERS.NET.
D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90
;
-; formerly NS.NASA.GOV
+; FORMERLY NS.NASA.GOV
;
. 3600000 NS E.ROOT-SERVERS.NET.
E.ROOT-SERVERS.NET. 3600000 A 192.203.230.10
;
-; formerly NS.ISC.ORG
+; FORMERLY NS.ISC.ORG
;
. 3600000 NS F.ROOT-SERVERS.NET.
F.ROOT-SERVERS.NET. 3600000 A 192.5.5.241
-F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2f::f
+F.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2F::F
;
-; formerly NS.NIC.DDN.MIL
+; FORMERLY NS.NIC.DDN.MIL
;
. 3600000 NS G.ROOT-SERVERS.NET.
G.ROOT-SERVERS.NET. 3600000 A 192.112.36.4
;
-; formerly AOS.ARL.ARMY.MIL
+; FORMERLY AOS.ARL.ARMY.MIL
;
. 3600000 NS H.ROOT-SERVERS.NET.
H.ROOT-SERVERS.NET. 3600000 A 128.63.2.53
-H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803f:235
+H.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:1::803F:235
;
-; formerly NIC.NORDU.NET
+; FORMERLY NIC.NORDU.NET
;
. 3600000 NS I.ROOT-SERVERS.NET.
I.ROOT-SERVERS.NET. 3600000 A 192.36.148.17
;
-; operated by VeriSign, Inc.
+; OPERATED BY VERISIGN, INC.
;
. 3600000 NS J.ROOT-SERVERS.NET.
J.ROOT-SERVERS.NET. 3600000 A 192.58.128.30
J.ROOT-SERVERS.NET. 3600000 AAAA 2001:503:C27::2:30
;
-; operated by RIPE NCC
+; OPERATED BY RIPE NCC
;
. 3600000 NS K.ROOT-SERVERS.NET.
K.ROOT-SERVERS.NET. 3600000 A 193.0.14.129
-K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7fd::1
+K.ROOT-SERVERS.NET. 3600000 AAAA 2001:7FD::1
;
-; operated by ICANN
+; OPERATED BY ICANN
;
. 3600000 NS L.ROOT-SERVERS.NET.
L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
+L.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:3::42
;
-; operated by WIDE
+; OPERATED BY WIDE
;
. 3600000 NS M.ROOT-SERVERS.NET.
M.ROOT-SERVERS.NET. 3600000 A 202.12.27.33
-M.ROOT-SERVERS.NET. 3600000 AAAA 2001:dc3::35
+M.ROOT-SERVERS.NET. 3600000 AAAA 2001:DC3::35
; End of File
==== //depot/projects/scottl-camlock/src/etc/termcap.small#3 (text+ko) ====
@@ -30,7 +30,7 @@
# SUCH DAMAGE.
#
# @(#)termcap.src 5.88 (Berkeley) 4/30/91
-# $FreeBSD: src/etc/termcap.small,v 1.30 2009/06/13 13:35:18 edwin Exp $
+# $FreeBSD: src/etc/termcap.small,v 1.31 2009/12/10 22:25:53 ed Exp $
#
# for syscons
# common entry without semigraphics
@@ -291,32 +291,32 @@
:up=\E[A:\
:ut:
-# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $
+# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
#
-xterm-xfree86|XFree86 xterm:\
- :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
- :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
- :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
- :@7=\EOF:@8=\EOM:kI=\E[2~:\
- :kh=\EOH:kP=\E[5~:kN=\E[6~:\
- :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic:
+xterm-new|modern xterm:\
+ :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
+ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
+ :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
+ :tc=xterm-basic:
#
# This chunk is used for building the VT220/Sun/PC keyboard variants.
-xterm-basic|xterm common (XFree86):\
- :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\
- :is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:\
- :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\
- :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
- :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\
- :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:kb=^H:\
- :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\
- :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\
- :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\
- :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\
- :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:\
+xterm-basic|modern xterm common:\
+ :am:bs:km:mi:ms:ut:xn:AX:\
+ :Co#8:co#80:kn#12:li#24:pa#64:\
+ :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+ :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\
+ :as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+ :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\
+ :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\
+ :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\
+ :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\
+ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\
+ :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
+ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
#
# This is the only entry which you should have to customize, since "xterm"
# is widely used for a variety of incompatible terminal emulations including
# color_xterm and rxvt.
-xterm|xterm-color|X11 terminal emulator:\
- :ti@:te@:tc=xterm-xfree86:
+xterm|X11 terminal emulator:\
+ :tc=xterm-new:
==== //depot/projects/scottl-camlock/src/lib/libarchive/archive_read_support_format_cpio.c#4 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.30 2009/04/27 19:30:09 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.31 2009/12/10 06:42:28 kientzle Exp $");
#ifdef HAVE_ERRNO_H
#include <errno.h>
@@ -356,7 +356,7 @@
* Scan ahead until we find something that looks
* like an odc header.
*/
- while (p + sizeof(struct cpio_newc_header) < q) {
+ while (p + sizeof(struct cpio_newc_header) <= q) {
switch (p[5]) {
case '1':
case '2':
@@ -490,7 +490,7 @@
* Scan ahead until we find something that looks
* like an odc header.
*/
- while (p + sizeof(struct cpio_odc_header) < q) {
+ while (p + sizeof(struct cpio_odc_header) <= q) {
switch (p[5]) {
case '7':
if (memcmp("070707", p, 6) == 0
@@ -731,6 +731,9 @@
dev_t dev;
ino_t ino;
+ if (archive_entry_nlink(entry) <= 1)
+ return;
+
dev = archive_entry_dev(entry);
ino = archive_entry_ino(entry);
==== //depot/projects/scottl-camlock/src/lib/libc/gen/sem_init.3#2 (text+ko) ====
@@ -25,9 +25,9 @@
.\" OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
.\" EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.18 2005/07/13 13:15:21 rwatson Exp $
+.\" $FreeBSD: src/lib/libc/gen/sem_init.3,v 1.19 2009/12/08 20:48:06 jilles Exp $
.\"
-.Dd February 15, 2000
+.Dd December 8, 2009
.Dt SEM_INIT 3
.Os
.Sh NAME
@@ -48,8 +48,7 @@
.Fa value .
A non-zero value for
.Fa pshared
-specifies a shared semaphore that can be used by multiple processes, which this
-implementation is not capable of.
+specifies a shared semaphore that can be used by multiple processes.
.Pp
Following a successful call to
.Fn sem_init ,
@@ -78,8 +77,6 @@
.Dv SEM_VALUE_MAX .
.It Bq Er ENOSPC
Memory allocation error.
-.It Bq Er EPERM
-Unable to initialize a shared semaphore.
.El
.Sh SEE ALSO
.Xr sem_destroy 3 ,
@@ -93,16 +90,10 @@
.Fn sem_init
function conforms to
.St -p1003.1-96 .
-.Pp
-This implementation does not support shared semaphores, and reports this fact
-by setting
-.Va errno
-to
-.Er EPERM .
-This is perhaps a stretch of the intention of
-.Tn POSIX ,
-but is
-compliant, with the caveat that
-.Fn sem_init
-always reports a permissions error when an attempt to create a shared semaphore
-is made.
+.Sh BUGS
+A sem_t is a pointer to a separately allocated structure,
+therefore process shared semaphores only work between related processes
+and do not perform very well
+(each operation is a system call,
+while single-process semaphores only do a system call
+if they need to block or wake up a thread).
==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#7 (text+ko) ====
@@ -156,7 +156,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.186 2009/11/14 09:31:47 cperciva Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.188 2009/12/10 02:51:40 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -2419,7 +2419,7 @@
static inline void
arena_run_reg_dalloc(arena_run_t *run, arena_bin_t *bin, void *ptr, size_t size)
{
- unsigned diff, regind, elm, bit;
+ unsigned shift, diff, regind, elm, bit;
assert(run->magic == ARENA_RUN_MAGIC);
@@ -2428,31 +2428,16 @@
* actual division here can reduce allocator throughput by over 20%!
*/
diff = (unsigned)((uintptr_t)ptr - (uintptr_t)run - bin->reg0_offset);
- if ((size & (size - 1)) == 0) {
- /*
- * log2_table allows fast division of a power of two in the
- * [1..128] range.
- *
- * (x / divisor) becomes (x >> log2_table[divisor - 1]).
- */
- static const unsigned char log2_table[] = {
- 0, 1, 0, 2, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 4,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 5,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7
- };
+
+ /* Rescale (factor powers of 2 out of the numerator and denominator). */
+ shift = ffs(size) - 1;
+ diff >>= shift;
+ size >>= shift;
- if (size <= 128)
- regind = (diff >> log2_table[size - 1]);
- else if (size <= 32768)
- regind = diff >> (8 + log2_table[(size >> 8) - 1]);
- else
- regind = diff / size;
- } else if (size < qspace_max) {
+ if (size == 1) {
+ /* The divisor was a power of 2. */
+ regind = diff;
+ } else {
/*
* To divide by a number D that is not a power of two we
* multiply by (2^21 / D) and then right shift by 21 positions.
@@ -2461,78 +2446,32 @@
*
* becomes
*
- * (X * qsize_invs[(D >> QUANTUM_2POW) - 3])
- * >> SIZE_INV_SHIFT
+ * (X * size_invs[D - 3]) >> SIZE_INV_SHIFT
*
* We can omit the first three elements, because we never
- * divide by 0, and QUANTUM and 2*QUANTUM are both powers of
- * two, which are handled above.
+ * divide by 0, and 1 and 2 are both powers of two, which are
+ * handled above.
*/
#define SIZE_INV_SHIFT 21
-#define QSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << QUANTUM_2POW)) + 1)
- static const unsigned qsize_invs[] = {
- QSIZE_INV(3),
- QSIZE_INV(4), QSIZE_INV(5), QSIZE_INV(6), QSIZE_INV(7)
-#if (QUANTUM_2POW < 4)
- ,
- QSIZE_INV(8), QSIZE_INV(9), QSIZE_INV(10), QSIZE_INV(11),
- QSIZE_INV(12),QSIZE_INV(13), QSIZE_INV(14), QSIZE_INV(15)
-#endif
+#define SIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s)) + 1)
+ static const unsigned size_invs[] = {
+ SIZE_INV(3),
+ SIZE_INV(4), SIZE_INV(5), SIZE_INV(6), SIZE_INV(7),
+ SIZE_INV(8), SIZE_INV(9), SIZE_INV(10), SIZE_INV(11),
+ SIZE_INV(12), SIZE_INV(13), SIZE_INV(14), SIZE_INV(15),
+ SIZE_INV(16), SIZE_INV(17), SIZE_INV(18), SIZE_INV(19),
+ SIZE_INV(20), SIZE_INV(21), SIZE_INV(22), SIZE_INV(23),
+ SIZE_INV(24), SIZE_INV(25), SIZE_INV(26), SIZE_INV(27),
+ SIZE_INV(28), SIZE_INV(29), SIZE_INV(30), SIZE_INV(31)
};
- assert(QUANTUM * (((sizeof(qsize_invs)) / sizeof(unsigned)) + 3)
- >= (1U << QSPACE_MAX_2POW_DEFAULT));
- if (size <= (((sizeof(qsize_invs) / sizeof(unsigned)) + 2) <<
- QUANTUM_2POW)) {
- regind = qsize_invs[(size >> QUANTUM_2POW) - 3] * diff;
- regind >>= SIZE_INV_SHIFT;
- } else
+ if (size <= ((sizeof(size_invs) / sizeof(unsigned)) + 2))
+ regind = (diff * size_invs[size - 3]) >> SIZE_INV_SHIFT;
+ else
regind = diff / size;
-#undef QSIZE_INV
- } else if (size < cspace_max) {
-#define CSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << CACHELINE_2POW)) + 1)
- static const unsigned csize_invs[] = {
- CSIZE_INV(3),
- CSIZE_INV(4), CSIZE_INV(5), CSIZE_INV(6), CSIZE_INV(7)
- };
- assert(CACHELINE * (((sizeof(csize_invs)) / sizeof(unsigned)) +
- 3) >= (1U << CSPACE_MAX_2POW_DEFAULT));
-
- if (size <= (((sizeof(csize_invs) / sizeof(unsigned)) + 2) <<
- CACHELINE_2POW)) {
- regind = csize_invs[(size >> CACHELINE_2POW) - 3] *
- diff;
- regind >>= SIZE_INV_SHIFT;
- } else
- regind = diff / size;
-#undef CSIZE_INV
- } else {
-#define SSIZE_INV(s) (((1U << SIZE_INV_SHIFT) / (s << SUBPAGE_2POW)) + 1)
- static const unsigned ssize_invs[] = {
- SSIZE_INV(3),
- SSIZE_INV(4), SSIZE_INV(5), SSIZE_INV(6), SSIZE_INV(7),
- SSIZE_INV(8), SSIZE_INV(9), SSIZE_INV(10), SSIZE_INV(11),
- SSIZE_INV(12), SSIZE_INV(13), SSIZE_INV(14), SSIZE_INV(15)
-#if (PAGE_SHIFT == 13)
- ,
- SSIZE_INV(16), SSIZE_INV(17), SSIZE_INV(18), SSIZE_INV(19),
- SSIZE_INV(20), SSIZE_INV(21), SSIZE_INV(22), SSIZE_INV(23),
- SSIZE_INV(24), SSIZE_INV(25), SSIZE_INV(26), SSIZE_INV(27),
- SSIZE_INV(28), SSIZE_INV(29), SSIZE_INV(29), SSIZE_INV(30)
-#endif
- };
- assert(SUBPAGE * (((sizeof(ssize_invs)) / sizeof(unsigned)) + 3)
- >= PAGE_SIZE);
-
- if (size < (((sizeof(ssize_invs) / sizeof(unsigned)) + 2) <<
- SUBPAGE_2POW)) {
- regind = ssize_invs[(size >> SUBPAGE_2POW) - 3] * diff;
- regind >>= SIZE_INV_SHIFT;
- } else
- regind = diff / size;
-#undef SSIZE_INV
+#undef SIZE_INV
+#undef SIZE_INV_SHIFT
}
-#undef SIZE_INV_SHIFT
assert(diff == regind * size);
assert(regind < bin->nregs);
@@ -5340,6 +5279,7 @@
size = 1;
else {
result = NULL;
+ *memptr = NULL;
ret = 0;
goto RETURN;
}
==== //depot/projects/scottl-camlock/src/lib/libkvm/kvm_proc.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.101 2009/09/08 19:37:59 brooks Exp $");
+__FBSDID("$FreeBSD: src/lib/libkvm/kvm_proc.c,v 1.102 2009/12/10 21:16:16 brooks Exp $");
/*
* Proc traversal interface for kvm. ps and w are (probably) the exclusive
@@ -149,7 +149,7 @@
if (ucred.cr_ngroups > KI_NGROUPS) {
kp->ki_ngroups = KI_NGROUPS;
kp->ki_cr_flags |= KI_CRF_GRP_OVERFLOW;
- }
+ } else
kp->ki_ngroups = ucred.cr_ngroups;
kvm_read(kd, (u_long)ucred.cr_groups, kp->ki_groups,
kp->ki_ngroups * sizeof(gid_t));
==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/PICOBSD#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.25 2009/11/08 08:59:40 luigi Exp $
+# $FreeBSD: src/release/picobsd/bridge/PICOBSD,v 1.26 2009/12/09 17:42:14 luigi Exp $
#
# Line starting with #PicoBSD contains PicoBSD build parameters
#marker def_sz init MFS_inodes floppy_inodes
@@ -46,7 +46,7 @@
# Support for bridging and bandwidth limiting
options DUMMYNET
device if_bridge
-options HZ=1000
+#options HZ=1000
device random # used by ssh
device pci
==== //depot/projects/scottl-camlock/src/release/picobsd/bridge/crunch.conf#4 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.27 2009/09/12 15:50:08 luigi Exp $
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.28 2009/12/09 17:41:47 luigi Exp $
#
# Configuration file for "bridge" images..
#
@@ -98,13 +98,15 @@
progs test
ln test [
+progs less
+ln less more
progs mount
progs minigzip
ln minigzip gzip
progs kill
progs df
progs ps
-progs ns # this is the
+progs ns # this is the picobsd version
ln ns netstat
progs vm
progs hostname
@@ -179,3 +181,4 @@
libs_so -lbsdxml
libs_so -lsbuf
libs_so -ljail # used by ifconfig
+libs_so -lulog # used by ifconfig
==== //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $FreeBSD: src/release/picobsd/build/picobsd,v 1.50 2009/06/22 16:06:38 luigi Exp $
+# $FreeBSD: src/release/picobsd/build/picobsd,v 1.51 2009/12/09 17:48:05 luigi Exp $
# This file requires sysutils/makefs to run
#
# The PicoBSD build script. Invoked as
@@ -167,7 +167,7 @@
local no
log "create_includes_and_libraries2() for ${SRC}"
if [ ${OSVERSION} -ge 600000 ] ; then
- no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R"
+ no="-DNO_CLEAN -DNO_PROFILE -DNO_GAMES -DNO_LIBC_R" # WITOUT_CDDL=1"
else
no="-DNOCLEAN -DNOPROFILE -DNOGAMES -DNOLIBC_R"
fi
@@ -587,8 +587,9 @@
local i
u_progs="`find_progs_helper $*`"
local o=${o_objdir:-${_SHLIBDIRPREFIX}}
+ log "looking for libs for $u_progs in $_SHLIBDIRPREFIX"
[ -z "${u_progs}" ] && return 1 # not found, error
- i="`ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`"
+ i="`LD_LIBRARY_PATH=$o/lib ldd ${u_progs} | grep -v '^/' | awk '{print $1}' | sort | uniq`"
u_libs="`find_progs_helper $i`"
return 0
}
@@ -719,8 +720,7 @@
(cd ${dst}; chown -R root . )
fi
- # If we are building a shared 'crunch', take the libraries
- # and the dynamic loader as well
+ log "for a shared 'crunch' take libraries and dynamic loader as well"
find_progs ${dst}/stand/crunch
if [ -n "${u_libs}" ] ; then
mkdir -p ${dst}/lib && cp -p ${u_libs} ${dst}/lib
==== //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/geom_mirror.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.18 2009/09/06 06:52:06 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/mirror/geom_mirror.c,v 1.19 2009/12/08 22:43:29 mav Exp $");
#include <sys/param.h>
#include <errno.h>
@@ -44,7 +44,7 @@
uint32_t lib_version = G_LIB_VERSION;
uint32_t version = G_MIRROR_VERSION;
-static char label_balance[] = "split", configure_balance[] = "none";
+static char label_balance[] = "load", configure_balance[] = "none";
static intmax_t label_slice = 4096, configure_slice = -1;
static intmax_t insert_priority = 0, configure_priority = -1;
==== //depot/projects/scottl-camlock/src/sbin/geom/class/mirror/gmirror.8#4 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.25 2009/09/09 19:06:01 pjd Exp $
+.\" $FreeBSD: src/sbin/geom/class/mirror/gmirror.8,v 1.26 2009/12/09 11:00:00 ru Exp $
.\"
-.Dd August 1, 2009
+.Dd December 8, 2009
.Dt GMIRROR 8
.Os
.Sh NAME
@@ -135,6 +135,7 @@
.Bl -tag -width ".Cm round-robin"
.It Cm load
Read from the component with the lowest load.
+This is the default balance algorithm.
.It Cm prefer
Read from the component with the biggest priority.
.It Cm round-robin
@@ -142,7 +143,6 @@
.It Cm split
Split read requests, which are bigger than or equal to slice size on N pieces,
where N is the number of active components.
-This is the default balance algorithm.
.El
.It Fl F
Do not synchronize after a power failure or system crash.
==== //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-src.dot,v 1.100 2009/10/17 00:33:55 neel Exp $
+# $FreeBSD: src/share/misc/committers-src.dot,v 1.103 2009/12/10 14:41:47 kib Exp $
# This file is meant to list all FreeBSD src committers and describe the
# mentor-mentee relationships between them.
@@ -94,6 +94,7 @@
flz [label="Florent Thoumie\nflz at FreeBSD.org\n2006/03/30"]
gad [label="Garance A. Drosehn\ngad at FreeBSD.org\n2000/10/27"]
gallatin [label="Andrew Gallatin\ngallatin at FreeBSD.org\n????/??/??"]
+gavin [label="Gavin Atkinson\ngavin at FreeBSD.org\n2009/12/07"]
gibbs [label="Justin T. Gibbs\ngibbs at FreeBSD.org\n????/??/??"]
glebius [label="Gleb Smirnoff\nglebius at FreeBSD.org\n2004/07/14"]
gnn [label="George V. Neville-Neil\ngnn at FreeBSD.org\n2004/10/11"]
@@ -122,6 +123,7 @@
kaiw [label="Kai Wang\nkaiw at FreeBSD.org\n2007/09/26"]
kensmith [label="Ken Smith\nkensmith at FreeBSD.org\n2004/01/23"]
kevlo [label="Kevin Lo\nkevlo at FreeBSD.org\n2006/07/23"]
+kib [label="Konstantin Belousov\nkib at FreeBSD.org\n2006/06/03"]
kmacy [label="Kip Macy\nkmacy at FreeBSD.org\n2005/06/01"]
le [label="Lukas Ertl\nle at FreeBSD.org\n2004/02/02"]
linimon [label="Mark Linimon\nlinimon at FreeBSD.org\n2006/09/30"]
@@ -254,7 +256,9 @@
dwmalone -> peadar
dwmalone -> snb
+ed -> gavin
ed -> jilles
+ed -> rdivacky
eivind -> des
eivind -> rwatson
@@ -345,7 +349,14 @@
julian -> adrian
julian -> zec
+kan -> kib
+
+kib -> dchagin
kib -> lulf
+kib -> pho
+kib -> rdivacky
+kib -> rmacklem
+kib -> stas
kmacy -> lstewart
@@ -384,9 +395,11 @@
peter -> jayanth
peter -> ps
+philip -> ed
philip -> jls
philip -> matteo
+pjd -> kib
pjd -> lulf
rgrimes -> markm
@@ -413,6 +426,7 @@
rwatson -> kensmith
rwatson -> kmacy
rwatson -> linimon
+rwatson -> rmacklem
rwatson -> shafeeq
rwatson -> tmm
rwatson -> trasz
==== //depot/projects/scottl-camlock/src/share/termcap/termcap.src#4 (text+ko) ====
@@ -30,7 +30,7 @@
# SUCH DAMAGE.
#
# @(#)termcap.src 8.2 (Berkeley) 11/17/93
-# $FreeBSD: src/share/termcap/termcap.src,v 1.156 2009/06/14 07:02:50 edwin Exp $
+# $FreeBSD: src/share/termcap/termcap.src,v 1.157 2009/12/10 22:25:53 ed Exp $
# Termcap source file
# John Kunze, Berkeley
@@ -2784,48 +2784,46 @@
:ts=\E_:fs=\E\\:ds=\E_\E\\:tc=screen:
SW|screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols:\
:co#132:tc=screen:
-# $Xorg: termcap,v 1.3 2000/08/17 19:55:10 cpqbld Exp $
+# $XTermId: termcap,v 1.78 2009/11/09 00:24:26 tom Exp $
#
# Note:
# termcap format is limited to 1023 characters. This set of descriptions
# is a subset of the terminfo, since not all features can be fit into
# that limit. The 'xterm' description supports color. The monochrome
-# 'xtermm' drops color in favor of additional function keys. If you need
-# both, use terminfo.
+# 'xterm-mono' drops color in favor of additional function keys. If you
+# need both, use terminfo.
#
# The 1023-character limit applies to each entry after resolving the
# "tc=" strings. Some implementations may discount all or part of the
# formatting characters in the entry (i.e., the backslash newline tab
# colon). GNU termcap does not have this limit.
#
-# I checked the limits using ncurses "captoinfo -CrTv", which prints
+# I checked the limits using ncurses "captoinfo -CrTUvx", which prints
# the resolved length of each entry in a comment at the end - T.Dickey
#
-# $XFree86: xc/programs/xterm/termcap,v 3.28 2001/01/17 23:46:39 dawes Exp $
-#
-xterm-xfree86|XFree86 xterm:\
- :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:\
- :k5=\E[15~:k6=\E[17~:k7=\E[18~:k8=\E[19~:\
- :k9=\E[20~:k;=\E[21~:F1=\E[23~:F2=\E[24~:\
- :@7=\EOF:@8=\EOM:kI=\E[2~:\
- :kh=\EOH:kP=\E[5~:kN=\E[6~:\
- :ku=\EOA:kd=\EOB:kr=\EOC:kl=\EOD:Km=\E[M:tc=xterm-basic:
+xterm-new|modern xterm:\
+ :*6=\EOF:@7=\EOF:F1=\E[23~:F2=\E[24~:K2=\EOE:Km=\E[M:\
+ :k1=\EOP:k2=\EOQ:k3=\EOR:k4=\EOS:k5=\E[15~:k6=\E[17~:\
+ :k7=\E[18~:k8=\E[19~:k9=\E[20~:k;=\E[21~:kH=\EOF:kI=\E[2~:\
+ :kN=\E[6~:kP=\E[5~:kd=\EOB:kh=\EOH:kl=\EOD:kr=\EOC:ku=\EOA:\
+ :tc=xterm-basic:
#
# This chunk is used for building the VT220/Sun/PC keyboard variants.
-xterm-basic|xterm common (XFree86):\
- :li#24:co#80:am:kn#12:km:mi:ms:xn:AX:bl=^G:\
- :is=\E[!p\E[?3;4l\E[4l\E>:rs=\E[!p\E[?3;4l\E[4l\E>:le=^H:\
- :AL=\E[%dL:DL=\E[%dM:DC=\E[%dP:al=\E[L:dc=\E[P:dl=\E[M:\
- :UP=\E[%dA:DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:\
- :ho=\E[H:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:\
- :im=\E[4h:ei=\E[4l:ks=\E[?1h\E=:ke=\E[?1l\E>:kD=\E[3~:kb=^H:\
- :sf=\n:sr=\EM:st=\EH:ct=\E[3g:sc=\E7:rc=\E8:\
- :eA=\E(B\E)0:as=\E(0:ae=\E(B:ml=\El:mu=\Em:up=\E[A:nd=\E[C:\
- :md=\E[1m:me=\E[m:mr=\E[7m:so=\E[7m:se=\E[27m:us=\E[4m:ue=\E[24m:\
- :ti=\E[?1049h:te=\E[?1049l:vi=\E[?25l:ve=\E[?25h:\
- :ut:Co#8:pa#64:op=\E[39;49m:AB=\E[4%dm:AF=\E[3%dm:
+xterm-basic|modern xterm common:\
+ :am:bs:km:mi:ms:ut:xn:AX:\
+ :Co#8:co#80:kn#12:li#24:pa#64:\
+ :AB=\E[4%dm:AF=\E[3%dm:AL=\E[%dL:DC=\E[%dP:DL=\E[%dM:\
+ :DO=\E[%dB:LE=\E[%dD:RI=\E[%dC:UP=\E[%dA:ae=\E(B:al=\E[L:\
+ :as=\E(0:bl=^G:cd=\E[J:ce=\E[K:cl=\E[H\E[2J:\
+ :cm=\E[%i%d;%dH:cs=\E[%i%d;%dr:ct=\E[3g:dc=\E[P:dl=\E[M:\
+ :ei=\E[4l:ho=\E[H:im=\E[4h:is=\E[!p\E[?3;4l\E[4l\E>:\
+ :kD=\E[3~:kb=^H:ke=\E[?1l\E>:ks=\E[?1h\E=:le=^H:md=\E[1m:\
+ :me=\E[m:ml=\El:mr=\E[7m:mu=\Em:nd=\E[C:op=\E[39;49m:\
+ :rc=\E8:rs=\E[!p\E[?3;4l\E[4l\E>:sc=\E7:se=\E[27m:sf=^J:\
+ :so=\E[7m:sr=\EM:st=\EH:te=\E[?1049l:ti=\E[?1049h:\
+ :ue=\E[24m:up=\E[A:us=\E[4m:ve=\E[?12l\E[?25h:vi=\E[?25l:vs=\E[?12;25h:
-# The xterm-xfree86 description has all of the features, but is not completely
+# The xterm-new description has all of the features, but is not completely
# compatible with vt220. If you are using a Sun or PC keyboard, set the
# sunKeyboard resource to true:
# + maps the editing keypad
@@ -2835,68 +2833,91 @@
# + uses DEC-style control sequences for the application keypad.
#
xterm-vt220|xterm emulating vt220:\
- :kH=\E[4~::@7=\E[4~:*6=\E[4~:kh=\E[1~:Km=\E[M:tc=xterm-basic:
+ :*6=\E[4~:@7=\E[4~:K2=\EOu:Km=\E[M:kH=\E[4~:kh=\E[1~:\
+ :tc=xterm-basic:
xterm-24|xterms|vs100|24x80 xterm:\
- :li#24:\
- :tc=xterm:
+ :li#24:tc=xterm-old:
xterm-65|65x80 xterm:\
- :li#65:tc=xterm:
+ :li#65:tc=xterm-old:
xterm-bold|xterm with bold for underline:\
- :so=\E[7m:us=\E[1m:tc=xterm:
+ :so=\E[7m:us=\E[1m:tc=xterm-old:
xterm-boldso|xterm with bold for standout:\
- :se=\E[m:so=\E[1m:tc=xterm:
+ :se=\E[m:so=\E[1m:tc=xterm-old:
xterm-mono|monochrome xterm:\
- :kn#20:\
- :st@:ut@:Co@:NC@:op@:AB@:AF@:pa@:Sf@:Sb@:tc=xterm:
+ :ut@:\
+ :Co@:NC@:kn#20:pa@:\
+ :AB@:AF@:Sb@:Sf@:op@:st@:tc=xterm-old:
#
# Alternate terminal description that "works" for interactive shells such as
# tcsh and bash.
xterm-noapp|xterm with cursor keys in normal mode:\
- :kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:ks=\E=:ke=\E>:ti@:te@:tc=xterm:
+ :kd=\E[B:ke=\E>:kl=\E[D:kr=\E[C:ks=\E=:ku=\E[A:te@:ti@:\
+ :tc=xterm:
+#
+# This should work for the commonly used "color xterm" variations (XFree86
+# xterm, color_xterm, nxterm, rxvt). Note that it does not set 'bce', so for
+# XFree86 and rxvt, some applications that use colors will be less efficient,
+# and in a few special cases (with "smart" optimization) the wrong color will
+# be painted in spots.
+xterm-color|generic "ANSI" color xterm:\
+ :Co#8:NC@:pa#64:\
+ :AB=\E[4%dm:AF=\E[3%dm:ac=:op=\E[m:tc=xterm-r6:
#
# These aliases are for compatibility with the terminfo; termcap cannot provide
-# the extra features, but termcap applications still want the names.
-xterm-16color|xterm alias 1:tc=xterm-xfree86:
-xterm-88color|xterm alias 2:tc=xterm-256color:
-xterm-256color|xterm alias 3:tc=xterm-xfree86:
-xterm-nrc|xterm alias 4:tc=xterm:
-xterm-rep|xterm alias 5:tc=xterm:
-xterm-xmc|xterm alias 6:sg#1:tc=xterm:
+# the extra features such as color initialization, but termcap applications
+# still want the names.
+xterm-16color|xterm alias 1:\
+ :tc=xterm-new:
+
+xterm-88color|xterm alias 2:\
+ :Co#88:pa#7744:tc=xterm-256color:
+
+xterm-256color|xterm alias 3:\
+ :Co#256:pa#32767:\
+ :AB=\E[48;5;%dm:AF=\E[38;5;%dm:tc=xterm-new:
+
+xterm-nrc|xterm alias 4:\
+ :tc=xterm:
+xterm-rep|xterm alias 5:\
+ :tc=xterm:
+xterm-xmc|xterm alias 6:\
+ :sg#1:tc=xterm:
#
# An 8-bit description is doable with termcap, but there are probably no
# termcap (or BSD curses) applications that are able to use it.
xterm-8bit|xterm terminal emulator 8-bit controls (X Window System):\
- :co#80:li#24:\
- :it#8:am:km:mi:ms:xn:\
- :AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:LE=\233%dD:\
- :RI=\233%dC:UP=\233%dA:ae=^O:al=\233L:as=^N:bl=^G:bt=\233Z:\
- :cd=\233J:ce=\233K:cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:\
- :cs=\233%i%d;%dr:ct=\2333g:dc=\233P:dl=\233M:do=^J:up=\233A:nd=\233C:\
- :ei=\2334l:ho=\233H:im=\2334h:\
+ :am:km:mi:ms:xn:\
+ :co#80:it#8:li#24:\
+ :AL=\233%dL:DC=\233%dP:DL=\233%dM:DO=\233%dB:IC=\233%d@:\
+ :K2=\217y:Km=\233M:LE=\233%dD:RI=\233%dC:UP=\233%dA:\
+ :ae=\E(B:al=\233L:as=\E(0:bl=^G:bt=\233Z:cd=\233J:ce=\233K:\
+ :cl=\233H\2332J:cm=\233%i%d;%dH:cr=^M:cs=\233%i%d;%dr:\
+ :ct=\2333g:dc=\233P:dl=\233M:do=^J:ei=\2334l:ho=\233H:\
+ :im=\2334h:\
:is=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8:\
:k1=\23311~:k2=\23312~:k3=\23313~:k4=\23314~:k5=\23315~:\
:k6=\23317~:k7=\23318~:k8=\23319~:k9=\23320~:kD=\2333~:\
:kI=\2332~:kN=\2336~:kP=\2335~:kb=^H:kd=\217B:\
:ke=\233?1l\E>:kh=\2331~:kl=\217D:kr=\217C:ks=\233?1h\E=:\
- :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m^O:mr=\2337m:\
- :rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\
- :st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:us=\2334m:\
- :vb=\233?5h\233?5l:ve=\233?25h:vi=\233?25l:Km=\233M:
+ :ku=\217A:le=^H:mb=\2335m:md=\2331m:me=\233m:mr=\2337m:\
+ :nd=\233C:rc=\E8:sc=\E7:se=\23327m:sf=^J:so=\2337m:sr=\215:\
+ :st=\210:ta=^I:te=\233?1049l:ti=\233?1049h:ue=\23324m:\
+ :up=\233A:us=\2334m:vb=\233?5h\233?5l:ve=\233?25l\233?25h:\
+ :vs=\233?12;25h:vi=\233?25l:
#
-xterm-hp|XFree86 xterm with hpterm function keys:\
- :k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:k8=\Ew:\
- :kC=\EJ:kD=\EP:@7=\EF:kI=\EQ:kN=\ES:kP=\ET:kh=\Eh:\
- :kd=\EB:kl=\ED:kr=\EC:ku=\EA:tc=xterm-basic:
+xterm-hp|xterm with hpterm function keys:\
+ :@7=\EF:k1=\Ep:k2=\Eq:k3=\Er:k4=\Es:k5=\Et:k6=\Eu:k7=\Ev:\
+ :k8=\Ew:kC=\EJ:kD=\EP:kI=\EQ:kN=\ES:kP=\ET:kd=\EB:kh=\Eh:\
+ :kl=\ED:kr=\EC:ku=\EA:tc=xterm-basic:
#
-xterm-sco|XFree86 xterm with SCO function keys:\
- :kl=\E[D:kd=\E[B:kr=\E[C:ku=\E[A:@7=\E[F:\
- :k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\
- :k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:\
- :F1=\E[W:F2=\E[X:F3=\E[Y:F5=\E[a:F6=\E[b:\
- :F7=\E[c:F8=\E[d:F9=\E[e:FA=\E[f:FB=\E[g:\
- :FC=\E[h:FD=\E[i:FE=\E[j:FF=\E[k:\
- :kh=\E[H:kI=\E[L:kN=\E[G:kP=\E[I:ac@:tc=xterm-basic:
+xterm-sco|xterm with SCO function keys:\
+ :@7=\E[F:F1=\E[W:F2=\E[X:F3=\E[Y:F5=\E[a:F6=\E[b:F7=\E[c:\
+ :F8=\E[d:F9=\E[e:FA=\E[f:FB=\E[g:FC=\E[h:FD=\E[i:FE=\E[j:\
+ :FF=\E[k:ac=:k1=\E[M:k2=\E[N:k3=\E[O:k4=\E[P:k5=\E[Q:\
+ :k6=\E[R:k7=\E[S:k8=\E[T:k9=\E[U:k;=\E[V:kD=\177:kI=\E[L:\
+ :kN=\E[G:kP=\E[I:kd=\E[B:kh=\E[H:kl=\E[D:kr=\E[C:ku=\E[A:\
+ :tc=xterm-basic:
#
xterm-vt52|xterm emulating vt52:\
:bs:\
@@ -2906,63 +2927,65 @@
:le=\ED:nd=\EC:nw=^M^J:sf=^J:sr=\EI:ta=^I:up=\EA:
#
xterm-sun|xterm with Sun functionkeys:\
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list