Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 8 May 2017 15:51:29 +0000 (UTC)
From:      Conrad Meyer <cem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r317942 - in head/usr.bin/csplit: . tests
Message-ID:  <201705081551.v48FpT5G006849@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: cem
Date: Mon May  8 15:51:29 2017
New Revision: 317942
URL: https://svnweb.freebsd.org/changeset/base/317942

Log:
  csplit(1): Fix extraneous output in edge case
  
  When the input to csplit contains fewer lines than the number of matches
  specified, extra output was mistakenly included in some output files.
  
  Fix the bug and add a simple ATF regression test.
  
  PR:		219024
  Submitted by:	J.R. Oldroyd <fbsd at opal.com>

Added:
  head/usr.bin/csplit/tests/
  head/usr.bin/csplit/tests/Makefile   (contents, props changed)
  head/usr.bin/csplit/tests/csplit_test.sh   (contents, props changed)
Modified:
  head/usr.bin/csplit/Makefile
  head/usr.bin/csplit/csplit.c

Modified: head/usr.bin/csplit/Makefile
==============================================================================
--- head/usr.bin/csplit/Makefile	Mon May  8 14:48:39 2017	(r317941)
+++ head/usr.bin/csplit/Makefile	Mon May  8 15:51:29 2017	(r317942)
@@ -1,5 +1,11 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 PROG=	csplit
 
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
 .include <bsd.prog.mk>

Modified: head/usr.bin/csplit/csplit.c
==============================================================================
--- head/usr.bin/csplit/csplit.c	Mon May  8 14:48:39 2017	(r317941)
+++ head/usr.bin/csplit/csplit.c	Mon May  8 15:51:29 2017	(r317942)
@@ -399,8 +399,10 @@ do_rexp(const char *expr)
 		first = 0;
 	}
 
-	if (p == NULL)
+	if (p == NULL) {
+		toomuch(NULL, 0);
 		errx(1, "%s: no match", re);
+	}
 
 	if (ofs <= 0) {
 		/*

Added: head/usr.bin/csplit/tests/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/csplit/tests/Makefile	Mon May  8 15:51:29 2017	(r317942)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+PACKAGE=	tests
+
+ATF_TESTS_SH=	csplit_test
+
+.include <bsd.test.mk>

Added: head/usr.bin/csplit/tests/csplit_test.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/usr.bin/csplit/tests/csplit_test.sh	Mon May  8 15:51:29 2017	(r317942)
@@ -0,0 +1,60 @@
+# Copyright (c) 2017 Conrad Meyer <cem@FreeBSD.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+atf_test_case lines_lt_count
+lines_lt_count_head()
+{
+	atf_set "descr" \
+	    "Test an edge case where input has fewer lines than count"
+}
+lines_lt_count_body()
+{
+	cat > expectfile00 << HERE
+one
+two
+HERE
+	cat > expectfile01 << HERE
+xxx 1
+three
+four
+HERE
+	cat > expectfile02 << HERE
+xxx 2
+five
+six
+HERE
+	echo -e "one\ntwo\nxxx 1\nthree\nfour\nxxx 2\nfive\nsix" | \
+	    csplit -k - '/xxx/' '{10}'
+
+	atf_check cmp expectfile00 xx00
+	atf_check cmp expectfile01 xx01
+	atf_check cmp expectfile02 xx02
+}
+
+atf_init_test_cases()
+{
+	atf_add_test_case lines_lt_count
+}

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705081551.v48FpT5G006849>