Module Name: src
Committed By: christos
Date: Sat Jun 7 16:36:54 UTC 2014
Modified Files:
src/usr.bin/sed: Makefile process.c
Log Message:
PR/48880: Ryo ONODERA: Unapply one of our patches that broke 'G'.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/sed/Makefile
cvs rdiff -u -r1.42 -r1.43 src/usr.bin/sed/process.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/sed/Makefile
diff -u src/usr.bin/sed/Makefile:1.15 src/usr.bin/sed/Makefile:1.16
--- src/usr.bin/sed/Makefile:1.15 Thu Jun 5 20:13:13 2014
+++ src/usr.bin/sed/Makefile Sat Jun 7 12:36:54 2014
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2014/06/06 00:13:13 christos Exp $
+# $NetBSD: Makefile,v 1.16 2014/06/07 16:36:54 christos Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
-WARNS=6
+WARNS=0
PROG= sed
SRCS= compile.c main.c misc.c process.c
Index: src/usr.bin/sed/process.c
diff -u src/usr.bin/sed/process.c:1.42 src/usr.bin/sed/process.c:1.43
--- src/usr.bin/sed/process.c:1.42 Sat Jun 7 02:02:27 2014
+++ src/usr.bin/sed/process.c Sat Jun 7 12:36:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: process.c,v 1.42 2014/06/07 06:02:27 ryoon Exp $ */
+/* $NetBSD: process.c,v 1.43 2014/06/07 16:36:54 christos Exp $ */
/*-
* Copyright (c) 1992 Diomidis Spinellis.
@@ -38,7 +38,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: process.c,v 1.42 2014/06/07 06:02:27 ryoon Exp $");
+__RCSID("$NetBSD: process.c,v 1.43 2014/06/07 16:36:54 christos Exp $");
#ifdef __FBSDID
__FBSDID("$FreeBSD: head/usr.bin/sed/process.c 192732 2009-05-25 06:45:33Z brian $");
#endif
@@ -154,8 +154,7 @@ redirect:
cspace(&PS, hs, hsl, REPLACE);
break;
case 'G':
- if (hs == NULL)
- cspace(&HS, "\n", 1, REPLACE);
+ cspace(&PS, "\n", 1, APPEND);
cspace(&PS, hs, hsl, APPEND);
break;
case 'h':
