Date: Wed, 30 Apr 2003 14:13:40 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30125 for review Message-ID: <200304302113.h3ULDelP058629@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30125 Change 30125 by peter@peter_daintree on 2003/04/30 14:13:22 IFC @30123 Affected files ... .. //depot/projects/hammer/bin/ps/ps.1#6 integrate .. //depot/projects/hammer/bin/sh/sh.1#5 integrate .. //depot/projects/hammer/lib/Makefile#9 integrate .. //depot/projects/hammer/lib/csu/amd64/crt1.c#3 integrate .. //depot/projects/hammer/lib/libc/gmon/gmon.c#4 integrate .. //depot/projects/hammer/lib/libc/stdlib/malloc.c#6 integrate .. //depot/projects/hammer/lib/libc/xdr/xdr_float.c#3 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/hammer/sys/kern/kern_fork.c#13 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#11 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#4 integrate .. //depot/projects/hammer/sys/vm/vm_map.c#12 integrate .. //depot/projects/hammer/usr.bin/ee/ee.1#2 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#3 integrate Differences ... ==== //depot/projects/hammer/bin/ps/ps.1#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -301,9 +301,7 @@ .Pf ( Dv MADV_RANDOM , from .Xr madvise 2 , -for example, -.Xr lisp 1 -in a garbage collect). +for example, lisp in a garbage collect). .It E The process is trying to exit. .It L ==== //depot/projects/hammer/bin/sh/sh.1#5 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -59,8 +59,7 @@ specification for the shell. This version has many features which make it appear similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Xr pdksh 1 . +shell clone like pdksh. Only features designated by POSIX, plus a few Berkeley extensions, are being incorporated into this shell. ==== //depot/projects/hammer/lib/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.153 2003/04/30 15:33:50 obrien Exp $ +# $FreeBSD: src/lib/Makefile,v 1.154 2003/04/30 18:42:25 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -41,6 +41,7 @@ .endif .if ${MACHINE_ARCH} != "amd64" +_libstand= libstand .if !defined(NOLIBC_R) _libc_r= libc_r .endif ==== //depot/projects/hammer/lib/csu/amd64/crt1.c#3 (text+ko) ==== @@ -95,4 +95,4 @@ __asm__(".previous"); #endif -__asm__(".ident\t\"$FreeBSD: src/lib/csu/i386-elf/crt1.c,v 1.12 2003/01/26 23:14:47 markm Exp $\""); +__asm__(".ident\t\"$FreeBSD: src/lib/csu/amd64/crt1.c,v 1.13 2003/04/30 19:27:07 peter Exp $\""); ==== //depot/projects/hammer/lib/libc/gmon/gmon.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.16 2002/09/17 01:48:50 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.17 2003/04/30 19:29:02 peter Exp $"); #include "namespace.h" #include <sys/param.h> @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) || defined(__x86_64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) extern char *minbrk asm (".minbrk"); #else extern char *minbrk asm ("minbrk"); ==== //depot/projects/hammer/lib/libc/stdlib/malloc.c#6 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.75 2003/04/30 19:30:34 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -62,7 +62,7 @@ # define malloc_pageshift 13U # define malloc_minsize 16U # endif -# if defined(__x86_64__) +# if defined(__amd64__) # define malloc_pageshift 12U # define malloc_minsize 16U # endif ==== //depot/projects/hammer/lib/libc/xdr/xdr_float.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.11 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.12 2003/04/30 19:32:25 peter Exp $"); /* * xdr_float.c, Generic XDR routines implementation. @@ -64,7 +64,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) || defined(__x86_64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) #include <machine/endian.h> #define IEEEFP #endif ==== //depot/projects/hammer/libexec/rtld-elf/libmap.c#3 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.2 2003/04/10 01:44:19 mdodd Exp $ + * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.3 2003/04/30 19:05:53 kan Exp $ */ #include <stdio.h> @@ -59,7 +59,7 @@ while (isspace(*cp)) cp++; /* Found a comment or EOL */ - if (iseol(*cp)) goto next; + if (iseol(*cp)) continue; /* Found a constraint selector */ if (*cp == '[') { @@ -69,17 +69,19 @@ while (isspace(*cp)) cp++; /* Found comment, EOL or end of selector */ - if (iseol(*cp) || *cp == ']') goto next; + if (iseol(*cp) || *cp == ']') + continue; - p = cp; + p = cp++; /* Skip to end of word */ - while (!isspace(*cp) && !iseol(*cp) && *cp != ']') cp++; + while (!isspace(*cp) && !iseol(*cp) && *cp != ']') + cp++; /* Skip and zero out trailing space */ while (isspace(*cp)) *cp++ = '\0'; /* Check if there is a closing brace */ - if (*cp != ']') goto next; + if (*cp != ']') continue; /* Terminate string if there was no trailing space */ *cp++ = '\0'; @@ -89,38 +91,37 @@ * from this point to the end of the line. */ while(isspace(*cp++)); - if (*cp != '\0' && *cp != '#') goto next; + if (!iseol(*cp)) continue; - if (strlen(p) > 0) { - bzero(prog, MAXPATHLEN); - strncpy(prog, p, strlen(p)); - p = prog; - } - goto next; + strcpy(prog, p); + p = prog; + continue; } /* Parse the 'from' candidate. */ - f = cp; + f = cp++; while (!isspace(*cp) && !iseol(*cp)) cp++; - *cp++ = '\0'; /* Skip and zero out the trailing whitespace */ while (isspace(*cp)) *cp++ = '\0'; /* Found a comment or EOL */ - if (iseol(*cp)) goto next; + if (iseol(*cp)) continue; /* Parse 'to' mapping */ - t = cp; + t = cp++; while (!isspace(*cp) && !iseol(*cp)) cp++; - *cp++ = '\0'; + + /* Skip and zero out the trailing whitespace */ + while (isspace(*cp)) *cp++ = '\0'; + + /* Should be no extra tokens at this point */ + if (!iseol(*cp)) continue; - if ((strlen(f) > 0) && (strlen(t) > 0)) - lm_add(p, strdup(f), strdup(t)); -next: - bzero(line, sizeof(line)); + *cp = '\0'; + lm_add(p, strdup(f), strdup(t)); } - (void)fclose(fp); + fclose(fp); return; } ==== //depot/projects/hammer/sys/kern/kern_fork.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_fork.c 8.6 (Berkeley) 4/8/94 - * $FreeBSD: src/sys/kern/kern_fork.c,v 1.194 2003/04/30 12:57:39 markm Exp $ + * $FreeBSD: src/sys/kern/kern_fork.c,v 1.195 2003/04/30 19:41:04 jhb Exp $ */ #include "opt_ktrace.h" @@ -424,8 +424,6 @@ /* * Copy filedesc. - * XXX: This is busted. fd*() need to not take proc - * arguments or something. */ if (flags & RFCFDG) fd = fdinit(td->td_proc->p_fd); ==== //depot/projects/hammer/sys/kern/kern_sig.c#11 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.232 2003/04/25 20:01:19 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.233 2003/04/30 19:45:13 jhb Exp $ */ #include "opt_compat.h" @@ -468,12 +468,9 @@ if (error) return (error); } - mtx_lock(&Giant); error = kern_sigaction(td, uap->sig, actp, oactp, KSA_FREEBSD4); - mtx_unlock(&Giant); - if (oactp && !error) { + if (oactp && !error) error = copyout(oactp, uap->oact, sizeof(oact)); - } return (error); } #endif /* COMAPT_FREEBSD4 */ ==== //depot/projects/hammer/sys/sys/signalvar.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.58 2003/03/31 23:30:41 jeff Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.59 2003/04/30 19:57:21 jhb Exp $ */ #ifndef _SYS_SIGNALVAR_H_ @@ -49,16 +49,16 @@ * (not necessarily resident). */ struct sigacts { - sig_t ps_sigact[_SIG_MAXSIG]; /* disposition of signals */ - sigset_t ps_catchmask[_SIG_MAXSIG]; /* signals to be blocked */ - sigset_t ps_sigonstack; /* signals to take on sigstack */ - sigset_t ps_sigintr; /* signals that interrupt syscalls */ - sigset_t ps_sigreset; /* signals that reset when caught */ - sigset_t ps_signodefer; /* signals not masked while handled */ - sigset_t ps_siginfo; /* signals that want SA_SIGINFO args */ - sigset_t ps_freebsd4; /* signals that use freebsd4 ucontext */ - sigset_t ps_osigset; /* signals that use <= 3.x osigset_t */ - sigset_t ps_usertramp; /* SunOS compat; libc sigtramp XXX */ + sig_t ps_sigact[_SIG_MAXSIG]; /* Disposition of signals. */ + sigset_t ps_catchmask[_SIG_MAXSIG]; /* Signals to be blocked. */ + sigset_t ps_sigonstack; /* Signals to take on sigstack. */ + sigset_t ps_sigintr; /* Signals that interrupt syscalls. */ + sigset_t ps_sigreset; /* Signals that reset when caught. */ + sigset_t ps_signodefer; /* Signals not masked while handled. */ + sigset_t ps_siginfo; /* Signals that want SA_SIGINFO args. */ + sigset_t ps_freebsd4; /* Signals using freebsd4 ucontext. */ + sigset_t ps_osigset; /* Signals using <= 3.x osigset_t. */ + sigset_t ps_usertramp; /* SunOS compat; libc sigtramp XXX. */ }; #if defined(_KERNEL) && defined(COMPAT_43) @@ -244,12 +244,12 @@ void pgsignal(struct pgrp *pgrp, int sig, int checkctty); void postsig(int sig); void psignal(struct proc *p, int sig); -void tdsignal(struct thread *td, int sig); void sigexit(struct thread *td, int signum) __dead2; +int sig_ffs(sigset_t *set); void siginit(struct proc *p); void signotify(struct thread *td); +void tdsignal(struct thread *td, int sig); void trapsignal(struct thread *td, int sig, u_long code); -int sig_ffs(sigset_t *set); /* * Machine-dependent functions: ==== //depot/projects/hammer/sys/vm/vm_map.c#12 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.295 2003/04/30 00:43:17 alc Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.296 2003/04/30 19:18:09 alc Exp $ */ /* @@ -2138,19 +2138,20 @@ vm_page_lock_queues(); pmap_remove(map->pmap, s, e); vm_page_unlock_queues(); - if (object != NULL && - object->ref_count != 1 && - (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && - (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) { - vm_object_collapse(object); + if (object != NULL) { VM_OBJECT_LOCK(object); - vm_object_page_remove(object, offidxstart, offidxend, FALSE); - if (object->type == OBJT_SWAP) { - swap_pager_freespace(object, offidxstart, count); - } - if (offidxend >= object->size && - offidxstart < object->size) { - object->size = offidxstart; + if (object->ref_count != 1 && + (object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING && + (object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) { + VM_OBJECT_UNLOCK(object); + vm_object_collapse(object); + VM_OBJECT_LOCK(object); + vm_object_page_remove(object, offidxstart, offidxend, FALSE); + if (object->type == OBJT_SWAP) + swap_pager_freespace(object, offidxstart, count); + if (offidxend >= object->size && + offidxstart < object->size) + object->size = offidxstart; } VM_OBJECT_UNLOCK(object); } ==== //depot/projects/hammer/usr.bin/ee/ee.1#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\" -.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.14 2002/04/19 23:32:40 charnier Exp $ +.\" $FreeBSD: src/usr.bin/ee/ee.1,v 1.15 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd August 30, 1995 .Dt EE 1 @@ -368,7 +368,7 @@ .Xr spell 1 command, the other is with the optional -.Xr ispell 1 +.Nm ispell command. .Pp Using ==== //depot/projects/hammer/usr.bin/mt/mt.1#3 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.35 2002/10/15 12:53:29 joerg Exp $ +.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.36 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd June 6, 1993 .Dt MT 1 @@ -352,9 +352,7 @@ .Xr st 4 driver appeared in .Bx 386 0.1 -as a separate -.Xr st 1 -command, and have been merged into the +as a separate st(1) command, and have been merged into the .Nm command in .Fx 2.1 .
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302113.h3ULDelP058629>