Shorten the rewrap subroutine by splitting out the code dealing with a single line. Also remove $file from the warning. --- tests/test-wrap-argv.pl | 116 +++++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 55 deletions(-) diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl index a81cf43..3847d7b 100755 --- a/tests/test-wrap-argv.pl +++ b/tests/test-wrap-argv.pl @@ -59,70 +59,76 @@ sub rewrap { # Now each @lines represents a single command, we # can process them foreach my $line (@lines) { - my @bits = split / /, join('', $line); + &rewrap_line ($line); + } + +} - # @bits contains env vars, then the command line - # and then the arguments - my @env; - my $cmd; - my @args; +sub rewrap_line { + my $line = shift; + my @bits = split / /, join('', $line); - if ($bits[0] !~ /=/) { - $cmd = shift @bits; - } + # @bits contains env vars, then the command line + # and then the arguments + my @env; + my $cmd; + my @args; - foreach my $bit (@bits) { - # If no command is defined yet, we must still - # have env vars - if (!defined $cmd) { - # Look for leading / to indicate command name - if ($bit =~ m,^/,) { - $cmd = $bit; - } else { - push @env, $bit; - } + if ($bits[0] !~ /=/) { + $cmd = shift @bits; + } + + foreach my $bit (@bits) { + # If no command is defined yet, we must still + # have env vars + if (!defined $cmd) { + # Look for leading / to indicate command name + if ($bit =~ m,^/,) { + $cmd = $bit; + } else { + push @env, $bit; + } + } else { + # If there's a leading '-' then this is a new + # parameter, otherwise its a value for the prev + # parameter. + if ($bit =~ m,^-,) { + push @args, $bit; } else { - # If there's a leading '-' then this is a new - # parameter, otherwise its a value for the prev - # parameter. - if ($bit =~ m,^-,) { - push @args, $bit; - } else { - $args[$#args] .= " " . $bit; - } + $args[$#args] .= " " . $bit; } } + } - # Print env + command first - print join(" \\\n", @env, $cmd), " \\\n"; - # We might have to split line argument values... - for (my $i = 0; $i <= $#args; $i++) { - my $arg = $args[$i]; - while (length($arg) > 80) { - my $split = rindex $arg, ",", 80; - if ($split == -1) { - $split = rindex $arg, ":", 80; - } - if ($split == -1) { - $split = rindex $arg, " ", 80; - } - if ($split == -1) { - warn "$file: cannot find nice place to split '$arg' below 80 chars\n"; - $split = 79; - } - $split++; - - my $head = substr $arg, 0, $split; - $arg = substr $arg, $split; - - print $head, "\\\n"; + # Print env + command first + print join(" \\\n", @env, $cmd), " \\\n"; + # We might have to split line argument values... + for (my $i = 0; $i <= $#args; $i++) { + my $arg = $args[$i]; + while (length($arg) > 80) { + my $split = rindex $arg, ",", 80; + if ($split == -1) { + $split = rindex $arg, ":", 80; } - print $arg; - if ($i != $#args) { - print " \\\n"; - } else { - print "\n"; + if ($split == -1) { + $split = rindex $arg, " ", 80; + } + if ($split == -1) { + warn "cannot find nice place to split '$arg' below 80 chars\n"; + $split = 79; } + $split++; + + my $head = substr $arg, 0, $split; + $arg = substr $arg, $split; + + print $head, "\\\n"; + } + print $arg; + if ($i != $#args) { + print " \\\n"; + } else { + print "\n"; } } } -- 2.7.3

Do not print anything, let the caller take care of it. --- tests/test-wrap-argv.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl index 72a3e32..693bed5 100755 --- a/tests/test-wrap-argv.pl +++ b/tests/test-wrap-argv.pl @@ -104,7 +104,7 @@ sub rewrap_line { print join(" \\\n", @env, $cmd), " \\\n"; # We might have to split line argument values... for (my $i = 0; $i <= $#args; $i++) { - &rewrap_arg($args[$i]); + print &rewrap_arg($args[$i]); if ($i != $#args) { print " \\\n"; @@ -116,6 +116,7 @@ sub rewrap_line { sub rewrap_arg { my $arg = shift; + my @ret; while (length($arg) > 80) { my $split = rindex $arg, ",", 80; @@ -131,10 +132,9 @@ sub rewrap_arg { } $split++; - my $head = substr $arg, 0, $split; + push @ret, substr $arg, 0, $split; $arg = substr $arg, $split; - - print $head, "\\\n"; } - print $arg; + push @ret, $arg; + return join("\\\n", @ret); } -- 2.7.3

Leave the printing up to &rewrap. --- tests/test-wrap-argv.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl index 4e942cd..1f619cc 100755 --- a/tests/test-wrap-argv.pl +++ b/tests/test-wrap-argv.pl @@ -59,7 +59,7 @@ sub rewrap { # Now each @lines represents a single command, we # can process them foreach my $line (@lines) { - &rewrap_line ($line); + print &rewrap_line ($line); } } @@ -103,7 +103,7 @@ sub rewrap_line { # We might have to split line argument values... @args = map { &rewrap_arg($_) } @args; # Print env + command first - print join(" \\\n", @env, $cmd, @args), "\n"; + return join(" \\\n", @env, $cmd, @args), "\n"; } sub rewrap_arg { -- 2.7.3

If --in-place is supplied as the first argument to the script, replace the file in-place instead of printing to stdout. --- tests/test-wrap-argv.pl | 24 +++++++++++++++++++++--- tests/testutils.c | 8 +------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl index 96f998a..97f6903 100755 --- a/tests/test-wrap-argv.pl +++ b/tests/test-wrap-argv.pl @@ -22,7 +22,16 @@ # of the file. Parameter values that are longer than 80 chars will # also be split. # +# If --in-place is supplied as the first parameter of this script, +# the files will be changed in place. +# Otherwise the rewrapped files are printed to the standard output. +$in_place = 0; + +if (@ARGV[0] eq "--in-place") { + $in_place = 1; + shift @ARGV; +} foreach my $file (@ARGV) { &rewrap($file); @@ -57,10 +66,19 @@ sub rewrap { # Now each @lines represents a single command, we # can process them - foreach my $line (@lines) { - print &rewrap_line ($line); - } + @lines = map { &rewrap_line($_) } @lines; + if ($in_place) { + open FILE, ">", $file or die "cannot write $file: $!"; + foreach my $line (@lines) { + print FILE $line; + } + close FILE; + } else { + foreach my $line (@lines) { + print $line; + } + } } sub rewrap_line { diff --git a/tests/testutils.c b/tests/testutils.c index 54adab2..1d503c1 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -440,26 +440,20 @@ static int virTestRewrapFile(const char *filename) { int ret = -1; - char *outbuf = NULL; char *script = NULL; virCommandPtr cmd = NULL; if (virAsprintf(&script, "%s/test-wrap-argv.pl", abs_srcdir) < 0) goto cleanup; - cmd = virCommandNewArgList(script, filename, NULL); - virCommandSetOutputBuffer(cmd, &outbuf); + cmd = virCommandNewArgList(script, "--in-place", filename, NULL); if (virCommandRun(cmd, NULL) < 0) goto cleanup; - if (virFileWriteStr(filename, outbuf, 0666) < 0) - goto cleanup; - ret = 0; cleanup: VIR_FREE(script); virCommandFree(cmd); - VIR_FREE(outbuf); return ret; } -- 2.7.3