1 files changed, 38 insertions, 43 deletions
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 545ec7388eb7..7227994ccf63 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -13,36 +13,34 @@ BEGIN {
        system("uname -a")
        printf("\n")
-        printversion("GNU C", version("gcc -dumpversion 2>&1"))
+        printversion("GNU C", version("gcc -dumpversion"))
-        printversion("GNU Make", version("make --version 2>&1"))
+        printversion("GNU Make", version("make --version"))
-        printversion("Binutils", version("ld -v 2>&1"))
+        printversion("Binutils", version("ld -v"))
-        printversion("Util-linux", version("mount --version 2>&1"))
+        printversion("Util-linux", version("mount --version"))
-        printversion("Mount", version("mount --version 2>&1"))
+        printversion("Mount", version("mount --version"))
-        printversion("Module-init-tools", version("depmod -V  2>&1"))
+        printversion("Module-init-tools", version("depmod -V"))
-        printversion("E2fsprogs", version("tune2fs 2>&1"))
+        printversion("E2fsprogs", version("tune2fs"))
-        printversion("Jfsutils", version("fsck.jfs -V 2>&1"))
+        printversion("Jfsutils", version("fsck.jfs -V"))
-        printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))
+        printversion("Reiserfsprogs", version("reiserfsck -V"))
-        printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))
+        printversion("Reiser4fsprogs", version("fsck.reiser4 -V"))
-        printversion("Xfsprogs", version("xfs_db -V 2>&1"))
+        printversion("Xfsprogs", version("xfs_db -V"))
-        printversion("Pcmciautils", version("pccardctl -V 2>&1"))
+        printversion("Pcmciautils", version("pccardctl -V"))
-        printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))
+        printversion("Pcmcia-cs", version("cardmgr -V"))
-        printversion("Quota-tools", version("quota -V 2>&1"))
+        printversion("Quota-tools", version("quota -V"))
-        printversion("PPP", version("pppd --version 2>&1"))
+        printversion("PPP", version("pppd --version"))
-        printversion("Isdn4k-utils", version("isdnctrl 2>&1"))
+        printversion("Isdn4k-utils", version("isdnctrl"))
-        printversion("Nfs-utils", version("showmount --version 2>&1"))
+        printversion("Nfs-utils", version("showmount --version"))
-        if (system("test -r /proc/self/maps") == 0) {
+        while (getline <"/proc/self/maps" > 0) {
-                while (getline <"/proc/self/maps" > 0) {
+                n = split($0, procmaps, "/")
-                        n = split($0, procmaps, "/")
+                if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
-                        if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
+                        ver = substr(procmaps[n], RSTART, RLENGTH)
-                                ver = substr(procmaps[n], RSTART, RLENGTH)
+                        printversion("Linux C Library", ver)
-                                printversion("Linux C Library", ver)
+                        break
-                                break
-                        }
                }
        }
-        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/) {
@@ -50,28 +48,25 @@ BEGIN {
                        break
                }
        }
-        if (system("test -r " libcpp) == 0)
+        printversion("Linux C++ Library", version("readlink " libcpp))
-                printversion("Linux C++ Library", version("readlink " libcpp))
+        printversion("Procps", version("ps --version"))
+        printversion("Net-tools", version("ifconfig --version"))
-        printversion("Procps", version("ps --version 2>&1"))
+        printversion("Kbd", version("loadkeys -V"))
-        printversion("Net-tools", version("ifconfig --version 2>&1"))
+        printversion("Console-tools", version("loadkeys -V"))
-        printversion("Kbd", version("loadkeys -V 2>&1"))
+        printversion("Oprofile", version("oprofiled --version"))
-        printversion("Console-tools", version("loadkeys -V 2>&1"))
+        printversion("Sh-utils", version("expr --v"))
-        printversion("Oprofile", version("oprofiled --version 2>&1"))
+        printversion("Udev", version("udevadm --version"))
-        printversion("Sh-utils", version("expr --v 2>&1"))
+        printversion("Wireless-tools", version("iwconfig --version"))
-        printversion("Udev", version("udevadm --version 2>&1"))
-        printversion("Wireless-tools", version("iwconfig --version 2>&1"))
-        if (system("test -r /proc/modules") == 0) {
+        while ("sort /proc/modules" | getline > 0) {
-                while ("sort /proc/modules" | getline > 0) {
+                mods = mods sep $1
-                        mods = mods sep $1
+                sep = " "
-                        sep = " "
-                }
-                printversion("Modules Loaded", mods)
        }
+        printversion("Modules Loaded", mods)
 }
 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)

diff --git a/scripts/ver_linux b/scripts/ver_linux index 545ec7388eb7..7227994ccf63 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux
@@ -13,36 +13,34 @@ BEGIN {
13	system("uname -a")	13	system("uname -a")
14	printf("\n")	14	printf("\n")
15		15
16	printversion("GNU C", version("gcc -dumpversion 2>&1"))	16	printversion("GNU C", version("gcc -dumpversion"))
17	printversion("GNU Make", version("make --version 2>&1"))	17	printversion("GNU Make", version("make --version"))
18	printversion("Binutils", version("ld -v 2>&1"))	18	printversion("Binutils", version("ld -v"))
19	printversion("Util-linux", version("mount --version 2>&1"))	19	printversion("Util-linux", version("mount --version"))
20	printversion("Mount", version("mount --version 2>&1"))	20	printversion("Mount", version("mount --version"))
21	printversion("Module-init-tools", version("depmod -V 2>&1"))	21	printversion("Module-init-tools", version("depmod -V"))
22	printversion("E2fsprogs", version("tune2fs 2>&1"))	22	printversion("E2fsprogs", version("tune2fs"))
23	printversion("Jfsutils", version("fsck.jfs -V 2>&1"))	23	printversion("Jfsutils", version("fsck.jfs -V"))
24	printversion("Reiserfsprogs", version("reiserfsck -V 2>&1"))	24	printversion("Reiserfsprogs", version("reiserfsck -V"))
25	printversion("Reiser4fsprogs", version("fsck.reiser4 -V 2>&1"))	25	printversion("Reiser4fsprogs", version("fsck.reiser4 -V"))
26	printversion("Xfsprogs", version("xfs_db -V 2>&1"))	26	printversion("Xfsprogs", version("xfs_db -V"))
27	printversion("Pcmciautils", version("pccardctl -V 2>&1"))	27	printversion("Pcmciautils", version("pccardctl -V"))
28	printversion("Pcmcia-cs", version("cardmgr -V 2>&1"))	28	printversion("Pcmcia-cs", version("cardmgr -V"))
29	printversion("Quota-tools", version("quota -V 2>&1"))	29	printversion("Quota-tools", version("quota -V"))
30	printversion("PPP", version("pppd --version 2>&1"))	30	printversion("PPP", version("pppd --version"))
31	printversion("Isdn4k-utils", version("isdnctrl 2>&1"))	31	printversion("Isdn4k-utils", version("isdnctrl"))
32	printversion("Nfs-utils", version("showmount --version 2>&1"))	32	printversion("Nfs-utils", version("showmount --version"))
33		33
34	if (system("test -r /proc/self/maps") == 0) {	34	while (getline <"/proc/self/maps" > 0) {
35	while (getline <"/proc/self/maps" > 0) {	35	n = split($0, procmaps, "/")
36	n = split($0, procmaps, "/")	36	if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
37	if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {	37	ver = substr(procmaps[n], RSTART, RLENGTH)
38	ver = substr(procmaps[n], RSTART, RLENGTH)	38	printversion("Linux C Library", ver)
39	printversion("Linux C Library", ver)	39	break
40	break
41	}
42	}	40	}
43	}	41	}
44		42
45	printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))	43	printversion("Dynamic linker (ldd)", version("ldd --version"))
46		44
47	while ("ldconfig -p 2>/dev/null" \| getline > 0) {	45	while ("ldconfig -p 2>/dev/null" \| getline > 0) {
48	if (/(libg\|stdc)[+]+\.so/) {	46	if (/(libg\|stdc)[+]+\.so/) {
@@ -50,28 +48,25 @@ BEGIN {
50	break	48	break
51	}	49	}
52	}	50	}
53	if (system("test -r " libcpp) == 0)	51	printversion("Linux C++ Library", version("readlink " libcpp))
54	printversion("Linux C++ Library", version("readlink " libcpp))	52	printversion("Procps", version("ps --version"))
55		53	printversion("Net-tools", version("ifconfig --version"))
56	printversion("Procps", version("ps --version 2>&1"))	54	printversion("Kbd", version("loadkeys -V"))
57	printversion("Net-tools", version("ifconfig --version 2>&1"))	55	printversion("Console-tools", version("loadkeys -V"))
58	printversion("Kbd", version("loadkeys -V 2>&1"))	56	printversion("Oprofile", version("oprofiled --version"))
59	printversion("Console-tools", version("loadkeys -V 2>&1"))	57	printversion("Sh-utils", version("expr --v"))
60	printversion("Oprofile", version("oprofiled --version 2>&1"))	58	printversion("Udev", version("udevadm --version"))
61	printversion("Sh-utils", version("expr --v 2>&1"))	59	printversion("Wireless-tools", version("iwconfig --version"))
62	printversion("Udev", version("udevadm --version 2>&1"))
63	printversion("Wireless-tools", version("iwconfig --version 2>&1"))
64		60
65	if (system("test -r /proc/modules") == 0) {	61	while ("sort /proc/modules" \| getline > 0) {
66	while ("sort /proc/modules" \| getline > 0) {	62	mods = mods sep $1
67	mods = mods sep $1	63	sep = " "
68	sep = " "
69	}
70	printversion("Modules Loaded", mods)
71	}	64	}
		65	printversion("Modules Loaded", mods)
72	}	66	}
73		67
74	function version(cmd, ver) {	68	function version(cmd, ver) {
		69	cmd = cmd " 2>&1"
75	while (cmd \| getline > 0) {	70	while (cmd \| getline > 0) {
76	if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {	71	if (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) {
77	ver = substr($0, RSTART, RLENGTH)	72	ver = substr($0, RSTART, RLENGTH)