Date: Fri, 13 Sep 2002 21:16:13 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17468 for review Message-ID: <200209140416.g8E4GDkp078420@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17468 Change 17468 by julian@julian_ref on 2002/09/13 21:15:32 Attempt at merging in thread state changes (among others) Affected files ... .. //depot/projects/kse/include/ctype.h#5 integrate .. //depot/projects/kse/include/dirent.h#3 integrate .. //depot/projects/kse/include/dlfcn.h#2 integrate .. //depot/projects/kse/include/stdlib.h#6 integrate .. //depot/projects/kse/include/wchar.h#5 integrate .. //depot/projects/kse/lib/libc/gen/Makefile.inc#3 integrate .. //depot/projects/kse/lib/libc/gen/dlfcn.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlfunc.c#2 integrate .. //depot/projects/kse/lib/libc/gen/dlopen.3#3 integrate .. //depot/projects/kse/lib/libc/gen/getcontext.3#1 branch .. //depot/projects/kse/lib/libc/gen/makecontext.3#1 branch .. //depot/projects/kse/lib/libc/gen/ucontext.3#1 branch .. //depot/projects/kse/lib/libc/locale/Makefile.inc#6 integrate .. //depot/projects/kse/lib/libc/locale/wcsftime.3#1 branch .. //depot/projects/kse/lib/libc/locale/wcsftime.c#1 branch .. //depot/projects/kse/lib/libc/locale/wcstol.3#2 integrate .. //depot/projects/kse/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/kse/lib/libc/net/gethostbydns.c#2 integrate .. //depot/projects/kse/lib/libc/net/getnetbydns.c#2 integrate .. //depot/projects/kse/lib/libc/net/name6.c#2 integrate .. //depot/projects/kse/lib/libc/net/res_query.c#2 integrate .. //depot/projects/kse/lib/libc/net/res_update.c#2 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/sparc64/gen/fabs.S#1 branch .. //depot/projects/kse/lib/libc/stdlib/Makefile.inc#2 integrate .. //depot/projects/kse/lib/libc/stdlib/_Exit.c#1 branch .. //depot/projects/kse/lib/libc/stdlib/exit.3#3 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort.3#2 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort.c#2 integrate .. //depot/projects/kse/lib/libc/stdlib/qsort_r.c#1 branch .. //depot/projects/kse/lib/libc/sys/sigaction.2#2 integrate .. //depot/projects/kse/lib/libc/sys/sigaltstack.2#2 integrate .. //depot/projects/kse/lib/libc/sys/sigreturn.2#2 integrate .. //depot/projects/kse/lib/libkvm/kvm.c#7 integrate .. //depot/projects/kse/lib/libkvm/kvm_proc.c#22 integrate .. //depot/projects/kse/sys/alpha/alpha/autoconf.c#7 integrate .. //depot/projects/kse/sys/alpha/alpha/setdef0.c#2 delete .. //depot/projects/kse/sys/alpha/alpha/setdef1.c#2 delete .. //depot/projects/kse/sys/alpha/linux/linux_machdep.c#12 integrate .. //depot/projects/kse/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/kse/sys/conf/NOTES#17 integrate .. //depot/projects/kse/sys/conf/files.i386#30 integrate .. //depot/projects/kse/sys/ddb/db_ps.c#24 integrate .. //depot/projects/kse/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/kse/sys/dev/ata/ata-dma.c#23 integrate .. //depot/projects/kse/sys/dev/ata/ata-pci.c#24 integrate .. //depot/projects/kse/sys/dev/ata/atapi-all.c#15 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/kse/sys/dev/ata/atapi-cd.c#19 integrate .. //depot/projects/kse/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/kse/sys/dev/ccd/ccd.c#14 integrate .. //depot/projects/kse/sys/dev/firewire/00README#1 branch .. //depot/projects/kse/sys/dev/firewire/bus_mgm.c#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire.c#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewire_phy.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewirebusreg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/firewirereg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fw_tap.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwmem.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwmem.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohci.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohci_pci.c#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohcireg.h#1 branch .. //depot/projects/kse/sys/dev/firewire/fwohcivar.h#1 branch .. //depot/projects/kse/sys/dev/firewire/iec13213.h#1 branch .. //depot/projects/kse/sys/dev/firewire/iec68113.h#1 branch .. //depot/projects/kse/sys/dev/firewire/if_fwe.c#1 branch .. //depot/projects/kse/sys/dev/firewire/if_fwevar.h#1 branch .. //depot/projects/kse/sys/dev/firewire/sbp.c#1 branch .. //depot/projects/kse/sys/dev/pccard/card_if.m#6 integrate .. //depot/projects/kse/sys/dev/pccard/pccard.c#15 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs#13 integrate .. //depot/projects/kse/sys/dev/pccard/pccarddevs.h#13 integrate .. //depot/projects/kse/sys/dev/pccbb/pccbb.c#21 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ctl.c#25 integrate .. //depot/projects/kse/sys/fs/procfs/procfs_ioctl.c#10 integrate .. //depot/projects/kse/sys/geom/geom.h#9 integrate .. //depot/projects/kse/sys/geom/geom_bsd.c#9 integrate .. //depot/projects/kse/sys/geom/geom_disk.c#7 integrate .. //depot/projects/kse/sys/geom/geom_enc.c#3 integrate .. //depot/projects/kse/sys/geom/geom_io.c#5 integrate .. //depot/projects/kse/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/kse/sys/gnu/ext2fs/ext2_vnops.c#7 integrate .. //depot/projects/kse/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/kse/sys/i386/conf/NOTES#38 integrate .. //depot/projects/kse/sys/i386/i386/elan-mmcr.c#3 integrate .. //depot/projects/kse/sys/i386/ibcs2/imgact_coff.c#14 integrate .. //depot/projects/kse/sys/i386/linux/linux_machdep.c#17 integrate .. //depot/projects/kse/sys/i386/pci/pci_bus.c#10 integrate .. //depot/projects/kse/sys/i386/pci/pci_cfgreg.c#14 integrate .. //depot/projects/kse/sys/i4b/layer1/i4b_hdlc.c#1 branch .. //depot/projects/kse/sys/i4b/layer1/i4b_hdlc.h#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_hdlc.h#2 integrate .. //depot/projects/kse/sys/i4b/layer1/itjc/i4b_itjc_pci.c#5 integrate .. //depot/projects/kse/sys/isa/fd.c#10 integrate .. //depot/projects/kse/sys/kern/bus_if.m#5 integrate .. //depot/projects/kse/sys/kern/imgact_aout.c#17 integrate .. //depot/projects/kse/sys/kern/init_main.c#48 integrate .. //depot/projects/kse/sys/kern/kern_acct.c#16 integrate .. //depot/projects/kse/sys/kern/kern_condvar.c#43 integrate .. //depot/projects/kse/sys/kern/kern_descrip.c#37 integrate .. //depot/projects/kse/sys/kern/kern_exec.c#39 integrate .. //depot/projects/kse/sys/kern/kern_fork.c#80 integrate .. //depot/projects/kse/sys/kern/kern_idle.c#18 integrate .. //depot/projects/kse/sys/kern/kern_intr.c#29 integrate .. //depot/projects/kse/sys/kern/kern_kthread.c#14 integrate .. //depot/projects/kse/sys/kern/kern_ktrace.c#16 integrate .. //depot/projects/kse/sys/kern/kern_mac.c#4 integrate .. //depot/projects/kse/sys/kern/kern_mutex.c#34 integrate .. //depot/projects/kse/sys/kern/kern_proc.c#85 integrate .. //depot/projects/kse/sys/kern/kern_sig.c#66 integrate .. //depot/projects/kse/sys/kern/kern_switch.c#66 integrate .. //depot/projects/kse/sys/kern/kern_synch.c#79 integrate .. //depot/projects/kse/sys/kern/kern_thread.c#109 integrate .. //depot/projects/kse/sys/kern/subr_bus.c#12 integrate .. //depot/projects/kse/sys/kern/subr_smp.c#13 integrate .. //depot/projects/kse/sys/kern/sys_generic.c#34 integrate .. //depot/projects/kse/sys/kern/sys_process.c#32 integrate .. //depot/projects/kse/sys/kern/tty.c#31 integrate .. //depot/projects/kse/sys/kern/vfs_bio.c#24 integrate .. //depot/projects/kse/sys/kern/vfs_subr.c#42 integrate .. //depot/projects/kse/sys/kern/vfs_syscalls.c#35 integrate .. //depot/projects/kse/sys/modules/Makefile#34 integrate .. //depot/projects/kse/sys/modules/aout/Makefile#2 integrate .. //depot/projects/kse/sys/modules/firewire/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/firewire/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/fwe/Makefile#1 branch .. //depot/projects/kse/sys/modules/firewire/sbp/Makefile#1 branch .. //depot/projects/kse/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/kse/sys/modules/pccbb/Makefile#2 delete .. //depot/projects/kse/sys/net/bridge.c#12 integrate .. //depot/projects/kse/sys/net/if_ethersubr.c#19 integrate .. //depot/projects/kse/sys/net/if_gif.c#14 integrate .. //depot/projects/kse/sys/net/if_gif.h#7 integrate .. //depot/projects/kse/sys/net/if_gre.h#2 integrate .. //depot/projects/kse/sys/netgraph/ng_ksocket.c#17 integrate .. //depot/projects/kse/sys/netgraph/ng_pptpgre.c#6 integrate .. //depot/projects/kse/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/kse/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/kse/sys/netns/ns_if.h#4 integrate .. //depot/projects/kse/sys/pccard/pccard.c#13 integrate .. //depot/projects/kse/sys/pci/agp_i810.c#5 integrate .. //depot/projects/kse/sys/pci/agpreg.h#4 integrate .. //depot/projects/kse/sys/pci/if_sf.c#10 integrate .. //depot/projects/kse/sys/pci/if_ste.c#10 integrate .. //depot/projects/kse/sys/pci/if_xl.c#11 integrate .. //depot/projects/kse/sys/posix4/ksched.c#12 integrate .. //depot/projects/kse/sys/security/mac_biba/mac_biba.c#4 integrate .. //depot/projects/kse/sys/security/mac_mls/mac_mls.c#4 integrate .. //depot/projects/kse/sys/sys/bio.h#8 integrate .. //depot/projects/kse/sys/sys/bus.h#6 integrate .. //depot/projects/kse/sys/sys/dirent.h#3 integrate .. //depot/projects/kse/sys/sys/linker_set.h#3 integrate .. //depot/projects/kse/sys/sys/mman.h#6 integrate .. //depot/projects/kse/sys/sys/proc.h#132 integrate .. //depot/projects/kse/sys/sys/snoop.h#3 integrate .. //depot/projects/kse/sys/sys/vnode.h#31 integrate .. //depot/projects/kse/sys/ufs/ufs/ufs_vnops.c#17 integrate .. //depot/projects/kse/sys/vm/vm_glue.c#38 integrate .. //depot/projects/kse/sys/vm/vm_meter.c#16 integrate .. //depot/projects/kse/sys/vm/vm_pageout.c#19 integrate .. //depot/projects/kse/usr.bin/gcore/Makefile#3 integrate .. //depot/projects/kse/usr.bin/gcore/aoutcore.c#1 branch .. //depot/projects/kse/usr.bin/gcore/elfcore.c#5 integrate .. //depot/projects/kse/usr.bin/gcore/extern.h#3 integrate .. //depot/projects/kse/usr.bin/gcore/gcore.c#9 integrate .. //depot/projects/kse/usr.bin/gcore/md-nop.c#4 delete .. //depot/projects/kse/usr.bin/gcore/md-sparc.c#3 delete Differences ... ==== //depot/projects/kse/include/ctype.h#5 (text+ko) ==== @@ -39,16 +39,14 @@ * SUCH DAMAGE. * * @(#)ctype.h 8.4 (Berkeley) 1/21/94 - * $FreeBSD: src/include/ctype.h,v 1.23 2002/09/06 04:22:54 mike Exp $ + * $FreeBSD: src/include/ctype.h,v 1.24 2002/09/09 05:38:05 mike Exp $ */ #ifndef _CTYPE_H_ #define _CTYPE_H_ -/* - * XXX <runetype.h> brings namespace pollution (struct member names). - */ -#include <runetype.h> +#include <sys/cdefs.h> +#include <sys/_types.h> #define _CTYPE_A 0x00000100L /* Alpha */ #define _CTYPE_C 0x00000200L /* Control */ @@ -164,10 +162,24 @@ #endif /* + * <runetype.h> brings namespace pollution (struct member names). This prevents + * us from using the inline optimizations in the more strict __POSIX_VISIBLE and + * __XSI_VISIBLE namespaces. To fix this properly would require that we rename + * member names of long-standing structs, or something equally evil. + */ +#if !__BSD_VISIBLE && !defined(_USE_CTYPE_INLINE_) && \ + !defined(_DONT_USE_CTYPE_INLINE_) +#define _DONT_USE_CTYPE_INLINE_ +#endif + +/* * Use inline functions if we are allowed to and the compiler supports them. */ #if !defined(_DONT_USE_CTYPE_INLINE_) && \ (defined(_USE_CTYPE_INLINE_) || defined(__GNUC__) || defined(__cplusplus)) + +#include <runetype.h> + static __inline int __maskrune(__ct_rune_t _c, unsigned long _f) { ==== //depot/projects/kse/include/dirent.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)dirent.h 8.2 (Berkeley) 7/28/94 - * $FreeBSD: src/include/dirent.h,v 1.12 2002/09/09 03:52:43 mike Exp $ + * $FreeBSD: src/include/dirent.h,v 1.13 2002/09/10 18:12:16 mike Exp $ */ #ifndef _DIRENT_H_ @@ -41,13 +41,18 @@ * The kernel defines the format of directory entries returned by * the getdirentries(2) system call. */ +#include <sys/cdefs.h> #include <sys/dirent.h> -#ifdef _POSIX_SOURCE -typedef void * DIR; -#else +#if __BSD_VISIBLE || __XSI_VISIBLE +/* + * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer + * to the specification. + */ +#define d_ino d_fileno /* backward and XSI compatibility */ +#endif -#define d_ino d_fileno /* backward compatibility */ +#if __BSD_VISIBLE /* definitions for library routines operating on directories. */ #define DIRBLKSIZ 1024 @@ -80,29 +85,37 @@ #define NULL 0 #endif -#endif /* _POSIX_SOURCE */ +#else /* !__BSD_VISIBLE */ + +typedef void * DIR; + +#endif /* __BSD_VISIBLE */ #ifndef _KERNEL -#include <sys/cdefs.h> - __BEGIN_DECLS +#if __BSD_VISIBLE +DIR *__opendir2(const char *, int); +int alphasort(const void *, const void *); +int getdents(int, char *, int); +int getdirentries(int, char *, int, long *); +#endif DIR *opendir(const char *); struct dirent * readdir(DIR *); +#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 500 +int readdir_r(DIR *, struct dirent *, struct dirent **); +#endif void rewinddir(DIR *); -int closedir(DIR *); -#ifndef _POSIX_SOURCE -DIR *__opendir2(const char *, int); -long telldir(DIR *); -void seekdir(DIR *, long); +#if __BSD_VISIBLE int scandir(const char *, struct dirent ***, int (*)(struct dirent *), int (*)(const void *, const void *)); -int alphasort(const void *, const void *); -int getdents(int, char *, int); -int getdirentries(int, char *, int, long *); -int readdir_r(DIR *, struct dirent *, struct dirent **); -#endif /* not POSIX */ +#endif +#if __XSI_VISIBLE +void seekdir(DIR *, long); +long telldir(DIR *); +#endif +int closedir(DIR *); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/kse/include/dlfcn.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1994 * The Regents of the University of California. All rights reserved. * @@ -30,40 +30,42 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/dlfcn.h,v 1.16 2002/05/29 19:35:11 wollman Exp $ + * $FreeBSD: src/include/dlfcn.h,v 1.18 2002/09/11 05:04:06 mike Exp $ */ #ifndef _DLFCN_H_ #define _DLFCN_H_ + #include <sys/cdefs.h> /* * Modes and flags for dlopen(). */ -#define RTLD_LAZY 1 /* Bind function calls lazily */ -#define RTLD_NOW 2 /* Bind function calls immediately */ -#define RTLD_MODEMASK 0x3 -#define RTLD_GLOBAL 0x100 /* Make symbols globally available */ -#define RTLD_LOCAL 0 /* Opposite of RTLD_GLOBAL, and the default */ -#define RTLD_TRACE 0x200 /* Trace loaded objects and exit */ +#define RTLD_LAZY 1 /* Bind function calls lazily. */ +#define RTLD_NOW 2 /* Bind function calls immediately. */ +#define RTLD_MODEMASK 0x3 +#define RTLD_GLOBAL 0x100 /* Make symbols globally available. */ +#define RTLD_LOCAL 0 /* Opposite of RTLD_GLOBAL, and the default. */ +#define RTLD_TRACE 0x200 /* Trace loaded objects and exit. */ /* * Special handle arguments for dlsym(). */ -#define RTLD_NEXT ((void *) -1) /* Search subsequent objects */ -#define RTLD_DEFAULT ((void *) -2) /* Use default search algorithm */ +#define RTLD_NEXT ((void *) -1) /* Search subsequent objects. */ +#define RTLD_DEFAULT ((void *) -2) /* Use default search algorithm. */ +#if __BSD_VISIBLE /* * Structure filled in by dladdr(). */ -typedef struct dl_info { - const char *dli_fname; /* Pathname of shared object */ - void *dli_fbase; /* Base address of shared object */ - const char *dli_sname; /* Name of nearest symbol */ - void *dli_saddr; /* Address of nearest symbol */ +typedef struct dl_info { + const char *dli_fname; /* Pathname of shared object. */ + void *dli_fbase; /* Base address of shared object. */ + const char *dli_sname; /* Name of nearest symbol. */ + void *dli_saddr; /* Address of nearest symbol. */ } Dl_info; -/* +/*- * The actual type declared by this typedef is immaterial, provided that * it is a function pointer. Its purpose is to provide a return type for * dlfunc() which can be cast to a function pointer type without depending @@ -73,28 +75,31 @@ * appropriately. */ struct __dlfunc_arg { - int __dlfunc_dummy; + int __dlfunc_dummy; }; -typedef void (*dlfunc_t)(struct __dlfunc_arg); +typedef void (*dlfunc_t)(struct __dlfunc_arg); + +#endif /* __BSD_VISIBLE */ __BEGIN_DECLS -/* XSI functions first */ -int dlclose(void *); -const char *dlerror(void); -void *dlopen(const char *, int); -void *dlsym(void * /* __restrict */, const char * /* __restrict */); +/* XSI functions first. */ +int dlclose(void *); +const char * + dlerror(void); +void *dlopen(const char *, int); +void *dlsym(void * __restrict, const char * __restrict); #if __BSD_VISIBLE -int dladdr(const void *, Dl_info *); -dlfunc_t dlfunc(void * /* __restrict */, const char * /* __restrict */); -void dllockinit(void *_context, - void *(*_lock_create)(void *_context), - void (*_rlock_acquire)(void *_lock), - void (*_wlock_acquire)(void *_lock), - void (*_lock_release)(void *_lock), - void (*_lock_destroy)(void *_lock), - void (*_context_destroy)(void *_context)); +int dladdr(const void *, Dl_info *); +dlfunc_t dlfunc(void * __restrict, const char * __restrict); +void dllockinit(void *_context, + void *(*_lock_create)(void *_context), + void (*_rlock_acquire)(void *_lock), + void (*_wlock_acquire)(void *_lock), + void (*_lock_release)(void *_lock), + void (*_lock_destroy)(void *_lock), + void (*_context_destroy)(void *_context)); #endif /* __BSD_VISIBLE */ __END_DECLS ==== //depot/projects/kse/include/stdlib.h#6 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.41 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.42 2002/09/10 02:02:49 wollman Exp $ */ #ifndef _STDLIB_H_ @@ -92,6 +92,7 @@ #define MB_CUR_MAX __mb_cur_max __BEGIN_DECLS +void _Exit(int) __dead2; void abort(void) __dead2; int abs(int) __pure2; int atexit(void (*)(void)); @@ -181,16 +182,18 @@ lldiv_t lldiv(long long, long long) __pure2; #endif int mergesort(void *, size_t, size_t, int (*)(const void *, const void *)); +void qsort_r(void *, size_t, size_t, void *, + int (*)(void *, const void *, const void *)); int radixsort(const unsigned char **, int, const unsigned char *, unsigned); -int sradixsort(const unsigned char **, int, const unsigned char *, - unsigned); int rand_r(unsigned *); long random(void); void *reallocf(void *, size_t); char *realpath(const char *, char resolved_path[]); void setprogname(const char *); char *setstate(char *); +int sradixsort(const unsigned char **, int, const unsigned char *, + unsigned); void sranddev(void); void srandom(unsigned long); void srandomdev(void); ==== //depot/projects/kse/include/wchar.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/wchar.h,v 1.20 2002/09/08 13:27:26 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.25 2002/09/12 23:33:17 tjr Exp $ */ /*- @@ -70,10 +70,8 @@ #include <sys/cdefs.h> #include <sys/_types.h> -#include <stdio.h> - #ifndef NULL -#define NULL 0 +#define NULL 0 #endif #ifndef _MBSTATE_T_DECLARED @@ -93,11 +91,6 @@ #endif #endif -#ifndef _WCTYPE_T -typedef unsigned long wctype_t; -#define _WCTYPE_T -#endif - #ifndef _WINT_T_DECLARED typedef __wint_t wint_t; #define _WINT_T_DECLARED @@ -107,15 +100,18 @@ #define WEOF ((wint_t)-1) #endif +struct __sFILE; +struct tm; + __BEGIN_DECLS wint_t btowc(int); -wint_t fgetwc(FILE *); +wint_t fgetwc(struct __sFILE *); wchar_t * - fgetws(wchar_t * __restrict, int, FILE * __restrict); -wint_t fputwc(wchar_t, FILE *); -int fputws(const wchar_t * __restrict, FILE * __restrict); -int fwide(FILE *, int); -wint_t getwc(FILE *); + fgetws(wchar_t * __restrict, int, struct __sFILE * __restrict); +wint_t fputwc(wchar_t, struct __sFILE *); +int fputws(const wchar_t * __restrict, struct __sFILE * __restrict); +int fwide(struct __sFILE *, int); +wint_t getwc(struct __sFILE *); wint_t getwchar(void); size_t mbrlen(const char * __restrict, size_t, mbstate_t * __restrict); size_t mbrtowc(wchar_t * __restrict, const char * __restrict, size_t, @@ -123,15 +119,17 @@ int mbsinit(const mbstate_t *); size_t mbsrtowcs(wchar_t * __restrict, const char ** __restrict, size_t, mbstate_t * __restrict); -wint_t putwc(wchar_t, FILE *); +wint_t putwc(wchar_t, struct __sFILE *); wint_t putwchar(wchar_t); -wint_t ungetwc(wint_t, FILE *); +wint_t ungetwc(wint_t, struct __sFILE *); size_t wcrtomb(char * __restrict, wchar_t, mbstate_t * __restrict); wchar_t *wcscat(wchar_t * __restrict, const wchar_t * __restrict); wchar_t *wcschr(const wchar_t *, wchar_t); int wcscmp(const wchar_t *, const wchar_t *); wchar_t *wcscpy(wchar_t * __restrict, const wchar_t * __restrict); size_t wcscspn(const wchar_t *, const wchar_t *); +size_t wcsftime(wchar_t * __restrict, size_t, const wchar_t * __restrict, + const struct tm * __restrict); size_t wcslcat(wchar_t *, const wchar_t *, size_t); size_t wcslcpy(wchar_t *, const wchar_t *, size_t); size_t wcslen(const wchar_t *); @@ -164,8 +162,8 @@ __END_DECLS #define getwc(fp) fgetwc(fp) -#define getwchar() fgetwc(stdin) -#define putwc(wc, fp) fputwc(wc, fp) -#define putwchar(wc) fputwc(wc, stdout) +#define getwchar() fgetwc(stdin) +#define putwc(wc, fp) fputwc((wc), (fp)) +#define putwchar(wc) fputwc((wc), stdout) #endif /* !_WCHAR_H_ */ ==== //depot/projects/kse/lib/libc/gen/Makefile.inc#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 -# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.94 2002/08/08 04:50:36 mike Exp $ +# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.95 2002/09/11 21:39:19 archie Exp $ # machine-independent gen sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/gen ${.CURDIR}/../libc/gen @@ -42,22 +42,22 @@ confstr.3 ctermid.3 daemon.3 \ devname.3 directory.3 dirname.3 dladdr.3 dllockinit.3 dlopen.3 \ err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 frexp.3 ftok.3 fts.3 \ - getbootfile.3 getbsize.3 getcap.3 getcwd.3 \ + getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \ getdiskbyname.3 getdomainname.3 getfsent.3 \ getgrent.3 getgrouplist.3 gethostname.3 getloadavg.3 \ getmntinfo.3 getnetgrent.3 getobjformat.3 \ getpagesize.3 getpass.3 getpeereid.3 getprogname.3 getpwent.3 \ getttyent.3 getusershell.3 getvfsbyname.3 getvfsent.3 \ - glob.3 initgroups.3 isinf.3 \ - ldexp.3 lockf.3 modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ + glob.3 initgroups.3 isinf.3 ldexp.3 lockf.3 makecontext.3 \ + modf.3 msgctl.3 msgget.3 msgrcv.3 msgsnd.3 \ nice.3 nlist.3 pause.3 popen.3 pselect.3 psignal.3 pwcache.3 \ raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \ scandir.3 setjmp.3 setmode.3 setproctitle.3 shm_open.3 \ siginterrupt.3 signal.3 sigsetops.3 sleep.3 statvfs.3 stringlist.3 \ strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \ tcsendbreak.3 tcsetattr.3 tcsetpgrp.3 time.3 times.3 timezone.3 \ - ttyname.3 tzset.3 ualarm.3 ulimit.3 uname.3 unvis.3 usleep.3 utime.3 \ - valloc.3 vis.3 + ttyname.3 tzset.3 ualarm.3 ucontext.3 ulimit.3 uname.3 \ + unvis.3 usleep.3 utime.3 valloc.3 vis.3 MLINKS+=arc4random.3 arc4random_addrandom.3 arc4random.3 arc4random_stir.3 MLINKS+=ctermid.3 ctermid_r.3 @@ -78,6 +78,7 @@ getcap.3 cgetnum.3 getcap.3 cgetset.3 getcap.3 cgetstr.3 \ getcap.3 cgetustr.3 MLINKS+=getcwd.3 getwd.3 +MLINKS+=getcontext.3 setcontext.3 MLINKS+=getdomainname.3 setdomainname.3 MLINKS+=getfsent.3 endfsent.3 getfsent.3 getfsfile.3 getfsent.3 getfsspec.3 \ getfsent.3 getfstype.3 getfsent.3 setfsent.3 @@ -98,6 +99,7 @@ getvfsent.3 vfsload.3 MLINKS+=glob.3 globfree.3 MLINKS+=isinf.3 isnan.3 isinf.3 isnanf.3 +MLINKS+=makecontext.3 swapcontext.3 MLINKS+=popen.3 pclose.3 MLINKS+=psignal.3 strsignal.3 psignal.3 sys_siglist.3 psignal.3 sys_signame.3 MLINKS+=pwcache.3 group_from_gid.3 pwcache.3 user_from_uid.3 ==== //depot/projects/kse/lib/libc/gen/dlfcn.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.7 2002/02/01 00:57:29 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.8 2002/09/11 05:05:48 mike Exp $"); /* * Linkage to services provided by the dynamic linker. These are @@ -102,7 +102,7 @@ #pragma weak dlsym void * -dlsym(void *handle, const char *name) +dlsym(void * __restrict handle, const char * __restrict name) { _rtld_error(sorry); return NULL; @@ -168,7 +168,7 @@ } void * -dlsym(void *handle, const char *name) +dlsym(void * __restrict handle, const char * __restrict name) { if (__ldso_entry == NULL) return NULL; ==== //depot/projects/kse/lib/libc/gen/dlfunc.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * This source file is in the public domain. * Garrett A. Wollman, 2002-05-28. * - * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.2 2002/05/29 19:35:13 wollman Exp $ + * $FreeBSD: src/lib/libc/gen/dlfunc.c,v 1.3 2002/09/11 05:05:48 mike Exp $ */ #include <dlfcn.h> @@ -17,7 +17,7 @@ * runs on, but is not guaranteed by the C standard. */ dlfunc_t -dlfunc(void *handle, const char *symbol) +dlfunc(void * __restrict handle, const char * __restrict symbol) { union { void *d; ==== //depot/projects/kse/lib/libc/gen/dlopen.3#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" Copyright (c) 1991 Sun Microsystems, Inc. .\" .\" @(#) dlopen.3 1.6 90/01/31 SMI -.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.22 2002/08/09 11:06:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlopen.3,v 1.23 2002/09/11 05:05:48 mike Exp $ .\" -.Dd May 28, 2002 +.Dd September 10, 2002 .Os .Dt DLOPEN 3 .Sh NAME @@ -45,9 +45,9 @@ .Ft void * .Fn dlopen "const char *path" "int mode" .Ft void * -.Fn dlsym "void *handle" "const char *symbol" +.Fn dlsym "void * restrict handle" "const char * restrict symbol" .Ft dlfunc_t -.Fn dlfunc "void *handle" "const char *symbol" +.Fn dlfunc "void * restrict handle" "const char * restrict symbol" .Ft const char * .Fn dlerror "void" .Ft int ==== //depot/projects/kse/lib/libc/locale/Makefile.inc#6 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.36 2002/09/08 13:27:26 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.37 2002/09/11 08:57:11 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -11,7 +11,8 @@ mbrtowc.c mbrune.c mbsinit.c mbsrtowcs.c mbtowc.c mbstowcs.c \ mskanji.c nl_langinfo.c nomacros.c none.c rune.c \ runetype.c setinvalidrune.c setlocale.c setrunelocale.c table.c \ - tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcstol.c wcstombs.c \ + tolower.c toupper.c utf2.c wcrtomb.c wcsrtombs.c wcsftime.c wcstol.c \ + wcstombs.c \ wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c .if ${LIB} == "c" @@ -22,7 +23,8 @@ mbsrtowcs.3 multibyte.3 \ nl_langinfo.3 \ rune.3 \ - setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcrtomb.3 \ + setlocale.3 toascii.3 tolower.3 toupper.3 towlower.3 wcsftime.3 \ + wcrtomb.3 \ wcsrtombs.3 wcstol.3 \ wctrans.3 wctype.3 wcwidth.3 MAN+= euc.4 utf2.4 ==== //depot/projects/kse/lib/libc/locale/wcstol.3#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.1 2002/09/08 13:27:26 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.2 2002/09/12 09:25:27 tjr Exp $ .\" .Dd September 7, 2002 .Dt WCSTOL 3 @@ -39,9 +39,9 @@ .Sh SYNOPSIS .In wchar.h .Ft long -.Fn wcstol "const wchar_t * restrict nptr" "wchar_t * restrict endptr" "int base" +.Fn wcstol "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Ft "unsigned long" -.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t * restrict endptr" "int base" +.Fn wcstoul "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Sh DESCRIPTION The .Fn wcstol ==== //depot/projects/kse/lib/libc/net/getaddrinfo.c#4 (text+ko) ==== @@ -83,7 +83,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.29 2002/08/21 19:57:53 pirzyk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getaddrinfo.c,v 1.30 2002/09/13 20:31:29 nectar Exp $"); #include "namespace.h" #include <sys/types.h> @@ -201,11 +201,7 @@ { 0 } }; -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/gethostbydns.c#2 (text+ko) ==== @@ -58,7 +58,7 @@ static char fromrcsid[] = "From: Id: gethnamaddr.c,v 8.23 1998/04/07 04:59:46 vixie Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.36 2002/06/26 14:18:36 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/gethostbydns.c,v 1.37 2002/09/13 20:31:29 nectar Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -103,11 +103,7 @@ static void dprintf(char *, int) __printflike(1, 0); #endif -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/getnetbydns.c#2 (text+ko) ==== @@ -62,7 +62,7 @@ static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.21 2002/06/26 14:18:36 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/getnetbydns.c,v 1.22 2002/09/13 20:31:29 nectar Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -88,11 +88,7 @@ #define BYNAME 1 #define MAXALIASES 35 -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/name6.c#2 (text+ko) ==== @@ -94,7 +94,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.24 2002/06/26 18:03:31 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/name6.c,v 1.25 2002/09/13 20:31:29 nectar Exp $"); #include "namespace.h" #include <sys/param.h> @@ -967,11 +967,7 @@ int rtl_type; }; -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 typedef union { HEADER hdr; ==== //depot/projects/kse/lib/libc/net/res_query.c#2 (text+ko) ==== @@ -73,7 +73,7 @@ static char orig_rcsid[] = "From: Id: res_query.c,v 8.14 1997/06/09 17:47:05 halley Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.23 2002/07/07 11:28:28 robert Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_query.c,v 1.24 2002/09/13 20:31:29 nectar Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -90,11 +90,7 @@ #include "res_config.h" -#if PACKETSZ > 1024 -#define MAXPACKET PACKETSZ -#else -#define MAXPACKET 1024 -#endif +#define MAXPACKET 65536 /* * Formulate a normal query, send, and await answer. ==== //depot/projects/kse/lib/libc/net/res_update.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.4 2002/03/22 21:52:30 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/res_update.c,v 1.5 2002/09/13 20:31:29 nectar Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -51,6 +51,7 @@ */ #define NSMAX 16 +#define MAXPACKET 65536 struct ns1 { char nsname[MAXDNAME]; @@ -71,7 +72,7 @@ int res_update(ns_updrec *rrecp_in) { ns_updrec *rrecp, *tmprrecp; - u_char buf[PACKETSZ], answer[PACKETSZ], packet[2*PACKETSZ]; + u_char buf[PACKETSZ], answer[MAXPACKET], packet[2*PACKETSZ]; char name[MAXDNAME], zname[MAXDNAME], primary[MAXDNAME], mailaddr[MAXDNAME]; u_char soardata[2*MAXCDNAME+5*INT32SZ]; ==== //depot/projects/kse/lib/libc/sparc64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.4 2002/06/29 03:23:18 obrien Exp $ +# $FreeBSD: src/lib/libc/sparc64/gen/Makefile.inc,v 1.5 2002/09/13 16:01:26 tmm Exp $ -SRCS+= _setjmp.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ +SRCS+= _setjmp.S fabs.S fixunsdfsi.S flt_rounds.c fpsetmask.c frexp.c \ infinity.c isinf.c ldexp.c modf.S setjmp.S sigsetjmp.S ==== //depot/projects/kse/lib/libc/stdlib/Makefile.inc#2 (text+ko) ==== @@ -1,14 +1,14 @@ # from @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 -# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.36 2001/12/02 18:27:40 peter Exp $ +# $FreeBSD: src/lib/libc/stdlib/Makefile.inc,v 1.37 2002/09/10 02:04:49 wollman Exp $ # machine-independent stdlib sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/stdlib ${.CURDIR}/../libc/stdlib -MISRCS+=abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ +MISRCS+=_Exit.c abort.c abs.c atexit.c atof.c atoi.c atol.c atoll.c \ bsearch.c calloc.c div.c exit.c getenv.c getopt.c \ getsubopt.c hcreate.c heapsort.c imaxabs.c imaxdiv.c \ labs.c ldiv.c llabs.c lldiv.c malloc.c merge.c putenv.c \ - qsort.c radixsort.c rand.c random.c reallocf.c realpath.c \ + qsort.c qsort_r.c radixsort.c rand.c random.c reallocf.c realpath.c \ setenv.c strfmon.c strhash.c strtod.c strtoimax.c strtol.c strtoll.c \ strtoq.c strtoul.c strtoull.c strtoumax.c strtouq.c system.c \ tdelete.c tfind.c tsearch.c twalk.c @@ -26,9 +26,10 @@ realpath.3 strfmon.3 strtod.3 strtol.3 strtoul.3 system.3 tsearch.3 MLINKS+=atol.3 atoll.3 +MLINKS+=exit.3 _Exit.3 MLINKS+=getenv.3 putenv.3 getenv.3 setenv.3 getenv.3 unsetenv.3 MLINKS+=hcreate.3 hdestroy.3 hcreate.3 hsearch.3 -MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 +MLINKS+=qsort.3 heapsort.3 qsort.3 mergesort.3 qsort.3 qsort_r.3 MLINKS+=rand.3 rand_r.3 rand.3 srand.3 rand.3 sranddev.3 MLINKS+=random.3 initstate.3 random.3 setstate.3 random.3 srandom.3 \ random.3 srandomdev.3 ==== //depot/projects/kse/lib/libc/stdlib/exit.3#3 (text+ko) ==== @@ -34,13 +34,13 @@ .\" SUCH DAMAGE. .\" .\" @(#)exit.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.11 2002/09/06 19:23:28 wollman Exp $ +.\" $FreeBSD: src/lib/libc/stdlib/exit.3,v 1.12 2002/09/10 02:04:49 wollman Exp $ .\" -.Dd September 6, 2002 +.Dd September 9, 2002 .Dt EXIT 3 .Os .Sh NAME -.Nm exit +.Nm exit , _Exit .Nd perform normal program termination .Sh LIBRARY .Lb libc @@ -48,12 +48,18 @@ .In stdlib.h .Ft void .Fn exit "int status" +.Ft void +.Fn _Exit "int status" .Sh DESCRIPTION -.Fn Exit -terminates a process. +The +.Fn exit +and +.Fn _Exit +functions terminate a process. .Pp -Before termination it performs the following functions in the -order listed: +Before termination, +.Fn exit +performs the following functions in the order listed: .Bl -enum -offset indent .It Call the functions registered with the @@ -69,16 +75,31 @@ function. .El .Pp -Passing arbitrary values back to the environment as -.Ar status -is considered bad style; -you should use the values -.Dv EXIT_SUCCESS +The +.Fn _Exit +function terminates without calling the functions registered with the +.Xr atexit 3 +function, and may or may not perform the other actions listed. >>> 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?200209140416.g8E4GDkp078420>