Commit 4169bc43 authored by Alexander Kapshuk's avatar Alexander Kapshuk Committed by Greg Kroah-Hartman

ver_linux: Move stderr redirection from function parameter to function body

Remove stderr redirection to stdout from all the parameters to the
version() function, and put it with the body of the version() function
instead.
This improves code readability.
Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0eca353e
......@@ -13,23 +13,23 @@ BEGIN {
system("uname -a")
printf("\n")
printversion("GNU C", version("gcc -dumpversion 2>&1"))
printversion("GNU Make", version("make --version 2>&1"))
printversion("Binutils", version("ld -v 2>&1"))
printversion("Util-linux", version("mount --version 2>&1"))
printversion("Mount", version("mount --version 2>&1"))
printversion("Module-init-tools", version("depmod -V 2>&1"))
printversion("E2fsprogs", version("tune2fs 2>&1"))
printversion("Jfsutils", version("fsck.jfs -V 2>&1"))
printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))
printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))
printversion("Xfsprogs", version("xfs_db -V 2>&1"))
printversion("Pcmciautils", version("pccardctl -V 2>&1"))
printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))
printversion("Quota-tools", version("quota -V 2>&1"))
printversion("PPP", version("pppd --version 2>&1"))
printversion("Isdn4k-utils", version("isdnctrl 2>&1"))
printversion("Nfs-utils", version("showmount --version 2>&1"))
printversion("GNU C", version("gcc -dumpversion"))
printversion("GNU Make", version("make --version"))
printversion("Binutils", version("ld -v"))
printversion("Util-linux", version("mount --version"))
printversion("Mount", version("mount --version"))
printversion("Module-init-tools", version("depmod -V"))
printversion("E2fsprogs", version("tune2fs"))
printversion("Jfsutils", version("fsck.jfs -V"))
printversion("Reiserfsprogs", version("reiserfsck -V"))
printversion("Reiser4fsprogs", version("fsck.reiser4 -V"))
printversion("Xfsprogs", version("xfs_db -V"))
printversion("Pcmciautils", version("pccardctl -V"))
printversion("Pcmcia-cs", version("cardmgr -V"))
printversion("Quota-tools", version("quota -V"))
printversion("PPP", version("pppd --version"))
printversion("Isdn4k-utils", version("isdnctrl"))
printversion("Nfs-utils", version("showmount --version"))
if (system("test -r /proc/self/maps") == 0) {
while (getline <"/proc/self/maps" > 0) {
......@@ -42,7 +42,7 @@ BEGIN {
}
}
printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))
printversion("Dynamic linker (ldd)", version("ldd --version"))
while ("ldconfig -p 2>/dev/null" | getline > 0) {
if (/(libg|stdc)[+]+\.so/) {
......@@ -53,14 +53,14 @@ BEGIN {
if (system("test -r " libcpp) == 0)
printversion("Linux C++ Library", version("readlink " libcpp))
printversion("Procps", version("ps --version 2>&1"))
printversion("Net-tools", version("ifconfig --version 2>&1"))
printversion("Kbd", version("loadkeys -V 2>&1"))
printversion("Console-tools", version("loadkeys -V 2>&1"))
printversion("Oprofile", version("oprofiled --version 2>&1"))
printversion("Sh-utils", version("expr --v 2>&1"))
printversion("Udev", version("udevadm --version 2>&1"))
printversion("Wireless-tools", version("iwconfig --version 2>&1"))
printversion("Procps", version("ps --version"))
printversion("Net-tools", version("ifconfig --version"))
printversion("Kbd", version("loadkeys -V"))
printversion("Console-tools", version("loadkeys -V"))
printversion("Oprofile", version("oprofiled --version"))
printversion("Sh-utils", version("expr --v"))
printversion("Udev", version("udevadm --version"))
printversion("Wireless-tools", version("iwconfig --version"))
if (system("test -r /proc/modules") == 0) {
while ("sort /proc/modules" | getline > 0) {
......@@ -72,6 +72,7 @@ BEGIN {
}
function version(cmd, ver) {
cmd = cmd " 2>&1"
while (cmd | getline > 0) {
if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
ver = substr($0, RSTART, RLENGTH)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment