diff options
Diffstat (limited to 'lib/Sys/Hostname.pm')
| -rw-r--r-- | lib/Sys/Hostname.pm | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/lib/Sys/Hostname.pm b/lib/Sys/Hostname.pm index 4d93f91f9e..63415a6bfe 100644 --- a/lib/Sys/Hostname.pm +++ b/lib/Sys/Hostname.pm @@ -74,25 +74,19 @@ sub hostname { # method 2 - syscall is preferred since it avoids tainting problems eval { local $SIG{__DIE__}; - { - package main; - require "syscall.ph"; - } + require "syscall.ph"; $host = "\0" x 65; ## preload scalar - syscall(&main::SYS_gethostname, $host, 65) == 0; + syscall(&SYS_gethostname, $host, 65) == 0; } # method 2a - syscall using systeminfo instead of gethostname # -- needed on systems like Solaris || eval { local $SIG{__DIE__}; - { - package main; - require "sys/syscall.ph"; - require "sys/systeminfo.ph"; - } + require "sys/syscall.ph"; + require "sys/systeminfo.ph"; $host = "\0" x 65; ## preload scalar - syscall(&main::SYS_systeminfo, &main::SI_HOSTNAME, $host, 65) != -1; + syscall(&SYS_systeminfo, &SI_HOSTNAME, $host, 65) != -1; } # method 3 - trusty old hostname command @@ -102,13 +96,21 @@ sub hostname { $host = `(hostname) 2>/dev/null`; # bsdish } - # method 4 - sysV uname command (may truncate) + # method 4 - use POSIX::uname(), which strictly can't be expected to be + # correct + || eval { + local $SIG{__DIE__}; + require POSIX; + $host = (POSIX::uname())[1]; + } + + # method 5 - sysV uname command (may truncate) || eval { local $SIG{__DIE__}; $host = `uname -n 2>/dev/null`; ## sysVish } - # method 5 - Apollo pre-SR10 + # method 6 - Apollo pre-SR10 || eval { local $SIG{__DIE__}; ($host,$a,$b,$c,$d)=split(/[:\. ]/,`/com/host`,6); |