diff options
| author | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-03 13:26:06 +0000 |
|---|---|---|
| committer | Benoît Dejean <bdejean@src.gnome.org> | 2005-08-03 13:26:06 +0000 |
| commit | a0493a0ff181b950c94e6475ccb6aed512a770e4 (patch) | |
| tree | d8e026f53e3dc552f6bb0781214ba8533f707625 | |
| parent | 9f7d505d20b4c6c139cef846495903f05d3fea58 (diff) | |
| download | libgtop-a0493a0ff181b950c94e6475ccb6aed512a770e4.tar.gz | |
Fixed for people running 2.6 without /sys.
* netload.c: (glibtop_get_netload_s):
Fixed for people running 2.6 without /sys.
| -rw-r--r-- | sysdeps/linux/ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/linux/netload.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/sysdeps/linux/ChangeLog b/sysdeps/linux/ChangeLog index b9281a3f..aabdded4 100644 --- a/sysdeps/linux/ChangeLog +++ b/sysdeps/linux/ChangeLog @@ -1,3 +1,9 @@ +2005-08-03 Benoît Dejean <TazForEver@dlfp.org> + + * netload.c: (glibtop_get_netload_s): + + Fixed for people running 2.6 without /sys. + 2005-08-02 Benoît Dejean <TazForEver@dlfp.org> * glibtop_server.h: diff --git a/sysdeps/linux/netload.c b/sysdeps/linux/netload.c index 2203d024..44bd8e6f 100644 --- a/sysdeps/linux/netload.c +++ b/sysdeps/linux/netload.c @@ -540,10 +540,12 @@ glibtop_get_netload_s (glibtop *server, glibtop_netload *buf, if (server->os_version_code < LINUX_VERSION_CODE(2, 1, 14)) { linux_2_0_stats(server, buf, interface); } - else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0)) { + else if (server->os_version_code > LINUX_VERSION_CODE(2, 6, 0) + && g_file_test("/sys", G_FILE_TEST_IS_DIR)) { linux_2_6_stats(server, buf, interface); } - else if (server->os_version_code > LINUX_VERSION_CODE(2, 4, 0)) { + else { + /* 2.4 and 2.6 without /sys (?$£Z¥!) */ linux_2_4_stats(server, buf, interface); } |