From d55d3dd5886c146547482c9f45ac653c1ebe9237 Mon Sep 17 00:00:00 2001 From: Jérémy Compostella Date: Sun, 29 Jan 2012 15:20:31 +0100 Subject: split: support optional start value for --numeric-suffixes Allow changing the --numeric-suffixes start number from the default of 0. * src/split.c (next_file_name): Initialize the suffix index and the output filename according to start value. (main): Check that the suffix length is large enough for the numerical suffix start value. * doc/coreutils.texi (split invocation): Mention it. * NEWS (New features): Mention it. * tests/split/numeric: New file. Test --numeric-suffixes[=FROM]. * tests/Makefile.am (TESTS): Reference the new test. --- tests/Makefile.am | 1 + tests/split/numeric | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100755 tests/split/numeric (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 7b5368195..eed6ed624 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -259,6 +259,7 @@ TESTS = \ split/lines \ split/l-chunk \ split/r-chunk \ + split/numeric \ misc/stat-birthtime \ misc/stat-fmt \ misc/stat-hyphen \ diff --git a/tests/split/numeric b/tests/split/numeric new file mode 100755 index 000000000..ad22df621 --- /dev/null +++ b/tests/split/numeric @@ -0,0 +1,65 @@ +#!/bin/sh +# Show that split --numeric-suffixes[=from] works. + +# Copyright (C) 2012 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +. "${srcdir=.}/init.sh"; path_prepend_ ../src +print_ver_ split + +# Check default start from 0 +printf '1\n2\n3\n4\n5\n' > in || framework_failure_ +split --numeric-suffixes --lines=2 in || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF +compare exp-1 x00 || fail=1 +compare exp-2 x01 || fail=1 +compare exp-3 x02 || fail=1 + +# Check --numeric-suffixes=X +split --numeric-suffixes=1 --lines=2 in || fail=1 +cat <<\EOF > exp-1 +1 +2 +EOF +cat <<\EOF > exp-2 +3 +4 +EOF +cat <<\EOF > exp-3 +5 +EOF +compare exp-1 x01 || fail=1 +compare exp-2 x02 || fail=1 +compare exp-3 x03 || fail=1 + +# Check that split failed when suffix length is not large enough for +# the numerical suffix start value +split -a 3 --numeric-suffixes=1000 in 2> /dev/null && fail=1 + +# check invalid --numeric-suffixes start values are flagged +split --numeric-suffixes=-1 in 2> /dev/null && fail=1 +split --numeric-suffixes=one in 2> /dev/null && fail=1 + +Exit $fail -- cgit v1.2.3-54-g00ecf