Date: Sun, 22 Sep 2002 21:11:34 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17951 for review Message-ID: <200209230411.g8N4BYcH004846@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17951 Change 17951 by peter@peter_overcee on 2002/09/22 21:11:04 IFC @17948 Affected files ... .. //depot/projects/hammer/bin/cp/cp.c#3 integrate .. //depot/projects/hammer/contrib/gcc/toplev.c#3 integrate .. //depot/projects/hammer/etc/rc.d/diskless#2 integrate .. //depot/projects/hammer/etc/rc.d/initdiskless#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#3 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#2 integrate .. //depot/projects/hammer/include/inttypes.h#3 integrate .. //depot/projects/hammer/include/limits.h#3 integrate .. //depot/projects/hammer/include/stdlib.h#5 integrate .. //depot/projects/hammer/include/wchar.h#5 integrate .. //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#2 integrate .. //depot/projects/hammer/lib/libc/locale/Makefile.inc#4 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoimax.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstol.3#3 integrate .. //depot/projects/hammer/lib/libc/locale/wcstoll.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstoull.c#1 branch .. //depot/projects/hammer/lib/libc/locale/wcstoumax.c#1 branch .. //depot/projects/hammer/lib/libc/stdio/local.h#5 integrate .. //depot/projects/hammer/lib/libc/stdio/ungetwc.c#3 integrate .. //depot/projects/hammer/sbin/ipfw/ipfw.8#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#3 integrate .. //depot/projects/hammer/sbin/mdmfs/pathnames.h#2 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#3 integrate .. //depot/projects/hammer/sys/alpha/alpha/pmap.c#3 integrate .. //depot/projects/hammer/sys/alpha/include/atomic.h#2 integrate .. //depot/projects/hammer/sys/alpha/osf1/imgact_osf1.c#3 integrate .. //depot/projects/hammer/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#3 integrate .. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#3 integrate .. //depot/projects/hammer/sys/conf/NOTES#4 integrate .. //depot/projects/hammer/sys/conf/files#4 integrate .. //depot/projects/hammer/sys/conf/options#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.h#3 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/hammer/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/hammer/sys/dev/md/md.c#4 integrate .. //depot/projects/hammer/sys/dev/random/hash.c#2 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/hammer/sys/dev/random/yarrow.c#2 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#3 integrate .. //depot/projects/hammer/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_status.c#2 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#3 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#2 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#3 integrate .. //depot/projects/hammer/sys/i386/apm/apm.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/autoconf.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/hammer/sys/i386/i386/legacy.c#1 branch .. //depot/projects/hammer/sys/i386/i386/machdep.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mem.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/mpapic.c#2 integrate .. //depot/projects/hammer/sys/i386/i386/support.s#3 integrate .. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/hammer/sys/i386/include/cpufunc.h#3 integrate .. //depot/projects/hammer/sys/i386/include/legacyvar.h#1 branch .. //depot/projects/hammer/sys/i386/include/segments.h#2 integrate .. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#3 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#4 integrate .. //depot/projects/hammer/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/hammer/sys/kern/imgact_gzip.c#2 integrate .. //depot/projects/hammer/sys/kern/init_main.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_alq.c#1 branch .. //depot/projects/hammer/sys/kern/kern_exec.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_exit.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_intr.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_ktr.c#2 integrate .. //depot/projects/hammer/sys/kern/kern_resource.c#3 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#3 integrate .. //depot/projects/hammer/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/hammer/sys/net/netisr.c#1 branch .. //depot/projects/hammer/sys/netinet/tcp_input.c#4 integrate .. //depot/projects/hammer/sys/nfsclient/nfs_diskless.c#1 branch .. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/hammer/sys/nfsclient/nfsdiskless.h#2 integrate .. //depot/projects/hammer/sys/pci/amdpm.c#2 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#3 integrate .. //depot/projects/hammer/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/hammer/sys/security/mac_biba/mac_biba.c#5 integrate .. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#5 integrate .. //depot/projects/hammer/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/autoconf.c#2 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/exception.S#3 integrate .. //depot/projects/hammer/sys/sys/alq.h#1 branch .. //depot/projects/hammer/sys/sys/imgact.h#3 integrate .. //depot/projects/hammer/sys/sys/ktr.h#3 integrate .. //depot/projects/hammer/sys/sys/unistd.h#3 integrate .. //depot/projects/hammer/sys/vm/vm_glue.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#3 integrate .. //depot/projects/hammer/sys/vm/vm_map.h#2 integrate .. //depot/projects/hammer/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_unix.c#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/de_DE.ISO8859-1/calendar.feiertag#2 integrate .. //depot/projects/hammer/usr.bin/ktrdump/ktrdump.c#2 integrate Differences ... ==== //depot/projects/hammer/bin/cp/cp.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.41 2002/09/21 01:28:33 wollman Exp $"); +__FBSDID("$FreeBSD: src/bin/cp/cp.c,v 1.42 2002/09/22 11:15:56 mckay Exp $"); /* * Cp copies source files to target files. @@ -361,9 +361,10 @@ * honour setuid, setgid and sticky bits, but we * normally want to preserve them on directories. */ - if (pflag) - rval = setfile(curr->fts_statp, 0); - else { + if (pflag) { + if (setfile(curr->fts_statp, 0)) + rval = 1; + } else { mode = curr->fts_statp->st_mode; if ((mode & (S_ISUID | S_ISGID | S_ISTXT)) || ((mode | S_IRWXU) & mask) != (mode & mask)) ==== //depot/projects/hammer/contrib/gcc/toplev.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.16 2002/09/01 21:06:42 kan Exp $ */ +/* $FreeBSD: src/contrib/gcc/toplev.c,v 1.17 2002/09/22 07:26:38 obrien Exp $ */ /* This is the top level of cc1/c++. It parses command args, opens files, invokes the various passes @@ -4691,7 +4691,7 @@ } #endif /*FORCE_OPTIMIZATION_DOWNGRADE*/ -#if defined(__alpha__) +#if defined(TRY_WITHOUT_THIS__alpha__) if (optimize > 1) { warning ("\n***\n***\tThe -O%d flag TRIGGERS KNOWN OPTIMIZER BUGS ON THIS PLATFORM\n***", ==== //depot/projects/hammer/etc/rc.d/diskless#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/diskless,v 1.20 2002/06/25 01:52:33 bsd Exp $ +# $FreeBSD: src/etc/rc.d/diskless,v 1.21 2002/09/22 09:48:02 phk Exp $ # # PROVIDE: diskless @@ -49,10 +49,7 @@ if [ -n "$4" ]; then bpi="-i $4" fi - /sbin/mdconfig -a -t malloc -s $1 -u $3 - /sbin/disklabel -r -w md$3 auto - /sbin/newfs $bpi /dev/md$3c - /sbin/mount /dev/md$3c $2 + /sbin/mdmfs $bpi -s $1 -M md$3 $2 } # If there is a global system configuration file, suck it in. ==== //depot/projects/hammer/etc/rc.d/initdiskless#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/initdiskless,v 1.18 2002/07/28 03:41:53 dd Exp $ +# $FreeBSD: src/etc/rc.d/initdiskless,v 1.19 2002/09/22 09:48:02 phk Exp $ # # PROVIDE: initdiskless @@ -67,10 +67,7 @@ mount_md() { - /sbin/mdconfig -a -t malloc -s $1 -u $3 - /sbin/disklabel -r -w md$3 auto - /sbin/newfs -i 4096 /dev/md$3c - /sbin/mount /dev/md$3c $2 + /sbin/mdmfs -i 4096 -s $1 -M md$3 $2 } # DEBUGGING ==== //depot/projects/hammer/gnu/usr.bin/binutils/Makefile.inc0#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.28 2002/08/31 20:57:53 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/Makefile.inc0,v 1.29 2002/09/22 05:29:37 obrien Exp $ # # This is included explicitly at the top of each sub-Makefile. We can't # use the normal "Makefile.inc" mechanism, because we need some of these @@ -8,7 +8,6 @@ VERSION_DATE= 20020720 TARGET_ARCH?= ${MACHINE_ARCH} -BINUTIL_ARCH= ${TARGET_ARCH} # RELTOP is the relative path to this point in the source or object # tree, from any subdirectory of same. It gets extra "../" prefixes @@ -23,18 +22,18 @@ .endif CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I. -.if exists(${.CURDIR}/${BINUTIL_ARCH}) -CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH} +.if exists(${.CURDIR}/${TARGET_ARCH}) +CFLAGS+= -I${.CURDIR}/${TARGET_ARCH} .endif CFLAGS+= -I${.CURDIR} -CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${BINUTIL_ARCH} +CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH} CFLAGS+= -I${SRCDIR}/include -.if exists(${.CURDIR}/${BINUTIL_ARCH}) -.PATH: ${.CURDIR}/${BINUTIL_ARCH} +.if exists(${.CURDIR}/${TARGET_ARCH}) +.PATH: ${.CURDIR}/${TARGET_ARCH} .endif -ARCHS= ${BINUTIL_ARCH} +ARCHS= ${TARGET_ARCH} .for _arch in ${CROSS_ARCH} .if (${ARCHS:R:M${_arch:R}} == "") ==== //depot/projects/hammer/gnu/usr.bin/binutils/as/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.11 2001/10/14 01:47:30 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/as/Makefile,v 1.12 2002/09/22 05:29:37 obrien Exp $ .include "${.CURDIR}/../Makefile.inc0" -GASES= ${BINUTIL_ARCH} +GASES= ${TARGET_ARCH} FORMATS=freebsd # Only build the cross tools when not cross-compiling. ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.20 2002/07/16 16:10:39 mike Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.21 2002/09/22 05:29:37 obrien Exp $ .include "../Makefile.inc0" @@ -19,16 +19,8 @@ INTERNALLIB= true CLEANFILES+= config.h targmatch.h -# If set, BINUTILSDISTDIR is the path to a directory containing the full GNU -# binutils release. FreeBSD only distributes the bits that are required to -# build native architectures. BINUTILSDISTDIR is needed to build cross tools. -.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR}) -.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes -CFLAGS+= -I${BINUTILSDISTDIR}/bfd -I${BINUTILSDISTDIR}/include -I. -.endif - SELARCH= -.if ${BINUTIL_ARCH} == "sparc64" +.if ${TARGET_ARCH} == "sparc64" SELARCH= &bfd_sparc_arch .else .for _a in ${ARCHS} @@ -55,7 +47,7 @@ sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET} config.h: config.h.fbsd -.if ${BINUTIL_ARCH} == "i386" +.if ${TARGET_ARCH} == "i386" sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET} .else sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET} ==== //depot/projects/hammer/include/inttypes.h#3 (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/inttypes.h,v 1.7 2002/09/06 11:23:32 tjr Exp $ + * $FreeBSD: src/include/inttypes.h,v 1.8 2002/09/22 08:06:45 tjr Exp $ */ #ifndef _INTTYPES_H_ @@ -32,13 +32,6 @@ #include <machine/_inttypes.h> #include <sys/stdint.h> -#ifndef __cplusplus -#ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; -#define _WCHAR_T_DECLARED -#endif -#endif - typedef struct { intmax_t quot; /* Quotient. */ intmax_t rem; /* Remainder. */ @@ -50,9 +43,10 @@ intmax_t strtoimax(const char * __restrict, char ** __restrict, int); uintmax_t strtoumax(const char * __restrict, char ** __restrict, int); -/* XXX: The following functions are missing the restrict type qualifier. */ -intmax_t wcstoimax(const wchar_t *, wchar_t **, int); -uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); +intmax_t wcstoimax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); +uintmax_t wcstoumax(const __wchar_t * __restrict, + __wchar_t ** __restrict, int); __END_DECLS #endif /* !_INTTYPES_H_ */ ==== //depot/projects/hammer/include/limits.h#3 (text+ko) ==== @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)limits.h 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/include/limits.h,v 1.12 2002/09/21 02:00:44 wollman Exp $ + * $FreeBSD: src/include/limits.h,v 1.13 2002/09/21 21:28:25 bde Exp $ */ #ifndef _LIMITS_H_ #define _LIMITS_H_ + #include <sys/cdefs.h> #if __POSIX_VISIBLE @@ -64,16 +65,16 @@ #endif #if __POSIX_VISIBLE >= 199309 -#define _POSIX_AIO_LISTIO_MAX 16 -#define _POSIX_AIO_MAX 1 -#define _POSIX_DELAYTIMER_MAX 32 -#define _POSIX_MQ_OPEN_MAX 8 -#define _POSIX_MQ_PRIO_MAX 32 -#define _POSIX_RTSIG_MAX 0 -#define _POSIX_SEM_NSEMS_MAX 256 -#define _POSIX_SEM_VALUE_MAX 32767 -#define _POSIX_SIGQUEUE_MAX 32 -#define _POSIX_TIMER_MAX 32 +#define _POSIX_AIO_LISTIO_MAX 16 +#define _POSIX_AIO_MAX 1 +#define _POSIX_DELAYTIMER_MAX 32 +#define _POSIX_MQ_OPEN_MAX 8 +#define _POSIX_MQ_PRIO_MAX 32 +#define _POSIX_RTSIG_MAX 0 +#define _POSIX_SEM_NSEMS_MAX 256 +#define _POSIX_SEM_VALUE_MAX 32767 +#define _POSIX_SIGQUEUE_MAX 32 +#define _POSIX_TIMER_MAX 32 #endif #if __POSIX_VISIBLE >= 200112 @@ -82,17 +83,18 @@ #if __XSI_VISIBLE #define _XOPEN_IOV_MAX 16 -#define PASS_MAX 128 /* _PASSWORD_LEN from <pwd.h> */ +#define PASS_MAX 128 /* _PASSWORD_LEN from <pwd.h> */ -#define NL_ARGMAX 99 /* max # of position args for printf */ -#define NL_LANGMAX 31 /* max LANG name length */ -#define NL_MSGMAX 32767 -#define NL_NMAX 1 -#define NL_SETMAX 255 -#define NL_TEXTMAX 2048 -#endif +#define NL_ARGMAX 99 /* max # of position args for printf */ +#define NL_LANGMAX 31 /* max LANG name length */ +#define NL_MSGMAX 32767 +#define NL_NMAX 1 +#define NL_SETMAX 255 +#define NL_TEXTMAX 2048 +#endif #include <machine/limits.h> + #if __POSIX_VISIBLE #include <sys/syslimits.h> #endif ==== //depot/projects/hammer/include/stdlib.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)stdlib.h 8.5 (Berkeley) 5/19/95 - * $FreeBSD: src/include/stdlib.h,v 1.43 2002/09/21 02:03:58 wollman Exp $ + * $FreeBSD: src/include/stdlib.h,v 1.44 2002/09/21 22:05:37 bde Exp $ */ #ifndef _STDLIB_H_ @@ -60,13 +60,13 @@ #endif typedef struct { - int quot; /* quotient */ - int rem; /* remainder */ + int quot; /* quotient */ + int rem; /* remainder */ } div_t; typedef struct { - long quot; /* quotient */ - long rem; /* remainder */ + long quot; + long rem; } ldiv_t; #ifndef NULL @@ -99,18 +99,18 @@ ldiv_t ldiv(long, long) __pure2; void *malloc(size_t); int mblen(const char *, size_t); -size_t mbstowcs(wchar_t *__restrict , const char *__restrict, size_t); +size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t); int mbtowc(wchar_t * __restrict, const char * __restrict, size_t); void qsort(void *, size_t, size_t, int (*)(const void *, const void *)); int rand(void); void *realloc(void *, size_t); void srand(unsigned); -double strtod(const char *__restrict, char **__restrict); -/* float strtof(const char *__restrict, char **__restrict); */ -long strtol(const char *__restrict, char **__restrict, int); +double strtod(const char * __restrict, char ** __restrict); +/* float strtof(const char * __restrict, char ** __restrict); */ +long strtol(const char * __restrict, char ** __restrict, int); /* long double - strtold(const char *__restrict, char **__restrict); */ + strtold(const char * __restrict, char ** __restrict); */ unsigned long strtoul(const char * __restrict, char ** __restrict, int); int system(const char *); @@ -144,14 +144,14 @@ /* LONGLONG */ lldiv_t lldiv(long long, long long) __pure2; /* LONGLONG */ -long long - strtoll(const char *__restrict, char **__restrict, int); +long long + strtoll(const char * __restrict, char ** __restrict, int); /* LONGLONG */ unsigned long long - strtoull(const char *__restrict, char **__restrict, int); + strtoull(const char * __restrict, char ** __restrict, int); #endif /* __LONG_LONG_SUPPORTED */ -void _Exit(int) __dead2; +void _Exit(int) __dead2; #endif /* __ISO_C_VISIBLE >= 1999 */ /* @@ -176,10 +176,10 @@ /* XXX XSI requires pollution from <sys/wait.h> here. We'd rather not. */ /* long a64l(const char *); */ double drand48(void); -/* char *ecvt(double, int, int *__restrict, int *__restrict); */ +/* char *ecvt(double, int, int * __restrict, int * __restrict); */ double erand48(unsigned short[3]); -/* char *fcvt(double, int, int *__restrict, int *__restrict); */ -/* char *gcvt(double, int, int *__restrict, int *__restrict); */ +/* char *fcvt(double, int, int * __restrict, int * __restrict); */ +/* char *gcvt(double, int, int * __restrict, int * __restrict); */ #ifndef _GETSUBOPT_DECLARED int getsubopt(char **, char *const *, char **); #define _GETSUBOPT_DECLARED @@ -196,7 +196,7 @@ #endif #ifndef _MKTEMP_DECLARED char *mktemp(char *); -#define _MKTEMP_DECLARED +#define _MKTEMP_DECLARED #endif long mrand48(void); long nrand48(unsigned short[3]); @@ -217,10 +217,10 @@ /* int unlockpt(int); */ #endif /* __XSI_VISIBLE */ - #if __BSD_VISIBLE extern const char *_malloc_options; -extern void (*_malloc_message)(const char *, const char *, const char *, const char *); +extern void (*_malloc_message)(const char *, const char *, const char *, + const char *); void *alloca(size_t); /* built-in for gcc */ __uint32_t @@ -260,7 +260,8 @@ void srandomdev(void); /* Deprecated interfaces, to be removed in FreeBSD 6.0. */ -__int64_t strtoq(const char *, char **, int); +__int64_t + strtoq(const char *, char **, int); __uint64_t strtouq(const char *, char **, int); #endif /* __BSD_VISIBLE */ ==== //depot/projects/hammer/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.28 2002/09/21 13:00:29 tjr Exp $ + * $FreeBSD: src/include/wchar.h,v 1.29 2002/09/22 08:06:45 tjr Exp $ */ /*- @@ -154,8 +154,12 @@ wchar_t *wcstok(wchar_t * __restrict, const wchar_t * __restrict, wchar_t ** __restrict); long wcstol(const wchar_t * __restrict, wchar_t ** __restrict, int); +long long + wcstoll(const wchar_t * __restrict, wchar_t ** __restrict, int); unsigned long wcstoul(const wchar_t * __restrict, wchar_t ** __restrict, int); +unsigned long long + wcstoull(const wchar_t * __restrict, wchar_t ** __restrict, int); wchar_t *wmemchr(const wchar_t *, wchar_t, size_t); int wmemcmp(const wchar_t *, const wchar_t *, size_t); wchar_t *wmemcpy(wchar_t * __restrict, const wchar_t * __restrict, size_t); ==== //depot/projects/hammer/lib/libc/i386/gen/signalcontext.c#2 (text+ko) ==== @@ -23,18 +23,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.2 2002/09/17 03:15:47 mini Exp $ + * $FreeBSD: src/lib/libc/i386/gen/signalcontext.c,v 1.3 2002/09/21 23:54:32 mini Exp $ */ #include <sys/cdefs.h> __FBSDID("$FreeBSD"); #include <sys/param.h> -#include <sys/signal.h> -#include <sys/signalvar.h> #include <sys/ucontext.h> #include <machine/psl.h> #include <machine/sigframe.h> +#include <signal.h> __weak_reference(__signalcontext, signalcontext); @@ -43,10 +42,10 @@ int __signalcontext(ucontext_t *ucp, int sig, __sighandler_t *func) { + register_t *p; struct sigframe *sfp; - int *p; - /* + /*- * Set up stack. * (n = sizeof(int)) * 2n+sizeof(struct sigframe) ucp @@ -54,29 +53,27 @@ * 1n &func * 0n &_ctx_start */ - p = (int *)ucp->uc_mcontext.mc_esp; - *--p = (int)ucp; + p = (register_t *)(void *)(intptr_t)ucp->uc_mcontext.mc_esp; + *--p = (register_t)(intptr_t)ucp; p -= sizeof(struct sigframe); sfp = (struct sigframe *)p; bzero(sfp, sizeof(struct sigframe)); sfp->sf_signum = sig; - sfp->sf_siginfo = (int)&sfp->sf_si; - sfp->sf_ucontext = (int)&sfp->sf_uc; + sfp->sf_siginfo = (register_t)(intptr_t)&sfp->sf_si; + sfp->sf_ucontext = (register_t)(intptr_t)&sfp->sf_uc; sfp->sf_ahu.sf_action = (__siginfohandler_t *)func; bcopy(ucp, &sfp->sf_uc, sizeof(ucontext_t)); sfp->sf_si.si_signo = sig; + *--p = (register_t)(intptr_t)func; - *--p = (int)func; - /* * Set up ucontext_t. */ ucp->uc_mcontext.mc_ebp = ucp->uc_mcontext.mc_esp - sizeof(int); - ucp->uc_mcontext.mc_esp = (int)p; - ucp->uc_mcontext.mc_eip = (int)_ctx_start; + ucp->uc_mcontext.mc_esp = (register_t)(intptr_t)p; + ucp->uc_mcontext.mc_eip = (register_t)(intptr_t)_ctx_start; ucp->uc_mcontext.mc_eflags &= ~PSL_T; ucp->uc_link = &sfp->sf_uc; - SIGDELSET(ucp->uc_sigmask, sig); + sigdelset(&ucp->uc_sigmask, sig); return (0); } - ==== //depot/projects/hammer/lib/libc/locale/Makefile.inc#4 (text+ko) ==== @@ -1,5 +1,5 @@ # from @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.38 2002/09/15 08:38:51 tjr Exp $ +# $FreeBSD: src/lib/libc/locale/Makefile.inc,v 1.39 2002/09/22 08:06:45 tjr Exp $ # locale sources .PATH: ${.CURDIR}/../libc/${MACHINE_ARCH}/locale ${.CURDIR}/../libc/locale @@ -12,9 +12,10 @@ 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 wcsftime.c wcstod.c \ - wcstol.c \ + wcstoimax.c wcstol.c wcstoll.c \ wcstombs.c \ - wcstoul.c wctob.c wctomb.c wctrans.c wctype.c wcwidth.c + wcstoul.c wcstoull.c wcstoumax.c wctob.c wctomb.c wctrans.c wctype.c \ + wcwidth.c .if ${LIB} == "c" MAN+= btowc.3 \ @@ -48,7 +49,8 @@ rune.3 sputrune.3 MLINKS+=setlocale.3 localeconv.3 MLINKS+=towlower.3 towupper.3 -MLINKS+=wcstol.3 wcstoul.3 +MLINKS+=wcstol.3 wcstoul.3 wcstol.3 wcstoll.3 wcstol.3 wcstoull.3 \ + wcstol.3 wcstoimax.3 wcstol.3 wcstoumax.3 MLINKS+=wctrans.3 towctrans.3 MLINKS+=wctype.3 iswctype.3 .endif ==== //depot/projects/hammer/lib/libc/locale/wcstol.3#3 (text+ko) ==== @@ -22,17 +22,23 @@ .\" 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.2 2002/09/12 09:25:27 tjr Exp $ +.\" $FreeBSD: src/lib/libc/locale/wcstol.3,v 1.3 2002/09/22 08:06:45 tjr Exp $ .\" .Dd September 7, 2002 .Dt WCSTOL 3 .Os .Sh NAME -.Nm wcstol , wcstoul +.Nm wcstol , wcstoul , +.Nm wcstoll , wcstoull , +.Nm wcstoimax , wcstoumax .Nd "convert a wide character string value to a" -.Vt long +.Vt long , +.Vt "unsigned long" , +.Vt "long long" , +.Vt "unsigned long long" , +.Vt intmax_t or -.Vt "unsigned long" +.Vt uintmax_t integer .Sh LIBRARY .Lb libc @@ -42,28 +48,47 @@ .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" +.Ft "long long" +.Fn wcstoll "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.Ft "unsigned long long" +.Fn wcstoull "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.In inttypes.h +.Ft intmax_t +.Fn wcstoimax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" +.Ft uintmax_t +.Fn wcstoumax "const wchar_t * restrict nptr" "wchar_t ** restrict endptr" "int base" .Sh DESCRIPTION The -.Fn wcstol +.Fn wcstol , +.Fn wcstoul , +.Fn wcstoll , +.Fn wcstoull , +.Fn wcstoimax and -.Fn wcstoul +.Fn wcstoumax functions are wide-character versions of the -.Fn strtol +.Fn strtol , +.Fn strtoul , +.Fn strtoll , +.Fn strtoull , +.Fn strtoimax and -.Fn strtoul +.Fn strtoumax functions. -Refer to -.Xr strtol 3 -and -.Xr strtoul 3 +Refer to their manual pages (for example +.Xr strtol 3 ) for details. .Sh SEE ALSO .Xr strtol 3 , .Xr strtoul 3 .Sh STANDARDS The -.Fn wcstol +.Fn wcstol , +.Fn wcstoul , +.Fn wcstoll , +.Fn wcstoull , +.Fn wcstoimax and -.Fn wcstoul +.Fn wcstoumax functions conform to .St -isoC-99 . ==== //depot/projects/hammer/lib/libc/stdio/local.h#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)local.h 8.3 (Berkeley) 7/3/94 - * $FreeBSD: src/lib/libc/stdio/local.h,v 1.16 2002/09/21 13:00:30 tjr Exp $ + * $FreeBSD: src/lib/libc/stdio/local.h,v 1.17 2002/09/22 05:59:00 tjr Exp $ */ #include <sys/types.h> /* for off_t */ @@ -71,6 +71,7 @@ extern int __swsetup(FILE *); extern int __sflags(const char *, int *); extern int __ungetc(int, FILE *); +extern wint_t __ungetwc(wchar_t, FILE *); extern int __vfprintf(FILE *, const char *, __va_list); extern int __vfwprintf(FILE *, const wchar_t *, __va_list); ==== //depot/projects/hammer/lib/libc/stdio/ungetwc.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.3 2002/09/20 13:23:26 tjr Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/ungetwc.c,v 1.4 2002/09/22 05:59:00 tjr Exp $"); #include "namespace.h" #include <errno.h> @@ -36,28 +36,40 @@ #include "libc_private.h" #include "local.h" +/* + * Non-MT-safe version. + */ wint_t -ungetwc(wint_t wc, FILE *fp) +__ungetwc(wint_t wc, FILE *fp) { char buf[MB_LEN_MAX]; mbstate_t mbs; size_t len; - FLOCKFILE(fp); - ORIENT(fp, 1); if (wc == WEOF) - goto error; + return (WEOF); memset(&mbs, 0, sizeof(mbs)); if ((len = wcrtomb(buf, wc, &mbs)) == (size_t)-1) - goto error; + return (WEOF); while (len-- != 0) if (__ungetc((unsigned char)buf[len], fp) == EOF) - goto error; - FUNLOCKFILE(fp); + return (WEOF); return (wc); +} + +/* + * MT-safe version. + */ +wint_t +ungetwc(wint_t wc, FILE *fp) +{ + wint_t r; -error: + FLOCKFILE(fp); + ORIENT(fp, 1); + r = __ungetwc(wc, fp); FUNLOCKFILE(fp); - return (WEOF); + + return (r); } ==== //depot/projects/hammer/sbin/ipfw/ipfw.8#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.112 2002/09/08 09:01:08 blackend Exp $ +.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.113 2002/09/22 11:30:51 maxim Exp $ .\" .de NOIPFW .br @@ -589,7 +589,7 @@ For packets forwarded locally, the local address of the socket will be set to the original destination address of the packet. -This makes the +This makes the .Xr netstat 1 entry look rather weird but is intended for use with transparent proxy servers. @@ -982,7 +982,7 @@ Match packets with a given .Ar dst-mac and -Ar src-mac +.Ar src-mac addresses, specified as the .Cm any keyword (matching any MAC address), or six groups of hex digits @@ -1162,7 +1162,7 @@ .El The set number of rules can be changed with the command .Pp -.Nm +.Nm .Cm set move .Brq Cm rule Ar rule-number | old-set .Cm to Ar new-set ==== //depot/projects/hammer/sbin/mdmfs/mdmfs.8#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.11 2002/08/21 18:10:49 trhodes Exp $ +.\" $FreeBSD: src/sbin/mdmfs/mdmfs.8,v 1.12 2002/09/22 09:46:28 phk Exp $ .\" .Dd August 5, 2001 .Dt MDMFS 8 @@ -84,8 +84,6 @@ .Xr md 4 disk using .Xr mdconfig 8 , -labels it using -.Xr disklabel 8 , puts a UFS file system on it using .Xr newfs 8 , and mounts it using @@ -331,7 +329,6 @@ .Sh SEE ALSO .Xr md 4 , .Xr fstab 5 , -.Xr disklabel 8 , .Xr mdconfig 8 , .Xr mount 8 , .Xr newfs 8 ==== //depot/projects/hammer/sbin/mdmfs/mdmfs.c#3 (text+ko) ==== @@ -25,14 +25,14 @@ */ /* - * mdmfs (md/MFS) is a wrapper around mdconfig(8), disklabel(8), + * mdmfs (md/MFS) is a wrapper around mdconfig(8), * newfs(8), and mount(8) that mimics the command line option set of * the deprecated mount_mfs(8). */ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.10 2002/08/21 18:10:49 trhodes Exp $"; + "$FreeBSD: src/sbin/mdmfs/mdmfs.c,v 1.11 2002/09/22 09:46:28 phk Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -75,7 +75,6 @@ static void argappend(char **, const char *, ...) __printflike(2, 3); static void debugprintf(const char *, ...) __printflike(1, 2); -static void do_disklabel(void); static void do_mdconfig_attach(const char *, const enum md_types); static void do_mdconfig_attach_au(const char *, const enum md_types); static void do_mdconfig_detach(void); @@ -265,7 +264,6 @@ do_mdconfig_attach_au(mdconfig_arg, mdtype); else do_mdconfig_attach(mdconfig_arg, mdtype); - do_disklabel(); do_newfs(newfs_arg); do_mount(mount_arg, mtpoint); do_mtptsetup(mtpoint, &mi); @@ -320,19 +318,6 @@ } /* - * Label the memory disk. - */ -static void -do_disklabel(void) -{ - int rv; - - rv = run(NULL, "%s -r -w %s%d auto", PATH_DISKLABEL, mdname, unit); - if (rv) - errx(1, "disklabel exited with error code %d", rv); -} - -/* * Attach a memory disk with a known unit. */ static void @@ -439,7 +424,7 @@ { int rv; - rv = run(NULL, "%s%s /dev/%s%dc %s", PATH_MOUNT, args, + rv = run(NULL, "%s%s /dev/%s%d %s", PATH_MOUNT, args, mdname, unit, mtpoint); if (rv) errx(1, "mount exited with error code %d", rv); @@ -489,7 +474,7 @@ { int rv; - rv = run(NULL, "%s%s /dev/%s%dc", PATH_NEWFS, args, mdname, unit); + rv = run(NULL, "%s%s /dev/%s%d", PATH_NEWFS, args, mdname, unit); if (rv) errx(1, "newfs exited with error code %d", rv); } ==== //depot/projects/hammer/sbin/mdmfs/pathnames.h#2 (text+ko) ==== @@ -1,9 +1,8 @@ -/* $FreeBSD: src/sbin/mdmfs/pathnames.h,v 1.1 2001/06/18 23:46:58 dd Exp $ */ +/* $FreeBSD: src/sbin/mdmfs/pathnames.h,v 1.2 2002/09/22 09:46:28 phk Exp $ */ #ifndef MDMFS_PATHNAMES_H #define MDMFS_PATHNAMES_H #define PATH_MDCONFIG "/sbin/mdconfig" -#define PATH_DISKLABEL "/sbin/disklabel" #define PATH_NEWFS "/sbin/newfs" #define PATH_MOUNT "/sbin/mount" ==== //depot/projects/hammer/sbin/newfs/newfs.c#3 (text+ko) ==== @@ -54,7 +54,7 @@ static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/newfs/newfs.c,v 1.63 2002/08/21 18:11:21 trhodes Exp $"; + "$FreeBSD: src/sbin/newfs/newfs.c,v 1.64 2002/09/22 09:41:41 phk Exp $"; #endif /* not lint */ /* @@ -374,10 +374,8 @@ return; lp->d_checksum = 0; lp->d_checksum = dkcksum(lp); >>> 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?200209230411.g8N4BYcH004846>