Date: Fri, 6 Sep 2002 00:20:53 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17138 for review Message-ID: <200209060720.g867Kr5L091865@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17138 Change 17138 by julian@julian_jules1 on 2002/09/06 00:19:54 IFC Affected files ... .. //depot/projects/kse/bin/ps/ps.c#12 integrate .. //depot/projects/kse/include/ctype.h#4 integrate .. //depot/projects/kse/include/rpc/auth_kerb.h#2 integrate .. //depot/projects/kse/include/rune.h#2 integrate .. //depot/projects/kse/include/runetype.h#3 integrate .. //depot/projects/kse/include/time.h#4 integrate .. //depot/projects/kse/lib/libc/locale/mblen.c#2 integrate .. //depot/projects/kse/lib/libc/locale/mbtowc.c#2 integrate .. //depot/projects/kse/lib/libc/locale/wctomb.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/sys/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/sparc64/sys/sigaction.S#1 branch .. //depot/projects/kse/lib/libc/stdtime/localtime.c#2 integrate .. //depot/projects/kse/sys/alpha/include/ansi.h#14 delete .. //depot/projects/kse/sys/arm/include/ansi.h#11 delete .. //depot/projects/kse/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#6 integrate .. //depot/projects/kse/sys/boot/sparc64/loader/Makefile#10 integrate .. //depot/projects/kse/sys/cam/cam_periph.c#4 integrate .. //depot/projects/kse/sys/cam/cam_xpt.c#10 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.c#11 integrate .. //depot/projects/kse/sys/cam/scsi/scsi_all.h#4 integrate .. //depot/projects/kse/sys/compat/linux/linux_file.c#17 integrate .. //depot/projects/kse/sys/compat/linux/linux_getcwd.c#8 integrate .. //depot/projects/kse/sys/compat/linux/linux_ioctl.c#18 integrate .. //depot/projects/kse/sys/compat/linux/linux_misc.c#20 integrate .. //depot/projects/kse/sys/compat/linux/linux_stats.c#11 integrate .. //depot/projects/kse/sys/compat/linux/linux_sysctl.c#5 integrate .. //depot/projects/kse/sys/compat/linux/linux_uid16.c#9 integrate .. //depot/projects/kse/sys/conf/NOTES#15 integrate .. //depot/projects/kse/sys/conf/files#48 integrate .. //depot/projects/kse/sys/conf/files.i386#28 integrate .. //depot/projects/kse/sys/conf/files.pc98#29 integrate .. //depot/projects/kse/sys/conf/options.i386#20 integrate .. //depot/projects/kse/sys/dev/acpica/acpi.c#28 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pci.c#2 integrate .. //depot/projects/kse/sys/dev/acpica/acpi_pcib.c#10 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.c#16 integrate .. //depot/projects/kse/sys/dev/isp/isp_freebsd.h#14 integrate .. //depot/projects/kse/sys/dev/mpt/mpt_freebsd.h#5 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/kse/sys/dev/pci/pci.c#16 integrate .. //depot/projects/kse/sys/dev/pci/pci_pci.c#12 integrate .. //depot/projects/kse/sys/dev/pci/pci_private.h#4 integrate .. //depot/projects/kse/sys/dev/puc/puc.c#8 integrate .. //depot/projects/kse/sys/dev/puc/puc_pccard.c#2 integrate .. //depot/projects/kse/sys/dev/puc/pucvar.h#4 integrate .. //depot/projects/kse/sys/dev/sio/sio_puc.c#4 integrate .. //depot/projects/kse/sys/dev/sound/pci/fm801.c#6 integrate .. //depot/projects/kse/sys/dev/sound/pci/maestro3.c#10 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#24 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#9 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#24 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#36 integrate .. //depot/projects/kse/sys/i386/i386/bios.c#12 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/kse/sys/i386/i386/identcpu.c#14 integrate .. //depot/projects/kse/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/kse/sys/i386/include/ansi.h#13 delete .. //depot/projects/kse/sys/i386/include/pci_cfgreg.h#3 integrate .. //depot/projects/kse/sys/i386/linux/linux_genassym.c#4 integrate .. //depot/projects/kse/sys/i386/linux/linux_ptrace.c#5 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#8 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#12 integrate .. //depot/projects/kse/sys/i386/svr4/svr4_genassym.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/capi_l4if.c#5 integrate .. //depot/projects/kse/sys/i4b/capi/capi_llif.c#2 integrate .. //depot/projects/kse/sys/i4b/capi/capi_msgs.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_card.c#3 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_isa.c#6 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/kse/sys/i4b/capi/iavc/iavc_pci.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ctl.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ing.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_ipr.c#6 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_isppp.c#4 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_rbch.c#8 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_tel.c#7 integrate .. //depot/projects/kse/sys/i4b/driver/i4b_trace.c#7 integrate .. //depot/projects/kse/sys/i4b/layer1/i4b_l1dmux.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#7 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_bchan.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_ctx_s0P.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_diva.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_dynalink.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_hscx.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isac.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic_isa.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_isic_pnp.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_itk_ix1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_l1.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_l1fsm.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_siemens_isurf.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_sws.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_isac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 integrate .. //depot/projects/kse/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_iframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2.c#5 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_l2timer.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_lme.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_sframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_tei.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_uframe.c#3 integrate .. //depot/projects/kse/sys/i4b/layer2/i4b_util.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l2if.c#5 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l3fsm.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l3timer.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_l4if.c#3 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_q931.c#6 integrate .. //depot/projects/kse/sys/i4b/layer3/i4b_q932fac.c#3 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_i4bdrv.c#10 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4.c#5 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4mgmt.c#4 integrate .. //depot/projects/kse/sys/i4b/layer4/i4b_l4timer.c#3 integrate .. //depot/projects/kse/sys/ia64/ia64/pmap.c#31 integrate .. //depot/projects/kse/sys/ia64/include/ansi.h#13 delete .. //depot/projects/kse/sys/ia64/include/signal.h#4 integrate .. //depot/projects/kse/sys/kern/imgact_elf.c#23 integrate .. //depot/projects/kse/sys/kern/kern_clock.c#20 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#42 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#36 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#38 integrate .. //depot/projects/kse/sys/kern/kern_exit.c#61 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#79 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#28 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#3 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#33 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#82 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#64 integrate .. //depot/projects/kse/sys/kern/kern_tc.c#12 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#102 integrate .. //depot/projects/kse/sys/kern/kern_timeout.c#7 integrate .. //depot/projects/kse/sys/kern/subr_rman.c#8 integrate .. //depot/projects/kse/sys/kern/sys_process.c#30 integrate .. //depot/projects/kse/sys/kern/uipc_cow.c#5 integrate .. //depot/projects/kse/sys/kern/vfs_cache.c#16 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#41 integrate .. //depot/projects/kse/sys/kern/vnode_if.src#11 integrate .. //depot/projects/kse/sys/libkern/strlcat.c#1 branch .. //depot/projects/kse/sys/libkern/strlcpy.c#1 branch .. //depot/projects/kse/sys/modules/Makefile#32 integrate .. //depot/projects/kse/sys/net/if_gif.c#13 integrate .. //depot/projects/kse/sys/net/if_gif.h#6 integrate .. //depot/projects/kse/sys/netinet/in.h#11 integrate .. //depot/projects/kse/sys/netinet/in_pcb.h#15 integrate .. //depot/projects/kse/sys/netinet/tcp_timer.c#8 integrate .. //depot/projects/kse/sys/nfs/nfsnode.h#6 delete .. //depot/projects/kse/sys/nfsclient/nfs.h#12 integrate .. //depot/projects/kse/sys/pci/if_dc.c#20 integrate .. //depot/projects/kse/sys/powerpc/include/ansi.h#14 delete .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/kse/sys/sparc64/include/ansi.h#14 delete .. //depot/projects/kse/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/kse/sys/sys/bio.h#7 integrate .. //depot/projects/kse/sys/sys/extattr.h#5 integrate .. //depot/projects/kse/sys/sys/imgact_aout.h#8 integrate .. //depot/projects/kse/sys/sys/libkern.h#5 integrate .. //depot/projects/kse/sys/sys/nlist_aout.h#2 integrate .. //depot/projects/kse/sys/sys/proc.h#127 integrate .. //depot/projects/kse/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/kse/sys/sys/timetc.h#7 integrate .. //depot/projects/kse/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/kse/sys/ufs/ufs/inode.h#5 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_extattr.c#15 integrate .. //depot/projects/kse/sys/vm/swap_pager.h#4 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#37 integrate .. //depot/projects/kse/sys/vm/vm_page.c#17 integrate .. //depot/projects/kse/sys/x86_64/include/ansi.h#3 delete .. //depot/projects/kse/usr.bin/gcore/elfcore.c#4 integrate .. //depot/projects/kse/usr.bin/gcore/gcore.c#8 integrate .. //depot/projects/kse/usr.bin/gcore/md-nop.c#3 integrate Differences ... ==== //depot/projects/kse/bin/ps/ps.c#12 (text+ko) ==== @@ -43,7 +43,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.57 2002/07/08 09:08:51 robert Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.58 2002/09/03 05:44:00 jmallett Exp $"); #include <sys/param.h> #include <sys/user.h> @@ -591,9 +591,16 @@ static char * kludge_oldps_options(char *s) { + int have_fmt; size_t len; char *newopts, *ns, *cp; + /* + * If we have an 'o' option, then note it, since we don't want to do + * some types of munging. + */ + have_fmt = index(s, 'o') != NULL; + len = strlen(s); if ((newopts = ns = malloc(len + 2)) == NULL) errx(1, "malloc failed"); @@ -634,7 +641,7 @@ */ if (isdigit(*cp) && (cp == s || (cp[-1] != 't' && cp[-1] != 'p')) && - (cp - 1 == s || cp[-2] != 't')) + (cp - 1 == s || cp[-2] != 't') && !have_fmt) *ns++ = 'p'; (void)strcpy(ns, cp); /* and append the number */ ==== //depot/projects/kse/include/ctype.h#4 (text+ko) ==== @@ -39,15 +39,14 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.22 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/ctype.h,v 1.23 2002/09/06 04:22:54 mike Exp $ */ #ifndef _CTYPE_H_ #define _CTYPE_H_ /* - * XXX <runetype.h> brings massive namespace pollution (rune_t and struct - * member names). + * XXX <runetype.h> brings namespace pollution (struct member names). */ #include <runetype.h> @@ -85,9 +84,15 @@ int tolower(int); int toupper(int); -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __XSI_VISIBLE +int _tolower(int); +int _toupper(int); +int isascii(int); +int toascii(int); +#endif + +#if __BSD_VISIBLE int digittoint(int); -int isascii(int); int isblank(int); int ishexnumber(int); int isideogram(int); @@ -95,7 +100,6 @@ int isphonogram(int); int isrune(int); int isspecial(int); -int toascii(int); #endif __END_DECLS @@ -113,9 +117,26 @@ #define tolower(c) __tolower(c) #define toupper(c) __toupper(c) -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __XSI_VISIBLE +/* + * POSIX.1-2001 specifies _tolower() and _toupper() to be macros equivalent to + * tolower() and toupper() respectively, minus extra checking to ensure that + * the argument is a lower or uppercase letter respectively. We've chosen to + * implement these macros with the same error checking as tolower() and + * toupper() since this doesn't violate the specification itself, only its + * intent. We purposely leave _tolower() and _toupper() undocumented to + * discourage their use. + * + * XXX isascii() and toascii() should similarly be undocumented. + */ +#define _tolower(c) __tolower(c) +#define _toupper(c) __toupper(c) +#define isascii(c) (((c) & ~0x7F) == 0) +#define toascii(c) ((c) & 0x7F) +#endif + +#if __BSD_VISIBLE #define digittoint(c) __maskrune((c), 0xFF) -#define isascii(c) (((c) & ~0x7F) == 0) #define isblank(c) __istype((c), _CTYPE_B) #define ishexnumber(c) __istype((c), _CTYPE_X) #define isideogram(c) __istype((c), _CTYPE_I) @@ -123,10 +144,9 @@ #define isphonogram(c) __istype((c), _CTYPE_Q) #define isrune(c) __istype((c), 0xFFFFFF00L) #define isspecial(c) __istype((c), _CTYPE_T) -#define toascii(c) ((c) & 0x7F) #endif -/* See comments in <machine/_types.h> about __ct_rune_t. */ +/* See comments in <sys/_types.h> about __ct_rune_t. */ __BEGIN_DECLS unsigned long ___runetype(__ct_rune_t); __ct_rune_t ___tolower(__ct_rune_t); ==== //depot/projects/kse/include/rpc/auth_kerb.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.1 2001/03/19 12:49:46 alfred Exp $ */ +/* $FreeBSD: src/include/rpc/auth_kerb.h,v 1.2 2002/09/04 23:58:23 alfred Exp $ */ /* * Sun RPC is a product of Sun Microsystems, Inc. and is provided for * unrestricted use provided that this legend is included on all tape @@ -38,8 +38,6 @@ #ifdef KERBEROS -#pragma ident "@(#)auth_kerb.h 1.10 94/04/25 SMI" - #include <kerberos/krb.h> #include <sys/socket.h> #include <sys/t_kuser.h> ==== //depot/projects/kse/include/rune.h#2 (text+ko) ==== @@ -34,14 +34,19 @@ * SUCH DAMAGE. * * @(#)rune.h 8.1 (Berkeley) 6/27/93 - * $FreeBSD: src/include/rune.h,v 1.2 2002/03/23 17:24:53 imp Exp $ + * $FreeBSD: src/include/rune.h,v 1.3 2002/09/06 04:22:54 mike Exp $ */ #ifndef _RUNE_H_ #define _RUNE_H_ +#include <stdio.h> #include <runetype.h> -#include <stdio.h> + +#ifndef _RUNE_T_DECLARED +#define _RUNE_T_DECLARED +typedef __rune_t rune_t; +#endif #define _PATH_LOCALE "/usr/share/locale" ==== //depot/projects/kse/include/runetype.h#3 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)runetype.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/runetype.h,v 1.7 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/runetype.h,v 1.8 2002/09/06 04:22:54 mike Exp $ */ #ifndef _RUNETYPE_H_ @@ -43,23 +43,6 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#ifndef _RUNE_T_DECLARED -typedef __rune_t rune_t; -#define _RUNE_T_DECLARED -#endif - -#ifndef _SIZE_T_DECLARED -typedef __size_t size_t; -#define _SIZE_T_DECLARED -#endif - -#ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; -#define _WCHAR_T_DECLARED -#endif -#endif - #define _CACHED_RUNES (1 <<8 ) /* Must be a power of 2 */ #define _CRMASK (~(_CACHED_RUNES - 1)) @@ -67,9 +50,9 @@ * The lower 8 bits of runetype[] contain the digit value of the rune. */ typedef struct { - rune_t min; /* First rune of the range */ - rune_t max; /* Last rune (inclusive) of the range */ - rune_t map; /* What first maps to in maps */ + __rune_t min; /* First rune of the range */ + __rune_t max; /* Last rune (inclusive) of the range */ + __rune_t map; /* What first maps to in maps */ unsigned long *types; /* Array of types in range */ } _RuneEntry; @@ -82,13 +65,13 @@ char magic[8]; /* Magic saying what version we are */ char encoding[32]; /* ASCII name of this encoding */ - rune_t (*sgetrune)(const char *, size_t, char const **); - int (*sputrune)(rune_t, char *, size_t, char **); - rune_t invalid_rune; + __rune_t (*sgetrune)(const char *, __size_t, char const **); + int (*sputrune)(__rune_t, char *, __size_t, char **); + __rune_t invalid_rune; unsigned long runetype[_CACHED_RUNES]; - rune_t maplower[_CACHED_RUNES]; - rune_t mapupper[_CACHED_RUNES]; + __rune_t maplower[_CACHED_RUNES]; + __rune_t mapupper[_CACHED_RUNES]; /* * The following are to deal with Runes larger than _CACHED_RUNES - 1. ==== //depot/projects/kse/include/time.h#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ /* - * $FreeBSD: src/include/time.h,v 1.28 2002/08/21 16:19:55 mike Exp $ + * $FreeBSD: src/include/time.h,v 1.29 2002/09/03 00:06:57 mike Exp $ */ #ifndef _TIME_H_ @@ -48,18 +48,16 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#include <machine/ansi.h> - #if __POSIX_VISIBLE > 0 && __POSIX_VISIBLE < 200112 || __BSD_VISIBLE /* * Frequency of the clock ticks reported by times(). Deprecated - use * sysconf(_SC_CLK_TCK) instead. (Removed in 1003.1-2001.) */ -#define CLK_TCK _BSD_CLK_TCK_ +#define CLK_TCK 128 #endif /* Frequency of the clock ticks reported by clock(). */ -#define CLOCKS_PER_SEC _BSD_CLOCKS_PER_SEC_ +#define CLOCKS_PER_SEC 128 #ifndef NULL #define NULL 0 ==== //depot/projects/kse/lib/libc/locale/mblen.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.1 2002/08/31 11:26:55 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mblen.c,v 1.2 2002/09/03 01:09:47 tjr Exp $"); +#include <errno.h> #include <stdlib.h> #include <stddef.h> #include <rune.h> @@ -51,7 +52,9 @@ if (s == 0 || *s == 0) return (0); /* No support for state dependent encodings. */ - if (sgetrune(s, n, &e) == _INVALID_RUNE) + if (sgetrune(s, n, &e) == _INVALID_RUNE) { + errno = EILSEQ; return (s - e); + } return (e - s); } ==== //depot/projects/kse/lib/libc/locale/mbtowc.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.2 2002/09/01 07:08:22 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/mbtowc.c,v 1.3 2002/09/03 01:09:47 tjr Exp $"); +#include <errno.h> #include <stdlib.h> #include <stddef.h> #include <rune.h> @@ -53,8 +54,10 @@ if (s == 0 || *s == 0) return (0); /* No support for state dependent encodings. */ - if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) + if ((r = sgetrune(s, n, &e)) == _INVALID_RUNE) { + errno = EILSEQ; return (s - e); + } if (pwc) *pwc = r; return (e - s); ==== //depot/projects/kse/lib/libc/locale/wctomb.c#2 (text+ko) ==== @@ -35,8 +35,9 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.1 2002/08/31 11:26:55 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/locale/wctomb.c,v 1.2 2002/09/03 01:09:47 tjr Exp $"); +#include <errno.h> #include <stdlib.h> #include <limits.h> #include <stddef.h> @@ -58,5 +59,9 @@ } sputrune(wchar, s, MB_CUR_MAX, &e); - return (e ? e - s : -1); + if (e == NULL) { + errno = EILSEQ; + return (-1); + } + return (e - s); } ==== //depot/projects/kse/lib/libc/sparc64/fpu/fpu_qp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.2 2002/06/04 17:02:27 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_qp.c,v 1.3 2002/09/02 02:30:20 jake Exp $"); #include <sys/types.h> #include <machine/fsr.h> @@ -135,10 +135,10 @@ _QP_TTOQ(ux, x, u_long, u_long, a[0]) _QP_QTOT(d, d, double, a) -_QP_QTOT(i, i, int, ) -_QP_QTOT(s, s, float, ) +_QP_QTOT(i, i, int) +_QP_QTOT(s, s, float) _QP_QTOT(x, x, long, a) -_QP_QTOT(ui, i, u_int, ) +_QP_QTOT(ui, i, u_int) _QP_QTOT(ux, x, u_long, a) _QP_CMP(eq, 0, FCC_EQ) ==== //depot/projects/kse/lib/libc/sparc64/sys/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.7 2002/05/23 23:51:57 jake Exp $ +# $FreeBSD: src/lib/libc/sparc64/sys/Makefile.inc,v 1.8 2002/09/03 14:55:29 jake Exp $ SRCS+= __sparc_sigtramp_setup.c \ __sparc_utrap.c \ @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR}/sparc64/fpu -MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S +MDASM+= brk.S cerror.S exect.S pipe.S ptrace.S sbrk.S setlogin.S sigaction.S # Don't generate default code for these syscalls: NOASM= break.o exit.o ftruncate.o getdomainname.o getlogin.o \ ==== //depot/projects/kse/lib/libc/stdtime/localtime.c#2 (text+ko) ==== @@ -9,7 +9,7 @@ #endif /* !defined NOID */ #endif /* !defined lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.32 2002/05/28 20:12:42 alfred Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.33 2002/09/03 04:34:10 peter Exp $"); /* ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu). @@ -1476,6 +1476,12 @@ */ bits = TYPE_BIT(time_t) - 1; /* + * Limit to 32 bits or the things go crazy + * when it tries to figure out times near 2^62 etc. + */ + if (bits > 31) + bits = 31; + /* ** If time_t is signed, then 0 is just above the median, ** assuming two's complement arithmetic. ** If time_t is unsigned, then (1 << bits) is just above the median. ==== //depot/projects/kse/sys/boot/forth/loader.conf#13 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.63 2002/08/17 16:23:44 orion Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.64 2002/09/02 20:10:18 brooks Exp $ ############################################################## ### Basic configuration options ############################ @@ -90,6 +90,7 @@ #kern.nbuf="" # Set the number of buffer headers #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack +#kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI #kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable #kern.ipc.nmbclusters="" # Set the number of mbuf clusters #kern.ipc.nmbufs="" # Set the maximum number of mbufs ==== //depot/projects/kse/sys/boot/i386/libi386/i386_module.c#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.8 2002/08/30 11:11:02 iwasaki Exp $ + * $FreeBSD: src/sys/boot/i386/libi386/i386_module.c,v 1.9 2002/09/05 11:16:23 iwasaki Exp $ */ /* @@ -44,16 +44,24 @@ i386_autoload(void) { int error; + int disabled; + char *rv; /* XXX use PnP to locate stuff here */ /* autoload ACPI support */ /* XXX should be in 4th keyed off acpi_load */ - if ((getenv("acpi_load") && !getenv("hint.acpi.0.disabled"))) { + disabled = 0; + rv = getenv("hint.acpi.0.disabled"); + if (rv != NULL && strncmp(rv, "0", 1) != 0) { + disabled = 1; + } + + if (getenv("acpi_load") && (!disabled)) { error = mod_load("acpi", NULL, 0, NULL); if (error != 0) printf("ACPI autoload failed - %s\n", strerror(error)); } - + return(0); } ==== //depot/projects/kse/sys/boot/sparc64/loader/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.11 2002/07/07 23:08:22 jake Exp $ +# $FreeBSD: src/sys/boot/sparc64/loader/Makefile,v 1.12 2002/09/02 01:11:46 jake Exp $ BASE= loader PROG= ${BASE} @@ -6,7 +6,6 @@ NEWVERSWHAT= "bootstrap loader" sparc64 BINDIR?= /boot INSTALLFLAGS= -b -NOFORTH= yes # Architecture-specific loader code SRCS= locore.S main.c metadata.c vers.c ==== //depot/projects/kse/sys/cam/cam_periph.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.41 2002/08/24 02:51:28 peter Exp $ + * $FreeBSD: src/sys/cam/cam_periph.c,v 1.42 2002/09/02 20:10:18 brooks Exp $ */ #include <sys/param.h> @@ -1126,7 +1126,7 @@ case AC_SENT_BDR: case AC_BUS_RESET: { - cam_periph_bus_settle(periph, SCSI_DELAY); + cam_periph_bus_settle(periph, scsi_delay); break; } default: ==== //depot/projects/kse/sys/cam/cam_xpt.c#10 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.126 2002/08/27 18:43:14 njl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.127 2002/09/02 20:10:18 brooks Exp $ */ #include <sys/param.h> #include <sys/bus.h> @@ -5487,7 +5487,7 @@ * For HBAs that don't do bus resets, this won't make a difference. */ cam_periph_freeze_after_event(periph, &periph->path->bus->last_reset, - SCSI_DELAY); + scsi_delay); probeschedule(periph); return(CAM_REQ_CMP); } @@ -6760,9 +6760,9 @@ /* Call manually because we don't have any busses */ xpt_finishconfig(xpt_periph, NULL); } else { - if (busses_to_reset > 0 && SCSI_DELAY >= 2000) { + if (busses_to_reset > 0 && scsi_delay >= 2000) { printf("Waiting %d seconds for SCSI " - "devices to settle\n", SCSI_DELAY/1000); + "devices to settle\n", scsi_delay/1000); } xpt_for_all_busses(xptconfigfunc, NULL); } ==== //depot/projects/kse/sys/cam/scsi/scsi_all.c#11 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.36 2002/08/26 17:13:35 gibbs Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.c,v 1.37 2002/09/02 20:10:19 brooks Exp $ */ #include <sys/param.h> @@ -36,6 +36,8 @@ #include <sys/systm.h> #include <sys/libkern.h> +#include <sys/kernel.h> +#include <sys/sysctl.h> #else #include <errno.h> #include <stdio.h> @@ -61,12 +63,40 @@ #define EJUSTRETURN -2 /* don't modify regs, just return */ #endif /* !_KERNEL */ +/* + * This is the default number of seconds we wait for devices to settle + * after a SCSI bus reset. + */ +#ifndef SCSI_DELAY +#define SCSI_DELAY 2000 +#endif +/* + * All devices need _some_ sort of bus settle delay, so we'll set it to + * a minimum value of 100ms. + */ +#ifndef SCSI_MIN_DELAY +#define SCSI_MIN_DELAY 100 +#endif +/* + * Make sure the user isn't using seconds instead of milliseconds. + */ +#if (SCSI_DELAY < SCSI_MIN_DELAY) +#error "SCSI_DELAY is in milliseconds, not seconds! Please use a larger value" +#endif + +int scsi_delay; + static int ascentrycomp(const void *key, const void *member); static int senseentrycomp(const void *key, const void *member); static void fetchtableentries(int sense_key, int asc, int ascq, struct scsi_inquiry_data *, const struct sense_key_table_entry **, const struct asc_table_entry **); +#ifdef _KERNEL +static void init_scsi_delay(void); +static int sysctl_scsi_delay(SYSCTL_HANDLER_ARGS); +static int set_scsi_delay(int delay); +#endif #if !defined(SCSI_NO_OP_STRINGS) @@ -2876,3 +2906,53 @@ } return (-1); } + +#ifdef _KERNEL +static void +init_scsi_delay(void) +{ + int delay; + + delay = SCSI_DELAY; + TUNABLE_INT_FETCH("kern.cam.scsi_delay", &delay); + + if (set_scsi_delay(delay) != 0) { + printf("cam: invalid value for tunable kern.cam.scsi_delay\n"); + set_scsi_delay(SCSI_DELAY); + } +} +SYSINIT(scsi_delay, SI_SUB_TUNABLES, SI_ORDER_ANY, init_scsi_delay, NULL); + +static int +sysctl_scsi_delay(SYSCTL_HANDLER_ARGS) +{ + int error, delay; + + delay = scsi_delay; + error = sysctl_handle_int(oidp, &delay, sizeof(delay), req); + if (error != 0 || req->newptr == NULL) + return (error); + return (set_scsi_delay(delay)); +} +SYSCTL_PROC(_kern_cam, OID_AUTO, scsi_delay, CTLTYPE_INT|CTLFLAG_RW, + 0, 0, sysctl_scsi_delay, "I", + "Delay to allow devices to settle after a SCSI bus reset (ms)"); + +static int +set_scsi_delay(int delay) +{ + /* + * If someone sets this to 0, we assume that they want the + * minimum allowable bus settle delay. + */ + if (delay == 0) { + printf("cam: using minimum scsi_delay (%dms)\n", + SCSI_MIN_DELAY); + delay = SCSI_MIN_DELAY; + } + if (delay < SCSI_MIN_DELAY) + return (EINVAL); + scsi_delay = delay; + return (0); +} +#endif /* _KERNEL */ ==== //depot/projects/kse/sys/cam/scsi/scsi_all.h#4 (text+ko) ==== @@ -14,7 +14,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992 * - * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.19 2002/06/04 17:41:47 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_all.h,v 1.20 2002/09/02 20:10:19 brooks Exp $ */ /* @@ -27,30 +27,11 @@ #include <sys/cdefs.h> #ifdef _KERNEL -#include "opt_scsi.h" /* * This is the number of seconds we wait for devices to settle after a SCSI * bus reset. */ -#ifndef SCSI_DELAY -#define SCSI_DELAY 2000 -#endif -/* - * If someone sets this to 0, we assume that they want the minimum - * allowable bus settle delay. All devices need _some_ sort of bus settle - * delay, so we'll set it to a minimum value of 100ms. - */ -#if (SCSI_DELAY == 0) -#undef SCSI_DELAY -#define SCSI_DELAY 100 -#endif - -/* - * Make sure the user isn't using seconds instead of milliseconds. - */ -#if (SCSI_DELAY < 100) -#error "SCSI_DELAY is in milliseconds, not seconds! Please use a larger value" -#endif +extern int scsi_delay; #endif /* _KERNEL */ /* ==== //depot/projects/kse/sys/compat/linux/linux_file.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.70 2002/09/01 22:30:24 iedowse Exp $ + * $FreeBSD: src/sys/compat/linux/linux_file.c,v 1.71 2002/09/02 22:46:05 iedowse Exp $ */ #include "opt_compat.h" @@ -931,30 +931,22 @@ static int fcntl_common(struct thread *td, struct linux_fcntl64_args *args) { - struct fcntl_args fcntl_args; struct file *fp; + long arg; int error, result; - fcntl_args.fd = args->fd; - switch (args->cmd) { case LINUX_F_DUPFD: - fcntl_args.cmd = F_DUPFD; - fcntl_args.arg = args->arg; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_DUPFD, args->arg)); case LINUX_F_GETFD: - fcntl_args.cmd = F_GETFD; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_GETFD, 0)); case LINUX_F_SETFD: - fcntl_args.cmd = F_SETFD; - fcntl_args.arg = args->arg; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_SETFD, args->arg)); case LINUX_F_GETFL: - fcntl_args.cmd = F_GETFL; - error = fcntl(td, &fcntl_args); + error = kern_fcntl(td, args->fd, F_GETFL, 0); result = td->td_retval[0]; td->td_retval[0] = 0; if (result & O_RDONLY) @@ -974,21 +966,19 @@ return (error); case LINUX_F_SETFL: - fcntl_args.arg = 0; + arg = 0; if (args->arg & LINUX_O_NDELAY) - fcntl_args.arg |= O_NONBLOCK; + arg |= O_NONBLOCK; if (args->arg & LINUX_O_APPEND) - fcntl_args.arg |= O_APPEND; + arg |= O_APPEND; if (args->arg & LINUX_O_SYNC) - fcntl_args.arg |= O_FSYNC; + arg |= O_FSYNC; if (args->arg & LINUX_FASYNC) - fcntl_args.arg |= O_ASYNC; - fcntl_args.cmd = F_SETFL; - return (fcntl(td, &fcntl_args)); + arg |= O_ASYNC; + return (kern_fcntl(td, args->fd, F_SETFL, arg)); case LINUX_F_GETOWN: - fcntl_args.cmd = F_GETOWN; - return (fcntl(td, &fcntl_args)); + return (kern_fcntl(td, args->fd, F_GETOWN, 0)); case LINUX_F_SETOWN: /* @@ -1005,9 +995,7 @@ } fdrop(fp, td); - fcntl_args.cmd = F_SETOWN; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209060720.g867Kr5L091865>