PERFORCE change 127546 for review
Kip Macy
kmacy at FreeBSD.org
Sun Oct 14 21:54:16 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127546
Change 127546 by kmacy at kmacy_home:ethng on 2007/10/15 04:53:16
IFC 127524
Affected files ...
.. //depot/projects/ethng/src/etc/Makefile#2 integrate
.. //depot/projects/ethng/src/etc/defaults/rc.conf#5 integrate
.. //depot/projects/ethng/src/etc/rc.d/Makefile#5 integrate
.. //depot/projects/ethng/src/etc/rc.d/sensorsd#1 branch
.. //depot/projects/ethng/src/etc/sensorsd.conf#1 branch
.. //depot/projects/ethng/src/gnu/lib/csu/Makefile#3 integrate
.. //depot/projects/ethng/src/include/_ctype.h#2 integrate
.. //depot/projects/ethng/src/include/ctype.h#2 integrate
.. //depot/projects/ethng/src/include/wctype.h#2 integrate
.. //depot/projects/ethng/src/lib/libc/arm/string/ffs.S#2 integrate
.. //depot/projects/ethng/src/lib/libc/arm/string/memcpy.S#2 integrate
.. //depot/projects/ethng/src/lib/libc/arm/string/memset.S#2 integrate
.. //depot/projects/ethng/src/lib/libc/gdtoa/Symbol.map#2 integrate
.. //depot/projects/ethng/src/lib/libc/gen/sysctl.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/Symbol.map#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/big5.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/euc.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/gb18030.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/gb2312.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/gbk.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/isctype.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/iswctype.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/mskanji.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/none.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/setrunelocale.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/locale/utf8.c#2 integrate
.. //depot/projects/ethng/src/lib/libutil/pidfile.3#3 integrate
.. //depot/projects/ethng/src/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/ethng/src/sbin/mount_unionfs/mount_unionfs.8#2 integrate
.. //depot/projects/ethng/src/sbin/sysctl/sysctl.8#3 integrate
.. //depot/projects/ethng/src/sbin/sysctl/sysctl.c#2 integrate
.. //depot/projects/ethng/src/share/man/man4/Makefile#4 integrate
.. //depot/projects/ethng/src/share/man/man4/coretemp.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/hwpmc.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/it.4#1 branch
.. //depot/projects/ethng/src/share/man/man4/lm.4#1 branch
.. //depot/projects/ethng/src/share/man/man5/fstab.5#2 integrate
.. //depot/projects/ethng/src/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/ethng/src/share/man/man9/Makefile#4 integrate
.. //depot/projects/ethng/src/share/man/man9/sensor_attach.9#1 branch
.. //depot/projects/ethng/src/share/mklocale/UTF-8.src#2 integrate
.. //depot/projects/ethng/src/sys/amd64/conf/GENERIC.hints#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/bcopy_page.S#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/bcopyinout.S#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/in_cksum_arm.S#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/support.S#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/swtch.S#3 integrate
.. //depot/projects/ethng/src/sys/arm/include/asm.h#2 integrate
.. //depot/projects/ethng/src/sys/conf/files#6 integrate
.. //depot/projects/ethng/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/ethng/src/sys/conf/files.i386#3 integrate
.. //depot/projects/ethng/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/coretemp/coretemp.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/it/it.c#1 branch
.. //depot/projects/ethng/src/sys/dev/it/itvar.h#1 branch
.. //depot/projects/ethng/src/sys/dev/lm/lm78.c#1 branch
.. //depot/projects/ethng/src/sys/dev/lm/lm78_isa.c#1 branch
.. //depot/projects/ethng/src/sys/dev/lm/lm78var.h#1 branch
.. //depot/projects/ethng/src/sys/dev/puc/puc_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/ethng/src/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/unionfs/union_vfsops.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_sensors.c#1 branch
.. //depot/projects/ethng/src/sys/libkern/arm/ffs.S#2 integrate
.. //depot/projects/ethng/src/sys/modules/Makefile#4 integrate
.. //depot/projects/ethng/src/sys/modules/it/Makefile#1 branch
.. //depot/projects/ethng/src/sys/modules/lm/Makefile#1 branch
.. //depot/projects/ethng/src/sys/netgraph/ng_pppoe.c#3 integrate
.. //depot/projects/ethng/src/sys/sys/sensors.h#1 branch
.. //depot/projects/ethng/src/sys/sys/sysctl.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/systm.h#3 integrate
.. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.birthday#2 integrate
.. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#3 integrate
.. //depot/projects/ethng/src/usr.bin/id/id.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/systat/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.bin/systat/cmdtab.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/systat/extern.h#2 integrate
.. //depot/projects/ethng/src/usr.bin/systat/sensors.c#1 branch
.. //depot/projects/ethng/src/usr.bin/systat/systat.1#2 integrate
.. //depot/projects/ethng/src/usr.sbin/Makefile#5 integrate
.. //depot/projects/ethng/src/usr.sbin/sensorsd/Makefile#1 branch
.. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.8#1 branch
.. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.c#1 branch
.. //depot/projects/ethng/src/usr.sbin/sensorsd/sensorsd.conf.5#1 branch
Differences ...
==== //depot/projects/ethng/src/etc/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.360 2007/07/13 14:28:10 imp Exp $
+# $FreeBSD: src/etc/Makefile,v 1.361 2007/10/14 10:45:28 netchild Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
portsnap.conf pf.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
- rc.subr remote rpc services shells \
+ rc.subr remote rpc sensorsd.conf services shells \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
==== //depot/projects/ethng/src/etc/defaults/rc.conf#5 (text+ko) ====
@@ -15,7 +15,7 @@
# For a more detailed explanation of all the rc.conf variables, please
# refer to the rc.conf(5) manual page.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.319 2007/10/12 16:35:36 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.320 2007/10/14 10:45:28 netchild Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -40,6 +40,8 @@
kldxref_module_path="" # Override kern.module_path. A ';'-delimited list.
powerd_enable="NO" # Run powerd to lower our power usage.
powerd_flags="" # Flags to powerd (if enabled).
+sensorsd_enable="NO" # Run sensorsd to monitor and log sensor state changes
+sensorsd_flags="" # additional flags for sensorsd(8)
tmpmfs="AUTO" # Set to YES to always create an mfs /tmp, NO to never
tmpsize="20m" # Size of mfs /tmp if created
tmpmfs_flags="-S" # Extra mdmfs options for the mfs /tmp
==== //depot/projects/ethng/src/etc/rc.d/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.85 2007/10/14 10:45:28 netchild Exp $
.include <bsd.own.mk>
@@ -33,7 +33,7 @@
random rarpd resolv root \
route6d routed routing rpcbind rtadvd rwho \
savecore sdpd securelevel sendmail \
- serial sppp statd swap1 \
+ sensorsd serial sppp statd swap1 \
syscons sysctl syslogd \
timed tmp \
ugidfw \
==== //depot/projects/ethng/src/gnu/lib/csu/Makefile#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.26 2007/10/12 18:14:41 obrien Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.27 2007/10/13 05:50:43 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
GCCLIB= ${.CURDIR}/../../../contrib/gcclibs
@@ -35,8 +35,8 @@
TGTOBJS= crtfastmath.o
SRCS+= crtfastmath.c
.endif
-BEGINSRC?= ${SRCS:M*.c}
-ENDSRC?= ${SRCS:M*.c}
+BEGINSRC?= crtstuff.c
+ENDSRC?= crtstuff.c
all: ${OBJS} ${SOBJS} ${TGTOBJS}
${OBJS} ${SOBJS}: ${SRCS:M*.h}
==== //depot/projects/ethng/src/include/_ctype.h#2 (text+ko) ====
@@ -40,7 +40,7 @@
*
* From @(#)ctype.h 8.4 (Berkeley) 1/21/94
* From FreeBSD: src/include/ctype.h,v 1.27 2004/06/23 07:11:39 tjr Exp
- * $FreeBSD: src/include/_ctype.h,v 1.30 2004/08/21 07:00:40 tjr Exp $
+ * $FreeBSD: src/include/_ctype.h,v 1.31 2007/10/13 16:28:21 ache Exp $
*/
#ifndef __CTYPE_H_
@@ -87,6 +87,8 @@
#define __inline
#endif
+extern int __mb_sb_limit;
+
/*
* Use inline functions if we are allowed to and the compiler supports them.
*/
@@ -103,15 +105,28 @@
}
static __inline int
+__sbmaskrune(__ct_rune_t _c, unsigned long _f)
+{
+ return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
+ _CurrentRuneLocale->__runetype[_c] & _f;
+}
+
+static __inline int
__istype(__ct_rune_t _c, unsigned long _f)
{
return (!!__maskrune(_c, _f));
}
static __inline int
+__sbistype(__ct_rune_t _c, unsigned long _f)
+{
+ return (!!__sbmaskrune(_c, _f));
+}
+
+static __inline int
__isctype(__ct_rune_t _c, unsigned long _f)
{
- return (_c < 0 || _c >= _CACHED_RUNES) ? 0 :
+ return (_c < 0 || _c >= __mb_sb_limit) ? 0 :
!!(_DefaultRuneLocale.__runetype[_c] & _f);
}
@@ -123,12 +138,26 @@
}
static __inline __ct_rune_t
+__sbtoupper(__ct_rune_t _c)
+{
+ return (_c < 0 || _c >= __mb_sb_limit) ? _c :
+ _CurrentRuneLocale->__mapupper[_c];
+}
+
+static __inline __ct_rune_t
__tolower(__ct_rune_t _c)
{
return (_c < 0 || _c >= _CACHED_RUNES) ? ___tolower(_c) :
_CurrentRuneLocale->__maplower[_c];
}
+static __inline __ct_rune_t
+__sbtolower(__ct_rune_t _c)
+{
+ return (_c < 0 || _c >= __mb_sb_limit) ? _c :
+ _CurrentRuneLocale->__maplower[_c];
+}
+
static __inline int
__wcwidth(__ct_rune_t _c)
{
@@ -146,10 +175,14 @@
__BEGIN_DECLS
int __maskrune(__ct_rune_t, unsigned long);
+int __sbmaskrune(__ct_rune_t, unsigned long);
int __istype(__ct_rune_t, unsigned long);
+int __sbistype(__ct_rune_t, unsigned long);
int __isctype(__ct_rune_t, unsigned long);
__ct_rune_t __toupper(__ct_rune_t);
+__ct_rune_t __sbtoupper(__ct_rune_t);
__ct_rune_t __tolower(__ct_rune_t);
+__ct_rune_t __sbtolower(__ct_rune_t);
int __wcwidth(__ct_rune_t);
__END_DECLS
#endif /* using inlines */
==== //depot/projects/ethng/src/include/ctype.h#2 (text+ko) ====
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
- * $FreeBSD: src/include/ctype.h,v 1.28 2004/08/12 09:33:47 tjr Exp $
+ * $FreeBSD: src/include/ctype.h,v 1.29 2007/10/13 16:28:21 ache Exp $
*/
#ifndef _CTYPE_H_
@@ -86,19 +86,19 @@
#endif
__END_DECLS
-#define isalnum(c) __istype((c), _CTYPE_A|_CTYPE_D)
-#define isalpha(c) __istype((c), _CTYPE_A)
-#define iscntrl(c) __istype((c), _CTYPE_C)
+#define isalnum(c) __sbistype((c), _CTYPE_A|_CTYPE_D)
+#define isalpha(c) __sbistype((c), _CTYPE_A)
+#define iscntrl(c) __sbistype((c), _CTYPE_C)
#define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */
-#define isgraph(c) __istype((c), _CTYPE_G)
-#define islower(c) __istype((c), _CTYPE_L)
-#define isprint(c) __istype((c), _CTYPE_R)
-#define ispunct(c) __istype((c), _CTYPE_P)
-#define isspace(c) __istype((c), _CTYPE_S)
-#define isupper(c) __istype((c), _CTYPE_U)
+#define isgraph(c) __sbistype((c), _CTYPE_G)
+#define islower(c) __sbistype((c), _CTYPE_L)
+#define isprint(c) __sbistype((c), _CTYPE_R)
+#define ispunct(c) __sbistype((c), _CTYPE_P)
+#define isspace(c) __sbistype((c), _CTYPE_S)
+#define isupper(c) __sbistype((c), _CTYPE_U)
#define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */
-#define tolower(c) __tolower(c)
-#define toupper(c) __toupper(c)
+#define tolower(c) __sbtolower(c)
+#define toupper(c) __sbtoupper(c)
#if __XSI_VISIBLE
/*
@@ -112,24 +112,24 @@
*
* XXX isascii() and toascii() should similarly be undocumented.
*/
-#define _tolower(c) __tolower(c)
-#define _toupper(c) __toupper(c)
+#define _tolower(c) __sbtolower(c)
+#define _toupper(c) __sbtoupper(c)
#define isascii(c) (((c) & ~0x7F) == 0)
#define toascii(c) ((c) & 0x7F)
#endif
#if __ISO_C_VISIBLE >= 1999
-#define isblank(c) __istype((c), _CTYPE_B)
+#define isblank(c) __sbistype((c), _CTYPE_B)
#endif
#if __BSD_VISIBLE
-#define digittoint(c) __maskrune((c), 0xFF)
-#define ishexnumber(c) __istype((c), _CTYPE_X)
-#define isideogram(c) __istype((c), _CTYPE_I)
-#define isnumber(c) __istype((c), _CTYPE_D)
-#define isphonogram(c) __istype((c), _CTYPE_Q)
-#define isrune(c) __istype((c), 0xFFFFFF00L)
-#define isspecial(c) __istype((c), _CTYPE_T)
+#define digittoint(c) __sbmaskrune((c), 0xFF)
+#define ishexnumber(c) __sbistype((c), _CTYPE_X)
+#define isideogram(c) __sbistype((c), _CTYPE_I)
+#define isnumber(c) __sbistype((c), _CTYPE_D)
+#define isphonogram(c) __sbistype((c), _CTYPE_Q)
+#define isrune(c) __sbistype((c), 0xFFFFFF00L)
+#define isspecial(c) __sbistype((c), _CTYPE_T)
#endif
#endif /* !_CTYPE_H_ */
==== //depot/projects/ethng/src/include/wctype.h#2 (text+ko) ====
@@ -25,7 +25,7 @@
*
* citrus Id: wctype.h,v 1.4 2000/12/21 01:50:21 itojun Exp
* $NetBSD: wctype.h,v 1.3 2000/12/22 14:16:16 itojun Exp $
- * $FreeBSD: src/include/wctype.h,v 1.13 2004/08/12 10:29:14 tjr Exp $
+ * $FreeBSD: src/include/wctype.h,v 1.15 2007/10/14 10:23:54 ache Exp $
*/
#ifndef _WCTYPE_H_
==== //depot/projects/ethng/src/lib/libc/arm/string/ffs.S#2 (text+ko) ====
@@ -30,7 +30,7 @@
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.3 2004/11/09 16:49:14 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/ffs.S,v 1.4 2007/10/13 12:06:31 cognet Exp $");
/*
* ffs - find first set bit, this algorithm isolates the first set
@@ -49,7 +49,7 @@
/* Standard trick to isolate bottom bit in r0 or 0 if r0 = 0 on entry */
rsb r1, r0, #0
ands r0, r0, r1
-#ifndef __XSCALE__
+#ifndef _ARM_ARCH_5
/*
* now r0 has at most one set bit, call this X
* if X = 0, all further instructions are skipped
==== //depot/projects/ethng/src/lib/libc/arm/string/memcpy.S#2 (text+ko) ====
@@ -1,8 +1,8 @@
/* $NetBSD: memcpy.S,v 1.4 2003/10/14 07:51:45 scw Exp $ */
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.1 2004/05/14 12:04:31 cognet Exp $");
-#if !defined(__XSCALE__) || defined(_STANDALONE)
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memcpy.S,v 1.2 2007/10/13 12:06:31 cognet Exp $");
+#if !defined(_ARM_ARCH_5E) || defined(_STANDALONE)
#include "memcpy_arm.S"
#else
#include "memcpy_xscale.S"
==== //depot/projects/ethng/src/lib/libc/arm/string/memset.S#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <machine/asm.h>
-__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.2 2004/11/09 16:49:14 cognet Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/arm/string/memset.S,v 1.3 2007/10/13 12:06:31 cognet Exp $");
/*
* memset: Sets a block of memory to the specified value
@@ -103,15 +103,15 @@
#ifndef _BZERO
orr r3, r3, r3, lsl #8 /* Extend value to 16-bits */
#endif
-#ifdef __XSCALE__
- tst ip, #0x04 /* Quad-align for Xscale */
+#ifdef _ARM_ARCH_5E
+ tst ip, #0x04 /* Quad-align for armv5e */
#else
cmp r1, #0x10
#endif
#ifndef _BZERO
orr r3, r3, r3, lsl #16 /* Extend value to 32-bits */
#endif
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
subne r1, r1, #0x04 /* Quad-align if necessary */
strne r3, [ip], #0x04
cmp r1, #0x10
@@ -124,7 +124,7 @@
/* Do 128 bytes at a time */
.Lmemset_loop128:
subs r1, r1, #0x80
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
strged r2, [ip], #0x08
strged r2, [ip], #0x08
strged r2, [ip], #0x08
@@ -167,7 +167,7 @@
/* Do 32 bytes at a time */
.Lmemset_loop32:
subs r1, r1, #0x20
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
strged r2, [ip], #0x08
strged r2, [ip], #0x08
strged r2, [ip], #0x08
@@ -184,7 +184,7 @@
adds r1, r1, #0x10 /* Partially adjust for extra sub */
/* Deal with 16 bytes or more */
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
strged r2, [ip], #0x08
strged r2, [ip], #0x08
#else
@@ -202,7 +202,7 @@
bgt .Lmemset_loop4
RETeq /* Zero length so just exit */
-#ifdef __XSCALE__
+#ifdef _ARM_ARCH_5E
/* Compensate for 64-bit alignment check */
adds r1, r1, #0x04
RETeq
==== //depot/projects/ethng/src/lib/libc/gdtoa/Symbol.map#2 (text) ====
@@ -1,42 +1,13 @@
/*
- * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.4 2007/04/29 14:05:16 deischen Exp $
+ * $FreeBSD: src/lib/libc/gdtoa/Symbol.map,v 1.5 2007/10/13 14:40:16 deischen Exp $
*/
FBSD_1.0 {
/*
* Standard functions from contrib/gdtoa
- * (dtoa is renamed to __dtoa and not exported)
*/
- freedtoa;
- g_Qfmt;
- g_ddfmt;
- g_dfmt;
- g_ffmt;
- g_xLfmt;
- g_xfmt;
- gdtoa;
- strtoIQ;
- strtoId;
- strtoIdd;
- strtoIf;
- strtoIx;
- strtoIxL;
strtod;
- strtodI;
- strtodg;
strtof;
- strtopQ;
- strtopd;
- strtopdd;
- strtopf;
- strtopx;
- strtopxL;
- strtorQ;
- strtord;
- strtordd;
- strtorf;
- strtorx;
- strtorxL;
/* FreeBSD additions */
strtold;
==== //depot/projects/ethng/src/lib/libc/gen/sysctl.3#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.69 2007/04/10 11:19:52 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/sysctl.3,v 1.71 2007/10/14 18:57:32 ru Exp $
.\"
.Dd April 10, 2007
.Dt SYSCTL 3
@@ -280,10 +280,10 @@
.It "HW_PHYSMEM integer no"
.It "HW_USERMEM integer no"
.It "HW_PAGESIZE integer no"
-.It "HW_FLOATINGPOINT integer no"
+.It "HW_FLOATINGPT integer no"
.It "HW_MACHINE_ARCH string no"
-.\".It "HW_DISKNAMES integer no"
-.\".It "HW_DISKSTATS integer no"
+.It "HW_REALMEM integer no"
+.It "HW_SENSORS node not applicable"
.El
.Pp
.Bl -tag -width 6n
@@ -301,12 +301,42 @@
The bytes of non-kernel memory.
.It Li HW_PAGESIZE
The software page size.
-.It Li HW_FLOATINGPOINT
+.It Li HW_FLOATINGPT
Nonzero if the floating point support is in hardware.
.It Li HW_MACHINE_ARCH
The machine dependent architecture type.
-.\".It Fa HW_DISKNAMES
-.\".It Fa HW_DISKSTATS
+.It Li HW_REALMEM
+The bytes of real memory.
+.It Li HW_SENSORS
+Third level comprises an array of
+.Vt "struct sensordev"
+structures containing information about devices
+that may attach hardware monitoring sensors.
+.Pp
+Third, fourth and fifth levels together comprise an array of
+.Vt "struct sensor"
+structures containing snapshot readings of hardware monitoring sensors.
+In such usage, third level indicates the numerical representation
+of the sensor device name to which the sensor is attached
+(device's
+.Va xname
+and number shall be matched with the help of
+.Vt "struct sensordev"
+structure above),
+fourth level indicates sensor type and
+fifth level is an ordinal sensor number (unique to
+the specified sensor type on the specified sensor device).
+.Pp
+The
+.Vt sensordev
+and
+.Vt sensor
+structures
+and
+.Vt sensor_type
+enumeration
+are defined in
+.In sys/sensors.h .
.El
.Ss CTL_KERN
The string and integer information available for the CTL_KERN level
==== //depot/projects/ethng/src/lib/libc/locale/Symbol.map#2 (text) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.3 2007/04/29 14:05:17 deischen Exp $
+ * $FreeBSD: src/lib/libc/locale/Symbol.map,v 1.4 2007/10/13 16:28:21 ache Exp $
*/
FBSD_1.0 {
@@ -60,12 +60,17 @@
nextwctype;
nl_langinfo;
__maskrune;
+ __sbmaskrune;
__istype;
+ __sbistype;
__isctype;
__toupper;
+ __sbtoupper;
__tolower;
+ __sbtolower;
__wcwidth;
__mb_cur_max;
+ __mb_sb_limit;
rpmatch;
___runetype;
setlocale;
==== //depot/projects/ethng/src/lib/libc/locale/big5.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)big5.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/big5.c,v 1.18 2007/10/13 16:28:21 ache Exp $");
#include <sys/types.h>
#include <errno.h>
@@ -49,6 +49,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _BIG5_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _BIG5_mbsinit(const mbstate_t *);
@@ -68,6 +70,7 @@
__mbsinit = _BIG5_mbsinit;
_CurrentRuneLocale = rl;
__mb_cur_max = 2;
+ __mb_sb_limit = 128;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/euc.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)euc.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.21 2005/02/27 15:11:09 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/euc.c,v 1.22 2007/10/13 16:28:21 ache Exp $");
#include <errno.h>
#include <limits.h>
@@ -49,6 +49,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _EUC_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _EUC_mbsinit(const mbstate_t *);
@@ -116,6 +118,7 @@
__mbrtowc = _EUC_mbrtowc;
__wcrtomb = _EUC_wcrtomb;
__mbsinit = _EUC_mbsinit;
+ __mb_sb_limit = 256;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/gb18030.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.7 2005/02/27 15:11:09 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb18030.c,v 1.8 2007/10/13 16:28:21 ache Exp $");
#include <errno.h>
#include <runetype.h>
@@ -39,6 +39,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _GB18030_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _GB18030_mbsinit(const mbstate_t *);
@@ -59,6 +61,7 @@
__mbsinit = _GB18030_mbsinit;
_CurrentRuneLocale = rl;
__mb_cur_max = 4;
+ __mb_sb_limit = 128;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/gb2312.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/param.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.9 2005/02/27 15:11:09 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gb2312.c,v 1.10 2007/10/13 16:28:21 ache Exp $");
#include <errno.h>
#include <runetype.h>
@@ -35,6 +35,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _GB2312_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _GB2312_mbsinit(const mbstate_t *);
@@ -55,6 +57,7 @@
__wcrtomb = _GB2312_wcrtomb;
__mbsinit = _GB2312_mbsinit;
__mb_cur_max = 2;
+ __mb_sb_limit = 128;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/gbk.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.13 2007/01/09 00:28:00 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/gbk.c,v 1.14 2007/10/13 16:28:21 ache Exp $");
#include <sys/types.h>
#include <errno.h>
@@ -42,6 +42,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _GBK_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _GBK_mbsinit(const mbstate_t *);
@@ -61,6 +63,7 @@
__mbsinit = _GBK_mbsinit;
_CurrentRuneLocale = rl;
__mb_cur_max = 2;
+ __mb_sb_limit = 128;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/isctype.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)isctype.c 8.3 (Berkeley) 2/24/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.10 2007/01/09 00:28:00 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/isctype.c,v 1.11 2007/10/13 16:28:22 ache Exp $");
#include <ctype.h>
@@ -48,7 +48,7 @@
digittoint(c)
int c;
{
- return (__maskrune(c, 0xFF));
+ return (__sbmaskrune(c, 0xFF));
}
#undef isalnum
@@ -56,7 +56,7 @@
isalnum(c)
int c;
{
- return (__istype(c, _CTYPE_A|_CTYPE_D));
+ return (__sbistype(c, _CTYPE_A|_CTYPE_D));
}
#undef isalpha
@@ -64,7 +64,7 @@
isalpha(c)
int c;
{
- return (__istype(c, _CTYPE_A));
+ return (__sbistype(c, _CTYPE_A));
}
#undef isascii
@@ -80,7 +80,7 @@
isblank(c)
int c;
{
- return (__istype(c, _CTYPE_B));
+ return (__sbistype(c, _CTYPE_B));
}
#undef iscntrl
@@ -88,7 +88,7 @@
iscntrl(c)
int c;
{
- return (__istype(c, _CTYPE_C));
+ return (__sbistype(c, _CTYPE_C));
}
#undef isdigit
@@ -104,7 +104,7 @@
isgraph(c)
int c;
{
- return (__istype(c, _CTYPE_G));
+ return (__sbistype(c, _CTYPE_G));
}
#undef ishexnumber
@@ -112,7 +112,7 @@
ishexnumber(c)
int c;
{
- return (__istype(c, _CTYPE_X));
+ return (__sbistype(c, _CTYPE_X));
}
#undef isideogram
@@ -120,7 +120,7 @@
isideogram(c)
int c;
{
- return (__istype(c, _CTYPE_I));
+ return (__sbistype(c, _CTYPE_I));
}
#undef islower
@@ -128,7 +128,7 @@
islower(c)
int c;
{
- return (__istype(c, _CTYPE_L));
+ return (__sbistype(c, _CTYPE_L));
}
#undef isnumber
@@ -136,7 +136,7 @@
isnumber(c)
int c;
{
- return (__istype(c, _CTYPE_D));
+ return (__sbistype(c, _CTYPE_D));
}
#undef isphonogram
@@ -144,7 +144,7 @@
isphonogram(c)
int c;
{
- return (__istype(c, _CTYPE_Q));
+ return (__sbistype(c, _CTYPE_Q));
}
#undef isprint
@@ -152,7 +152,7 @@
isprint(c)
int c;
{
- return (__istype(c, _CTYPE_R));
+ return (__sbistype(c, _CTYPE_R));
}
#undef ispunct
@@ -160,7 +160,7 @@
ispunct(c)
int c;
{
- return (__istype(c, _CTYPE_P));
+ return (__sbistype(c, _CTYPE_P));
}
#undef isrune
@@ -168,7 +168,7 @@
isrune(c)
int c;
{
- return (__istype(c, 0xFFFFFF00L));
+ return (__sbistype(c, 0xFFFFFF00L));
}
#undef isspace
@@ -176,7 +176,7 @@
isspace(c)
int c;
{
- return (__istype(c, _CTYPE_S));
+ return (__sbistype(c, _CTYPE_S));
}
#undef isspecial
@@ -184,7 +184,7 @@
isspecial(c)
int c;
{
- return (__istype(c, _CTYPE_T));
+ return (__sbistype(c, _CTYPE_T));
}
#undef isupper
@@ -192,7 +192,7 @@
isupper(c)
int c;
{
- return (__istype(c, _CTYPE_U));
+ return (__sbistype(c, _CTYPE_U));
}
#undef isxdigit
@@ -216,7 +216,7 @@
tolower(c)
int c;
{
- return (__tolower(c));
+ return (__sbtolower(c));
}
#undef toupper
@@ -224,6 +224,6 @@
toupper(c)
int c;
{
- return (__toupper(c));
+ return (__sbtoupper(c));
}
==== //depot/projects/ethng/src/lib/libc/locale/iswctype.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.7 2007/01/09 00:28:00 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/iswctype.c,v 1.8 2007/10/13 16:28:22 ache Exp $");
#include <wctype.h>
@@ -61,7 +61,7 @@
iswascii(wc)
wint_t wc;
{
- return ((wc & ~0x7F) == 0);
+ return (wc < 0x80);
}
#undef iswblank
==== //depot/projects/ethng/src/lib/libc/locale/mskanji.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
static char sccsid[] = "@(#)mskanji.c 1.0 (Phase One) 5/5/95";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.17 2005/02/27 15:11:09 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/mskanji.c,v 1.18 2007/10/13 16:28:22 ache Exp $");
#include <sys/types.h>
#include <errno.h>
@@ -47,6 +47,8 @@
#include <wchar.h>
#include "mblocal.h"
+extern int __mb_sb_limit;
+
static size_t _MSKanji_mbrtowc(wchar_t * __restrict, const char * __restrict,
size_t, mbstate_t * __restrict);
static int _MSKanji_mbsinit(const mbstate_t *);
@@ -66,6 +68,7 @@
__mbsinit = _MSKanji_mbsinit;
_CurrentRuneLocale = rl;
__mb_cur_max = 2;
+ __mb_sb_limit = 256;
return (0);
}
==== //depot/projects/ethng/src/lib/libc/locale/none.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)none.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.14 2007/01/09 00:28:00 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/none.c,v 1.15 2007/10/13 16:28:22 ache Exp $");
#include <errno.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list