linkstatus patch

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky@340 7f574dfc-610e-0410-a909-a81674777703

diff --git a/AUTHORS b/AUTHORS
index 5c5fe39..d477468 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,6 +19,9 @@ Brenden Matthews <brenden at rty dot ca>
 Bruce Merry <bmerry at cs dot uct dot ac dot za>
   Xdbe (double buffering)
 
+btlee
+  linkstatus patch (http://forums.gentoo.org/viewtopic-p-2765647.html#2765647)
+
 dan-h <dan-h at users dot sourceforge dot net>
   adt746x fix
 

diff --git a/ChangeLog b/ChangeLog
index 1c50db7..c9ad336 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # $Id$
 
+2005-09-30
+       * Linkstatus patch from btlee on f.g.o (see
+       http://forums.gentoo.org/viewtopic-p-2765647.html#2765647)
+
 2005-09-29
        * Fixed build on FreeBSD for non-i386
        * Made it so top_mem doesn't show all the forks of one process

diff --git a/src/linux.c b/src/linux.c
index 8fb843d..029f3cb 100644 (file)
--- a/src/linux.c
+++ b/src/linux.c
@@ -29,6 +29,9 @@
 #include <net/if.h>
 #include <math.h>
 
+#define MIN(a,b) (((a) <= (b)) ? (a) : (b))
+#define MAX(a,b) (((a) >= (b)) ? (a) : (b))
+
 static struct sysinfo s_info;
 
 static int show_nice_processes;
@@ -307,7 +310,8 @@ inline void update_wifi_stats()
 
                sscanf(p, "%*d   %d.  %d.  %d", &l, &m, &n);
 
-               ns->linkstatus = (int) (log(l) / log(92) * 100);
+               ns->linkstatus = (int) (log(MIN(MAX(l,1),92)) / log(92) * 100);
+
        }
 
        /*** end wireless patch ***/