Bugfix 8079: fix require sys/ioctl.ph confilcts

  perl only allows a require to be done once. If it is done in two
  included modules the module or function in the module used second
  doesn't have the data in the required file in its scope. To prevent
  this I created a third module that contains the functions that require
  'sys/ioctl.ph' so that there is no longer a conflict.

1 files changed, 2 insertions, 9 deletions

diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 61ce029..850cb2b 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -21,9 +21,9 @@
 
 package Vyatta::Misc;
 use strict;
+use Vyatta::ioctl;
 
 require Exporter;
-require 'sys/ioctl.ph';
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(getInterfaces getIP getNetAddIP get_sysfs_value
@@ -527,14 +527,7 @@ sub interface_description {
 
 # returns (rows, columns) for terminal size
 sub get_terminal_size {
-    my $winsize = '';
-    open(my $TTY, '>', '/dev/tty');
-    # undefined if output not going to terminal
-    return unless (ioctl($TTY, &TIOCGWINSZ, $winsize));
-    close($TTY);
-
-    my ($rows, $cols, undef, undef) = unpack('S4', $winsize);
-    return ($rows, $cols);
+  return Vyatta::ioctl::get_terminal_size();
 }
 
 # return only terminal width