Date: Sun, 24 Feb 2008 03:10:18 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 136061 for review Message-ID: <200802240310.m1O3AITV074698@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=136061 Change 136061 by marcel@marcel_cluster on 2008/02/24 03:09:54 IFC @136060 Affected files ... .. //depot/projects/e500/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_add.c#6 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#7 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_emu.h#5 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_extern.h#5 integrate .. //depot/projects/e500/sys/powerpc/fpu/fpu_subr.c#6 integrate .. //depot/projects/e500/usr.bin/find/function.c#3 integrate Differences ... ==== //depot/projects/e500/sys/kern/uipc_syscalls.c#9 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.268 2008/02/23 01:01:48 des Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.269 2008/02/24 00:07:00 cperciva Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -2209,7 +2209,9 @@ } /* Quit outer loop on error or when we're done. */ - if (error || done) + if (done) + break; + if (error) goto done; } ==== //depot/projects/e500/sys/powerpc/fpu/fpu_add.c#6 (text+ko) ==== @@ -47,7 +47,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_add.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include <sys/systm.h> #include <sys/types.h> @@ -58,7 +58,6 @@ #include <powerpc/fpu/fpu_arith.h> #include <powerpc/fpu/fpu_emu.h> -#include <powerpc/fpu/fpu_extern.h> struct fpn * fpu_add(struct fpemu *fe) ==== //depot/projects/e500/sys/powerpc/fpu/fpu_emu.c#7 (text+ko) ==== @@ -76,7 +76,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_emu.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include "opt_ddb.h" @@ -328,7 +328,7 @@ /* Store as integer */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; @@ -358,7 +358,7 @@ /* calculate EA of load/store */ ra = instr.i_x.i_ra; rb = instr.i_x.i_rb; - DPRINTF(FPE_INSN, ("reg %d has %lx reg %d has %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x reg %d has %x\n", ra, tf->fixreg[ra], rb, tf->fixreg[rb])); addr = tf->fixreg[rb]; if (ra != 0) @@ -375,7 +375,7 @@ /* calculate EA of load/store */ ra = instr.i_d.i_ra; addr = instr.i_d.i_d; - DPRINTF(FPE_INSN, ("reg %d has %lx displ %lx\n", + DPRINTF(FPE_INSN, ("reg %d has %x displ %x\n", ra, tf->fixreg[ra], addr)); if (ra != 0) addr += tf->fixreg[ra]; ==== //depot/projects/e500/sys/powerpc/fpu/fpu_emu.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: fpu_emu.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */ -/* $FreeBSD: src/sys/powerpc/fpu/fpu_emu.h,v 1.1 2008/02/23 20:05:26 marcel Exp $ */ +/* $FreeBSD: src/sys/powerpc/fpu/fpu_emu.h,v 1.2 2008/02/24 03:01:26 marcel Exp $ */ /* * Copyright (c) 1992, 1993 @@ -167,6 +167,8 @@ /* Build a new Quiet NaN (sign=0, frac=all 1's). */ struct fpn *fpu_newnan(struct fpemu *); +void fpu_norm(struct fpn *); + /* * Shift a number right some number of bits, taking care of round/sticky. * Note that the result is probably not a well-formed number (it will lack ==== //depot/projects/e500/sys/powerpc/fpu/fpu_extern.h#5 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: fpu_extern.h,v 1.3 2005/12/11 12:18:42 christos Exp $ */ -/* $FreeBSD: src/sys/powerpc/fpu/fpu_extern.h,v 1.1 2008/02/23 20:05:26 marcel Exp $ */ +/* $FreeBSD: src/sys/powerpc/fpu/fpu_extern.h,v 1.2 2008/02/24 03:01:26 marcel Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -48,36 +48,15 @@ int fpu_emulate(struct trapframe *, struct fpreg *); int fpu_execute(struct trapframe *, struct fpemu *, union instr *); -/* fpu_add.c */ -struct fpn *fpu_add(struct fpemu *); - -/* fpu_compare.c */ -void fpu_compare(struct fpemu *, int); - -/* fpu_div.c */ -struct fpn *fpu_div(struct fpemu *); - /* fpu_explode.c */ int fpu_itof(struct fpn *, u_int); int fpu_xtof(struct fpn *, u_int64_t); int fpu_stof(struct fpn *, u_int); int fpu_dtof(struct fpn *, u_int, u_int); -void fpu_explode(struct fpemu *, struct fpn *, int, int); /* fpu_implode.c */ u_int fpu_ftoi(struct fpemu *, struct fpn *); u_int fpu_ftox(struct fpemu *, struct fpn *, u_int *); u_int fpu_ftos(struct fpemu *, struct fpn *); u_int fpu_ftod(struct fpemu *, struct fpn *, u_int *); -void fpu_implode(struct fpemu *, struct fpn *, int, u_int *); - -/* fpu_mul.c */ -struct fpn *fpu_mul(struct fpemu *); -/* fpu_sqrt.c */ -struct fpn *fpu_sqrt(struct fpemu *); - -/* fpu_subr.c */ -int fpu_shr(struct fpn *, int); -void fpu_norm(struct fpn *); -struct fpn *fpu_newnan(struct fpemu *); ==== //depot/projects/e500/sys/powerpc/fpu/fpu_subr.c#6 (text+ko) ==== @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.1 2008/02/23 20:05:26 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/powerpc/fpu/fpu_subr.c,v 1.2 2008/02/24 03:01:26 marcel Exp $"); #include <sys/systm.h> #include <sys/types.h> @@ -55,7 +55,6 @@ #include <powerpc/fpu/fpu_arith.h> #include <powerpc/fpu/fpu_emu.h> -#include <powerpc/fpu/fpu_extern.h> /* * Shift the given number right rsh bits. Any bits that `fall off' will get ==== //depot/projects/e500/usr.bin/find/function.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.59 2008/02/23 16:29:04 imp Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/find/function.c,v 1.60 2008/02/24 00:01:06 imp Exp $"); #include <sys/param.h> #include <sys/ucred.h> @@ -1087,9 +1087,16 @@ int f_name(PLAN *plan, FTSENT *entry) { - if ((plan->flags & F_LINK) && !S_ISLNK(entry->fts_statp->st_mode)) - return 0; - return !fnmatch(plan->c_data, entry->fts_name, + char fn[PATH_MAX]; + const char *name; + + if (plan->flags & F_LINK) { + name = fn; + if (readlink(entry->fts_path, fn, sizeof(fn)) == -1) + return 0; + } else + name = entry->fts_name; + return !fnmatch(plan->c_data, name, plan->flags & F_IGNCASE ? FNM_CASEFOLD : 0); } @@ -1102,8 +1109,6 @@ pattern = nextarg(option, argvp); new = palloc(option); new->c_data = pattern; - if (new->flags & F_LINK) - ftsoptions &= ~FTS_NOSTAT; return new; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802240310.m1O3AITV074698>