[PATCH 1/8] test-wrap-argv: split out rewrap_line

[Ján Tomko <jtomko@xxxxxxxxxx>]

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

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list