[src/trunk]: src/usr.bin/sed PR/48880: Ryo ONODERA: Unapply one of our patche...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/347f17f66433
branches:  trunk
changeset: 329763:347f17f66433
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 07 16:36:54 2014 +0000

description:
PR/48880: Ryo ONODERA: Unapply one of our patches that broke 'G'.

diffstat:

 usr.bin/sed/Makefile  |  4 ++--
 usr.bin/sed/process.c |  7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (42 lines):

diff -r 265a44e39967 -r 347f17f66433 usr.bin/sed/Makefile
--- a/usr.bin/sed/Makefile      Sat Jun 07 13:25:33 2014 +0000
+++ b/usr.bin/sed/Makefile      Sat Jun 07 16:36:54 2014 +0000
@@ -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
diff -r 265a44e39967 -r 347f17f66433 usr.bin/sed/process.c
--- a/usr.bin/sed/process.c     Sat Jun 07 13:25:33 2014 +0000
+++ b/usr.bin/sed/process.c     Sat Jun 07 16:36:54 2014 +0000
@@ -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 @@
                                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':