Date: Sat, 31 May 2003 00:10:09 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32159 for review Message-ID: <200305310710.h4V7A9re042434@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=32159 Change 32159 by peter@peter_overcee on 2003/05/31 00:09:38 IFC @32158 Affected files ... .. //depot/projects/hammer/bin/sh/expand.c#6 integrate .. //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/locore.S#7 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#43 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#16 integrate .. //depot/projects/hammer/sys/amd64/ia32/Makefile#4 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#4 integrate .. //depot/projects/hammer/sys/amd64/ia32/ia32_syscalls.c#2 integrate .. //depot/projects/hammer/sys/amd64/ia32/syscalls.conf#4 integrate .. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#5 integrate .. //depot/projects/hammer/sys/conf/files.amd64#20 integrate .. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#6 integrate .. //depot/projects/hammer/sys/kern/subr_witness.c#12 integrate Differences ... ==== //depot/projects/hammer/bin/sh/expand.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.42 2003/03/15 07:56:59 ru Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.43 2003/05/31 06:27:57 fenner Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -437,6 +437,7 @@ char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int saveherefd; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int nnl; INTOFF; saveifs = ifsfirst; @@ -454,6 +455,8 @@ p = in.buf; lastc = '\0'; + nnl = 0; + /* Don't copy trailing newlines */ for (;;) { if (--in.nleft < 0) { if (in.fd < 0) @@ -469,14 +472,18 @@ if (lastc != '\0') { if (quotes && syntax[(int)lastc] == CCTL) STPUTC(CTLESC, dest); - STPUTC(lastc, dest); + if (lastc == '\n') { + nnl++; + } else { + while (nnl > 0) { + nnl--; + STPUTC('\n', dest); + } + STPUTC(lastc, dest); + } } } - /* Eat all trailing newlines */ - for (p--; lastc == '\n'; lastc = *--p) - STUNPUTC(dest); - if (in.fd >= 0) close(in.fd); if (in.buf) ==== //depot/projects/hammer/sys/amd64/acpica/OsdEnvironment.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.8 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.9 2003/05/31 06:47:05 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/amd64/locore.S#7 (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/amd64/amd64/locore.S,v 1.174 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/locore.S,v 1.175 2003/05/31 06:54:28 peter Exp $ */ #include <machine/asmacros.h> ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#43 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.580 2003/05/23 05:04:53 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.582 2003/05/31 07:00:08 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#16 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.385 2003/05/14 04:10:48 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.386 2003/05/31 07:00:08 peter Exp $ machine amd64 cpu HAMMER @@ -26,7 +26,7 @@ options COMPAT_FREEBSD4 makeoptions NO_MODULES=not_yet -makeoptions DEBUG=-g +#makeoptions DEBUG=-g #To statically compile in device wiring instead of /boot/device.hints #hints "GENERIC.hints" #Default places to look for devices. @@ -44,8 +44,8 @@ options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options DDB -options ALT_BREAK_TO_DEBUGGER -options WITNESS +options ALT_BREAK_TO_DEBUGGER +#options WITNESS options SYSVMSG options SYSVSEM @@ -54,14 +54,14 @@ device isa device pci device acpi -options ACPI_DEBUG +options ACPI_DEBUG # ATA and ATAPI devices device ata device atadisk # ATA disk drives device atapicd # ATAPI CDROM drives -options KTRACE +options KTRACE # atkbdc0 controls both the keyboard and the PS/2 mouse device atkbdc # AT keyboard controller ==== //depot/projects/hammer/sys/amd64/ia32/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for syscall tables # -# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.1 2002/04/10 19:34:51 dfr Exp $ +# $FreeBSD: src/sys/amd64/ia32/Makefile,v 1.2 2003/05/31 06:49:53 peter Exp $ all: @echo "make sysent only" ==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscall.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.1 2003/05/14 04:10:48 peter Exp $ + * $FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.2 2003/05/31 06:49:53 peter Exp $ */ /* ==== //depot/projects/hammer/sys/amd64/ia32/ia32_syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ + * $FreeBSD: src/sys/amd64/ia32/ia32_syscalls.c,v 1.1 2003/05/31 06:51:04 peter Exp $ * created from FreeBSD: src/sys/amd64/ia32/syscalls.master,v 1.22 2003/05/14 04:10:49 peter Exp */ ==== //depot/projects/hammer/sys/amd64/ia32/syscalls.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.1 2002/04/10 19:34:51 dfr Exp $ +# $FreeBSD: src/sys/amd64/ia32/syscalls.conf,v 1.2 2003/05/31 06:49:53 peter Exp $ sysnames="ia32_syscalls.c" sysproto="ia32_proto.h" sysproto_h=_IA32_SYSPROTO_H_ ==== //depot/projects/hammer/sys/amd64/include/acpica_machdep.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/sys/amd64/include/acpica_machdep.h,v 1.1 2002/07/30 19:35:31 iwasaki Exp $ + * $FreeBSD: src/sys/amd64/include/acpica_machdep.h,v 1.2 2003/05/31 06:43:55 peter Exp $ */ /****************************************************************************** ==== //depot/projects/hammer/sys/conf/files.amd64#20 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.16 2003/05/30 01:03:43 peter Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.18 2003/05/31 06:49:53 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.8 2003/05/13 16:59:46 jhb Exp $ + * $FreeBSD: src/sys/dev/acpica/Osd/OsdHardware.c,v 1.9 2003/05/31 06:45:28 peter Exp $ */ /* ==== //depot/projects/hammer/sys/kern/subr_witness.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * * from BSDI $Id: mutex_witness.c,v 1.1.2.20 2000/04/27 03:10:27 cp Exp $ * and BSDI $Id: synch_machdep.c,v 2.3.2.39 2000/04/27 03:10:25 cp Exp $ - * $FreeBSD: src/sys/kern/subr_witness.c,v 1.152 2003/04/10 17:35:44 julian Exp $ + * $FreeBSD: src/sys/kern/subr_witness.c,v 1.153 2003/05/31 06:42:37 peter Exp $ */ /*help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305310710.h4V7A9re042434>