show-switch: Do not display newlines

diff --git a/show-switch b/show-switch
index 0e23fdcdd26f720dbfa7681ca37902bcfcf9c58f..8126e8ee74108112c1379eca48cf1543d9976fc5 100755 (executable)
--- a/show-switch
+++ b/show-switch
@@ -92,6 +92,10 @@ my $basics = my_get_table({
 });
 print Dumper($basics) if $debug;
 my $bas = $basics->{0} or die "Cannot find basic info";
+for (values %$bas) {
+       s{\r}{}gs;
+       s{\n}{ | }gs;
+}
 
 print "### Basics ###\n\n";
 print "Device:   ", $bas->{desc}, "\n";
@@ -228,7 +232,7 @@ for my $port (@ifaces) {
                $speed = int($speed/1000);
                $speed = "${speed}G";
        }
-       printf "%-4d %-15.15s  %s%-4s %-5s %s%-20s%s", $port, $if->{name}, $scolor, $state, $speed, $t_yellow, $if->{alias}, $t_norm;
+       printf "%-4d %-15.15s  %s%-4s %-5s %s%-25.25s%s", $port, $if->{name}, $scolor, $state, $speed, $t_yellow, $if->{alias}, $t_norm;
 
        if ($mac) {
                my $show_mac = "";
@@ -238,7 +242,7 @@ for my $port (@ifaces) {
                        $show_mac = $macs[0];
                        $more_macs = "${t_yellow}+${t_norm}" if @macs > 1;
                }
-               printf "%-17s%s ", $show_mac, $more_macs;
+               printf " %-17s%s ", $show_mac, $more_macs;
        }
 
        for my $vid (@vlans) {