[libvirt] [PATCH 2/8] test-wrap-argv: split out rewrap_arg
Split out the code wrapping the single argument.
---
tests/test-wrap-argv.pl | 46 ++++++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/tests/test-wrap-argv.pl b/tests/test-wrap-argv.pl
index 3847d7b..72a3e32 100755
--- a/tests/test-wrap-argv.pl
+++ b/tests/test-wrap-argv.pl
@@ -104,27 +104,8 @@ sub rewrap_line {
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 "cannot find nice place to split '$arg' below 80
chars\n";
- $split = 79;
- }
- $split++;
-
- my $head = substr $arg, 0, $split;
- $arg = substr $arg, $split;
+ &rewrap_arg($args[$i]);
- print $head, "\\\n";
- }
- print $arg;
if ($i != $#args) {
print " \\\n";
} else {
@@ -132,3 +113,28 @@ sub rewrap_line {
}
}
}
+
+sub rewrap_arg {
+ my $arg = shift;
+
+ 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 "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;
+}
--
2.7.3